From 09b81532caeac696aca153d809fdcc8c78753ad2 Mon Sep 17 00:00:00 2001 From: Aravind Bharatha Date: Mon, 3 Apr 2023 12:43:48 -0400 Subject: [PATCH 1/3] update sdk namespaces for all languages except c# --- specification/help/resource-manager/readme.go.md | 2 +- specification/help/resource-manager/readme.md | 3 --- specification/help/resource-manager/readme.python.md | 6 +++--- specification/help/resource-manager/readme.typescript.md | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/specification/help/resource-manager/readme.go.md b/specification/help/resource-manager/readme.go.md index b277ac5805c1..ba6359e53d65 100644 --- a/specification/help/resource-manager/readme.go.md +++ b/specification/help/resource-manager/readme.go.md @@ -5,7 +5,7 @@ These settings apply only when `--go` is specified on the command line. ```yaml $(go) && $(track2) azure-arm: true license-header: MICROSOFT_MIT_NO_VERSION -module-name: sdk/resourcemanager/help/armhelp +module-name: sdk/resourcemanager/selfhelp/armselfhelp module: github.com/Azure/azure-sdk-for-go/$(module-name) output-folder: $(go-sdk-folder)/$(module-name) ``` diff --git a/specification/help/resource-manager/readme.md b/specification/help/resource-manager/readme.md index de5ee47cfee7..f2ec863fdd80 100644 --- a/specification/help/resource-manager/readme.md +++ b/specification/help/resource-manager/readme.md @@ -70,9 +70,6 @@ swagger-to-sdk: - repo: azure-cli-extensions - repo: azure-powershell ``` -## Az - -See configuration in [readme.az.md](./readme.az.md) ## Go diff --git a/specification/help/resource-manager/readme.python.md b/specification/help/resource-manager/readme.python.md index 045989f4f670..da0986eb3850 100644 --- a/specification/help/resource-manager/readme.python.md +++ b/specification/help/resource-manager/readme.python.md @@ -6,13 +6,13 @@ Please also specify `--python-sdks-folder= Date: Mon, 24 Apr 2023 11:26:18 -0400 Subject: [PATCH 2/3] fix issues with swagger --- .../preview/2023-01-01-preview/help.json | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/help.json b/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/help.json index 18f4581f31ca..0406be80c2e3 100644 --- a/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/help.json +++ b/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/help.json @@ -523,11 +523,8 @@ "description": "The list of solution metadata.", "type": "array", "items": { - "$ref": "#/definitions/SolutionMetadata" - }, - "x-ms-identifiers": [ - "solutionId" - ] + "$ref": "#/definitions/SolutionMetadataResource" + } }, "nextLink": { "description": "The link used to get the next page of solution metadata.", @@ -535,7 +532,24 @@ } } }, - "SolutionMetadata": { + "SolutionMetadataResource": { + "description": "Solution Metadata resource", + "type": "object", + "x-ms-azure-resource": true, + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/SolutionMetadataProperties", + "description": "Solution metadata Resource properties." + } + }, + "allOf": [ + { + "$ref": "../../../../../common-types/resource-management/v3/types.json#/definitions/ProxyResource" + } + ] + }, + "SolutionMetadataProperties": { "description": "Diagnostic solution metadata.", "type": "object", "properties": { @@ -573,7 +587,7 @@ "required": true, "type": "string", "description": "This is an extension resource provider and only resource level extension is supported at the moment.", - "x-ms-parameter-location": "client", + "x-ms-parameter-location": "method", "x-ms-skip-url-encoding": true }, "ApiVersionParameter": { @@ -593,7 +607,7 @@ "maxLength": 100, "pattern": "^[A-Za-z0-9-+@()_]+$", "description": "Unique resource name for insight resources", - "x-ms-parameter-location": "client" + "x-ms-parameter-location": "method" }, "FilterParameter": { "name": "$filter", @@ -601,14 +615,16 @@ "in": "query", "required": false, "type": "string", - "x-ms-skip-url-encoding": true + "x-ms-skip-url-encoding": true, + "x-ms-parameter-location": "method" }, "SkipTokenParameter": { "name": "$skiptoken", "description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls.", "in": "query", "required": false, - "type": "string" + "type": "string", + "x-ms-parameter-location": "method" } } } From 19d4e4426402f56fd56d4c833c7b727d07d0b586 Mon Sep 17 00:00:00 2001 From: Aravind Bharatha Date: Mon, 24 Apr 2023 12:34:56 -0400 Subject: [PATCH 3/3] update examples of solution metadata --- ...DiscoverySolutionsForKeyVaultResource.json | 59 ++++++++++++------- 1 file changed, 37 insertions(+), 22 deletions(-) diff --git a/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/examples/ListDiscoverySolutionsForKeyVaultResource.json b/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/examples/ListDiscoverySolutionsForKeyVaultResource.json index c25c8427d036..49dfaac468a8 100644 --- a/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/examples/ListDiscoverySolutionsForKeyVaultResource.json +++ b/specification/help/resource-manager/Microsoft.Help/preview/2023-01-01-preview/examples/ListDiscoverySolutionsForKeyVaultResource.json @@ -8,34 +8,49 @@ "body": { "value": [ { - "solutionId": "SampleSolutionId1", - "solutionType": "Diagnostics", - "description": "This is a diagnostic", - "requiredParameterSets": [ - [ - "ResourceUri" + "id": "subscriptions/0d0fcd2e-c4fd-4349-8497-200edb3923c6/resourcegroups/myresourceGroup/providers/Microsoft.KeyVault/vaults/test-keyvault-non-read/providers/Microsoft.Help/discoverySolutions/SampleSolutionId1", + "type": "Microsoft.Help/discoverySolutions", + "name": "SampleSolutionId1", + "properties": { + "solutionId": "SampleSolutionId1", + "solutionType": "Diagnostics", + "description": "This is a diagnostic", + "requiredParameterSets": [ + [ + "ResourceUri" + ] ] - ] + } }, { - "solutionId": "SampleSolutionId2", - "solutionType": "Diagnostics", - "description": "This is another diagnostic", - "requiredParameterSets": [ - [ - "ResourceUri" + "id": "subscriptions/0d0fcd2e-c4fd-4349-8497-200edb3923c6/resourcegroups/myresourceGroup/providers/Microsoft.KeyVault/vaults/test-keyvault-non-read/providers/Microsoft.Help/discoverySolutions/SampleSolutionId2", + "type": "Microsoft.Help/discoverySolutions", + "name": "SampleSolutionId2", + "properties": { + "solutionId": "SampleSolutionId2", + "solutionType": "Diagnostics", + "description": "This is a diagnostic", + "requiredParameterSets": [ + [ + "ResourceUri" + ] ] - ] + } }, { - "solutionId": "SampleSolutionId3", - "solutionType": "Diagnostics", - "description": "This is another testing diagnostic" - }, - { - "solutionId": "SampleSolutionId4", - "solutionType": "Diagnostics", - "description": "This is also another testing diagnostic" + "id": "subscriptions/0d0fcd2e-c4fd-4349-8497-200edb3923c6/resourcegroups/myresourceGroup/providers/Microsoft.KeyVault/vaults/test-keyvault-non-read/providers/Microsoft.Help/discoverySolutions/SampleSolutionId3", + "type": "Microsoft.Help/discoverySolutions", + "name": "SampleSolutionId3", + "properties": { + "solutionId": "SampleSolutionId3", + "solutionType": "Diagnostics", + "description": "This is a diagnostic", + "requiredParameterSets": [ + [ + "ResourceUri" + ] + ] + } } ], "nextLink": "nextLinkUrl"