Merge branch 'main' into feature/support-insight-resources

Azure · Oct 11, 2023 · 81ec111 · 81ec111
2 parents bbc2b1d + f553f31
commit 81ec111
Show file tree

Hide file tree

Showing 47 changed files with 20,950 additions and 1,614 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

diff --git a/docs/hugo/content/reference/_index.md b/docs/hugo/content/reference/_index.md
@@ -22,9 +22,12 @@ To install the CRDs for these resources, your ASO configuration must include `ap
 
 Development of these new resources is complete and they will be available in the next release of ASO.
 
-| Resource                                                                                                                                       | ARM Version | CRD Version   | Supported From | Sample                                                                                                                              |
-|------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------|
-| [Service](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Service) | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_service.yaml) |
+| Resource                                                                                                                                                 | ARM Version | CRD Version   | Supported From | Sample                                                                                                                                   |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|------------------------------------------------------------------------------------------------------------------------------------------|
+| [Backend](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Backend)           | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_backend.yaml)      |
+| [NamedValue](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.NamedValue)     | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_namedvalue.yaml)   |
+| [Service](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Service)           | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_service.yaml)      |
+| [Subscription](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Subscription) | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_subscription.yaml) |
 
 ## AppConfiguration
 

diff --git a/docs/hugo/content/reference/apimanagement/_index.md b/docs/hugo/content/reference/apimanagement/_index.md
@@ -9,7 +9,10 @@ To install the CRDs for these resources, your ASO configuration must include `ap
 
 Development of these new resources is complete and they will be available in the next release of ASO.
 
-| Resource                                                                                                                                       | ARM Version | CRD Version   | Supported From | Sample                                                                                                                              |
-|------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|-------------------------------------------------------------------------------------------------------------------------------------|
-| [Service](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Service) | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_service.yaml) |
+| Resource                                                                                                                                                 | ARM Version | CRD Version   | Supported From | Sample                                                                                                                                   |
+|----------------------------------------------------------------------------------------------------------------------------------------------------------|-------------|---------------|----------------|------------------------------------------------------------------------------------------------------------------------------------------|
+| [Backend](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Backend)           | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_backend.yaml)      |
+| [NamedValue](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.NamedValue)     | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_namedvalue.yaml)   |
+| [Service](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Service)           | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_service.yaml)      |
+| [Subscription](https://azure.github.io/azure-service-operator/reference/apimanagement/v1api20220801/#apimanagement.azure.com/v1api20220801.Subscription) | 2022-08-01  | v1api20220801 | v2.4.0         | [View](https://github.com/Azure/azure-service-operator/tree/main/v2/samples/apimanagement/v1api20220801/v1api20220801_subscription.yaml) |
 
diff --git a/v2/api/apimanagement/customizations/backend_extension_types_gen.go b/v2/api/apimanagement/customizations/backend_extension_types_gen.go
diff --git a/v2/api/apimanagement/customizations/named_value_extension_types_gen.go b/v2/api/apimanagement/customizations/named_value_extension_types_gen.go
diff --git a/v2/api/apimanagement/customizations/structure.txt b/v2/api/apimanagement/customizations/structure.txt
@@ -1,3 +1,6 @@
 // Code generated by azure-service-operator-codegen. DO NOT EDIT.
 github.com/Azure/azure-service-operator/v2/api/apimanagement/customizations
-└── ServiceExtension: Object (0 properties)
+├── BackendExtension: Object (0 properties)
+├── NamedValueExtension: Object (0 properties)
+├── ServiceExtension: Object (0 properties)
+└── SubscriptionExtension: Object (0 properties)
diff --git a/v2/api/apimanagement/customizations/subscription_extension_types_gen.go b/v2/api/apimanagement/customizations/subscription_extension_types_gen.go