Merge branch 'main' into feature/goal-seeking-keyvaults

Azure · Oct 11, 2023 · bc1438e · bc1438e
2 parents 77ee23c + f553f31
commit bc1438e
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,43 +1,45 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.137.0/containers/go
 {
-	"name": "Go",
+	"name": "Azure Service Operator",
 	"build": { "dockerfile": "Dockerfile" },
 	"runArgs": [ 
 		"--cap-add=SYS_PTRACE",
 		"--security-opt", "seccomp=unconfined", 
-		"--init", // runs an init process: https://docs.docker.com/engine/reference/run/#specify-an-init-process
+		"--init" // runs an init process: https://docs.docker.com/engine/reference/run/#specify-an-init-process
 	],
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": { 
-		"terminal.integrated.defaultProfile.linux": "bash",
-		"terminal.integrated.profiles.linux": {
-			"bash": {
-				"path": "bash",
-				"icon": "terminal-bash"
-			},
-		},
-		"go.gopath": "/go",
-		"go.useLanguageServer": true,
-		"go.lintTool": "golangci-lint",
-		"[go]": {
-			"editor.snippetSuggestions": "none",
-			"editor.formatOnSave": true,
-			"editor.codeActionsOnSave": {
-				"source.organizeImports": true
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.go",
+				"ms-azuretools.vscode-docker",
+				"redhat.vscode-yaml",
+				"ms-kubernetes-tools.vscode-kubernetes-tools",
+				"task.vscode-task"
+			],
+			"settings": {
+				"terminal.integrated.defaultProfile.linux": "bash",
+				"terminal.integrated.profiles.linux": {
+					"bash": {
+						"path": "bash",
+						"icon": "terminal-bash"
+					}
+				},
+				"go.gopath": "/go",
+				"go.useLanguageServer": true,
+				"go.lintTool": "golangci-lint",
+				"[go]": {
+					"editor.snippetSuggestions": "none",
+					"editor.formatOnSave": true,
+					"editor.codeActionsOnSave": {
+						"source.organizeImports": true
+					}
+				}
 			}
 		}
-	},
 
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"golang.Go",
-		"ms-azuretools.vscode-docker",
-		"redhat.vscode-yaml",
-		"ms-kubernetes-tools.vscode-kubernetes-tools"
-	],
+	},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [9000],

diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh
@@ -174,7 +174,7 @@ fi
 write-verbose "Checking for $TOOL_DEST/go-task"
 if should-install "$TOOL_DEST/task"; then 
     write-info "Installing go-task"
-    curl -sL "https://github.com/go-task/task/releases/download/v3.22.0/task_linux_amd64.tar.gz" | tar xz -C "$TOOL_DEST" task
+    curl -sL "https://github.com/go-task/task/releases/download/v3.31.0/task_linux_amd64.tar.gz" | tar xz -C "$TOOL_DEST" task
 fi
 
 # Install Trivy