From b7c8be606fd7159bb27705a9102cddbba9fd3857 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Tue, 17 Nov 2020 15:27:52 +0800 Subject: [PATCH 01/51] merge changes on test --- .github/issue_assignment.yml | 11 +- .github/pull_request_assignment.yml | 192 +++------------------- specificationRepositoryConfiguration.json | 60 +++++-- 3 files changed, 68 insertions(+), 195 deletions(-) diff --git a/.github/issue_assignment.yml b/.github/issue_assignment.yml index db9ce6dfd4a2..b31a0e8a1880 100644 --- a/.github/issue_assignment.yml +++ b/.github/issue_assignment.yml @@ -1,12 +1,13 @@ --- - rule: - booleanFilterExpression: "needs-triage" + booleanFilterExpression: "Java" assignees: - - PhoenixHe-msft - - raych1 - - akning-ms - - leni-msft - ruowan - jianyexi - zhenglaizhang +- rule: + booleanFilterExpression: "Python" + assignees: + - ruowan + - PhoenixHe-msft diff --git a/.github/pull_request_assignment.yml b/.github/pull_request_assignment.yml index 054e38b955f2..3b2b0a413e3a 100644 --- a/.github/pull_request_assignment.yml +++ b/.github/pull_request_assignment.yml @@ -1,44 +1,8 @@ --- - rule: - # eventgrid data-plane PR - paths: - - "specification/eventgrid/data-plane/**" - reviewers: - - lmazuel - -- rule: - # synapse data-plane PR - paths: - - "specification/synapse/data-plane/**" - reviewers: - - jonathandturner - -- rule: - # data-plane PR - paths: - - "specification/**/data-plane/**" - reviewers: - - anuchandy - - jhendrixMSFT - - tjprescott - - -- rule: - paths: - - "specification/network/**" - reviewers: - - kairu-ms - - lirenhe - -- rule: - paths: - - "specification/@(applicationinsights|operationalinsights)/**" - reviewers: - - kairu-ms - -- rule: - paths: "specification/@(resources|powerplatform|appplatform)/**" + paths: "documentation/**" reviewers: + - ruowan - raych1 - rule: @@ -47,156 +11,40 @@ - ruowan - rule: - paths: "specification/sql/**" - reviewers: - - akning-ms - -- rule: - paths: "specification/signalr/**" - reviewers: - - leni-msft - -- rule: - paths: "specification/eventhub/**" + paths: "specification/**/Microsoft.Network/**" reviewers: - ruowan -- rule: - paths: "specification/compute/**" - reviewers: - - ArcturusZhang - - yungezz - -- rule: - paths: - - "specification/machinelearningservices/**" - reviewers: - - ArcturusZhang - -- rule: - paths: - - "specification/azureactivedirectory/**" - reviewers: - - njuCZ - -- rule: - paths: - - "specification/authorization/**" - reviewers: - - qianwens - -- rule: - paths: - - "specification/datafactory/**" - reviewers: - - qianwens - -- rule: - paths: - - "specification/monitor/**" - reviewers: - - weidongxu-microsoft - - kairu-ms - -- rule: - paths: - - "specification/storage/**" - reviewers: - - Juliehzl - - -- rule: - paths: "specification/mediaservices/**" - reviewers: - - allenjzhang -- rule: - paths: - - "specification/containerregistry/**" - reviewers: - - fengzhou-msft - -- rule: - paths: - - "specification/@(containerservice|containerinstance)/**" - reviewers: - - PhoenixHe-msft - -- rule: - paths: - - "specification/mixedreality/**" - - "specification/hdinsight/**" - reviewers: - - leni-msft + - NullMDR + - Dreamgoing - rule: - paths: - - "specification/portal/**" + paths: + - "specification/@(containerservice|databricks|containerregistry|compute)/**" + - "specification/@(docker)/**" reviewers: - - PhoenixHe-msft + - ruowan + - Dreamgoing - rule: - paths: - - "specification/web/**" - reviewers: - - weidongxu-microsoft - -- rule: - paths: - - "specification/testbase/**" + paths: "specification/**/date-plane/**" reviewers: - - PhoenixHe-msft - -- rule: - paths: - - "specification/servicelinker/**" - reviewers: - - PhoenixHe-msft + - Dreamgoing - rule: paths: - - "specification/azurestack/**" - - "specification/automation/**" + - "specification/**/resource-manager/**" reviewers: - - xiaoxuqi-ms - -- rule: - paths: - - "documentation/**" - reviewers: - - josefree - - akning-ms - + - NullMDR + - ruowan - rule: - paths: - - "**/package.json" - - ".github/**" - - "**/azure-pipelines.yml" - - ".azure-pipelines/**" - - ".azure-pipelines-preproduction/**" + paths: + - "**/package.json" + - "package.json" reviewers: - - akning-ms - - PhoenixHe-msft - - raych1 - - zhenglaizhang + - ruowan - rule: - # manager-plane PR - paths: - - "**" + paths: "**" reviewers: - - erich-wang - - PhoenixHe-msft - - lirenhe - - weidongxu-microsoft - - ArcturusZhang - - xccc-msft - - raych1 - - ChenTanyi - - njuCZ - - akning-ms - - leni-msft - - qianwens - ruowan - - jianyexi - - zhenglaizhang - - chunyu3 diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 9733d1f05cd2..d88a90393224 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -1,7 +1,7 @@ { "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/specificationRepositoryConfiguration.schema.json", - "pipelineName": "automation - sdk", - "sdkRepositoryMappings": { + "pipelineName": "automation - sdk - test", + "sdkRepositoryMappings": { "azure-sdk-for-go": { "integrationRepository": "AzureSDKAutomation/azure-sdk-for-go", "mainRepository": "Azure/azure-sdk-for-go" @@ -43,37 +43,61 @@ } }, "overrides": { - "Azure/azure-rest-api-specs-pr": { + "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { "azure-sdk-for-go": { - "integrationRepository": "azure-sdk/azure-sdk-for-go-pr", - "mainRepository": "Azure/azure-sdk-for-go-pr" + "mainBranch": "sdk-automation", + "mainRepository": "openapi-env-test/azure-sdk-for-go" }, "azure-sdk-for-java": { - "integrationRepository": "azure-sdk/azure-sdk-for-java-pr", - "mainRepository": "Azure/azure-sdk-for-java-pr", - "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" + "mainRepository": "openapi-env-test/azure-sdk-for-java" }, "azure-sdk-for-js": { - "integrationRepository": "azure-sdk/azure-sdk-for-js-pr", - "mainRepository": "Azure/azure-sdk-for-js-pr" + "mainRepository": "openapi-env-test/azure-sdk-for-js" }, "azure-sdk-for-net": { - "integrationRepository": "azure-sdk/azure-sdk-for-net-pr", - "mainRepository": "Azure/azure-sdk-for-net-pr" + "mainRepository": "openapi-env-test/azure-sdk-for-net" }, "azure-sdk-for-python": { - "integrationRepository": "azure-sdk/azure-sdk-for-python-pr", - "mainRepository": "Azure/azure-sdk-for-python-pr", + "mainRepository": "openapi-env-test/azure-sdk-for-python", "mainBranch": "release/v3" }, "azure-sdk-for-python-track2": { - "integrationRepository": "azure-sdk/azure-sdk-for-python-pr", - "mainRepository": "Azure/azure-sdk-for-python-pr" + "mainRepository": "openapi-env-test/azure-sdk-for-python" }, "azure-cli-extensions": { - "integrationRepository": "azure-sdk/azure-cli-extensions-pr", - "mainRepository": "Azure/azure-cli-extensions-pr" + "mainBranch": "report-diff-test", + "mainRepository": "openapi-env-test/azure-cli-extensions" + }, + "azure-sdk-for-ruby": { + "mainBranch": "latest", + "mainRepository": "openapi-env-test/azure-sdk-for-ruby" + }, + "azure-sdk-for-node": "openapi-env-test/azure-sdk-for-node", + "azure-sdk-for-trenton": { + "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", + "mainRepository": "test-repo-billy/azure-sdk-for-trenton", + "secondaryRepository":"test-repo-billy/azure-sdk-for-trenton", + "secondaryBranch":"secondary" + }, + "azure-resource-manager-schemas": { + "mainRepository": "openapi-env-test/azure-resource-manager-schemas" + }, + "azure-sdk-for-net-shivangi": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "Shivangi_AutomationScript" + }, + "azure-sdk-for-python-lmazuel": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "LMazuel_AutomationScript" + }, + "azure-sdk-for-net-minghc": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "v-minghc_testScript" + }, + "azure-sdk-for-java-track2": { + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "mainBranch": "v2" } } } From 8327f39530106b4f3380acf0f5312ffb194eded0 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Tue, 24 Nov 2020 12:24:42 +0800 Subject: [PATCH 02/51] python (#888) --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index d88a90393224..2e29fed48d5d 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -60,7 +60,7 @@ }, "azure-sdk-for-python": { "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "release/v3" + "mainBranch": "python-track1-test" }, "azure-sdk-for-python-track2": { "mainRepository": "openapi-env-test/azure-sdk-for-python" From 7a82978984fe53cdad1929fed2677fb12ebf870b Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 25 Nov 2020 21:28:52 +0800 Subject: [PATCH 03/51] python-track1-test to release/v3 for test --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 2e29fed48d5d..d88a90393224 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -60,7 +60,7 @@ }, "azure-sdk-for-python": { "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track1-test" + "mainBranch": "release/v3" }, "azure-sdk-for-python-track2": { "mainRepository": "openapi-env-test/azure-sdk-for-python" From ab56b7659669149984d7649af5e2f8c727ea5319 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Thu, 26 Nov 2020 11:42:26 +0800 Subject: [PATCH 04/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index d88a90393224..2e29fed48d5d 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -60,7 +60,7 @@ }, "azure-sdk-for-python": { "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "release/v3" + "mainBranch": "python-track1-test" }, "azure-sdk-for-python-track2": { "mainRepository": "openapi-env-test/azure-sdk-for-python" From a2c119907f7d1f787d688e4e9619061c2ecaa6ac Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 2 Dec 2020 13:08:44 +0800 Subject: [PATCH 05/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 2e29fed48d5d..cf4ff9876272 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -85,7 +85,8 @@ }, "azure-sdk-for-net-shivangi": { "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "Shivangi_AutomationScript" + "mainBranch": "Shivangi_AutomationScript", + "configFilePath": "./eng/swagger_to_sdk_config.json" }, "azure-sdk-for-python-lmazuel": { "mainRepository": "openapi-env-test/azure-sdk-for-python", From 82f9ebe8cba99f582fbb906e4f5c37245a38a900 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 2 Dec 2020 13:17:06 +0800 Subject: [PATCH 06/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index cf4ff9876272..27bfe0c81165 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -86,7 +86,7 @@ "azure-sdk-for-net-shivangi": { "mainRepository": "openapi-env-test/azure-sdk-for-net", "mainBranch": "Shivangi_AutomationScript", - "configFilePath": "./eng/swagger_to_sdk_config.json" + "configFilePath": "eng/swagger_to_sdk_config.json" }, "azure-sdk-for-python-lmazuel": { "mainRepository": "openapi-env-test/azure-sdk-for-python", From 6b5d27068110d4cae512572a87201de18424ec47 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Fri, 4 Dec 2020 14:52:36 +0800 Subject: [PATCH 07/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 27bfe0c81165..e7693f96dd8a 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -69,17 +69,6 @@ "mainBranch": "report-diff-test", "mainRepository": "openapi-env-test/azure-cli-extensions" }, - "azure-sdk-for-ruby": { - "mainBranch": "latest", - "mainRepository": "openapi-env-test/azure-sdk-for-ruby" - }, - "azure-sdk-for-node": "openapi-env-test/azure-sdk-for-node", - "azure-sdk-for-trenton": { - "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", - "mainRepository": "test-repo-billy/azure-sdk-for-trenton", - "secondaryRepository":"test-repo-billy/azure-sdk-for-trenton", - "secondaryBranch":"secondary" - }, "azure-resource-manager-schemas": { "mainRepository": "openapi-env-test/azure-resource-manager-schemas" }, From 59c9fe2511af603b83fffff08d0055f492711b3e Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Mon, 7 Dec 2020 11:43:00 +0800 Subject: [PATCH 08/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index e7693f96dd8a..2ef2617abc2b 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -50,7 +50,8 @@ "mainRepository": "openapi-env-test/azure-sdk-for-go" }, "azure-sdk-for-java": { - "mainRepository": "openapi-env-test/azure-sdk-for-java" + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" }, "azure-sdk-for-js": { "mainRepository": "openapi-env-test/azure-sdk-for-js" @@ -84,10 +85,6 @@ "azure-sdk-for-net-minghc": { "mainRepository": "openapi-env-test/azure-sdk-for-net", "mainBranch": "v-minghc_testScript" - }, - "azure-sdk-for-java-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-java", - "mainBranch": "v2" } } } From 5040e24677138b6b25b17a95eccc9d254e9e7511 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 16 Dec 2020 11:10:17 +0800 Subject: [PATCH 09/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 2ef2617abc2b..771b5f5c5bab 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -46,7 +46,6 @@ "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { "azure-sdk-for-go": { - "mainBranch": "sdk-automation", "mainRepository": "openapi-env-test/azure-sdk-for-go" }, "azure-sdk-for-java": { From ce6cc2fd65818f9a824890f2bc66a481e8412a19 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Tue, 22 Dec 2020 11:45:26 +0800 Subject: [PATCH 10/51] add ISV repo contoso 2020-12-21 api defs --- .../preview/2020-12-21/contoso.json | 232 ++++++++++++++++++ .../examples/OperationGroupGet.json | 16 ++ .../readme.azureresourceschema.md | 23 ++ .../contoso/resource-manager/readme.csharp.md | 15 ++ .../contoso/resource-manager/readme.go.md | 26 ++ .../contoso/resource-manager/readme.md | 83 +++++++ .../contoso/resource-manager/readme.python.md | 40 +++ .../resource-manager/readme.typescript.md | 14 ++ 8 files changed, 449 insertions(+) create mode 100644 specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json create mode 100644 specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json create mode 100644 specification/contoso/resource-manager/readme.azureresourceschema.md create mode 100644 specification/contoso/resource-manager/readme.csharp.md create mode 100644 specification/contoso/resource-manager/readme.go.md create mode 100644 specification/contoso/resource-manager/readme.md create mode 100644 specification/contoso/resource-manager/readme.python.md create mode 100644 specification/contoso/resource-manager/readme.typescript.md diff --git a/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json new file mode 100644 index 000000000000..9a6f63881817 --- /dev/null +++ b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json @@ -0,0 +1,232 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-12-21", + "title": "contoso", + "description": "Description of the new service" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Contoso/foos/{fooName}": { + "get": { + "tags": [ + "Foos" + ], + "operationId": "Foos_Get", + "x-ms-examples": { + "BatchAccountDelete": { + "$ref": "./examples/OperationGroupGet.json" + } + }, + "description": "This is a sample get operation", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/FooName" + } + ], + "responses": { + "200": { + "description": "Describe the result of a successful operation.", + "schema": { + "$ref": "#/definitions/Result" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Contoso/operations": { + "get": { + "tags": [ + "Operations" + ], + "description": "Lists all of the available RP operations.", + "operationId": "ListOperations", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "Result": { + "description": "Sample result definition", + "properties": { + "sampleProperty": { + "type": "string", + "description": "Sample property of type string" + } + } + }, + "Operation": { + "description": "A Consumption REST API operation.", + "type": "object", + "properties": { + "name": { + "description": "Operation name: {provider}/{resource}/{operation}.", + "type": "string", + "readOnly": true + }, + "display": { + "description": "The object that represents the operation.", + "properties": { + "provider": { + "description": "Service provider: Microsoft.Consumption.", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "Resource on which the operation is performed: UsageDetail, etc.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string", + "readOnly": true + } + } + } + } + }, + "OperationListResult": { + "description": "Result of listing consumption operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "value": { + "description": "List of consumption operations supported by the Microsoft.Consumption resource provider.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Operation" + } + }, + "nextLink": { + "description": "URL to get the next set of operation list results if there are any.", + "type": "string", + "readOnly": true + } + } + }, + "ErrorResponse": { + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "description": "Error definition.", + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Description of the error.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to be used with the HTTP request." + }, + "FooName": { + "name": "fooName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Foo", + "x-ms-parameter-location": "method" + } + } +} \ No newline at end of file diff --git a/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json new file mode 100644 index 000000000000..67da0b2c0904 --- /dev/null +++ b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "accountName": "sampleacct", + "resourceGroupName": "contosoClient", + "fooName": "foodName", + "api-version": "2020-12-21", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "sampleProperty": "sampleProperty" + } + } + } +} \ No newline at end of file diff --git a/specification/contoso/resource-manager/readme.azureresourceschema.md b/specification/contoso/resource-manager/readme.azureresourceschema.md new file mode 100644 index 000000000000..09cdd9a9cead --- /dev/null +++ b/specification/contoso/resource-manager/readme.azureresourceschema.md @@ -0,0 +1,23 @@ +## AzureResourceSchema + +These settings apply only when `--azureresourceschema` is specified on the command line. + +### AzureResourceSchema multi-api + +``` yaml $(azureresourceschema) && $(multiapi) +batch: + - tag: schema-contoso-2020-12-21 + +``` + +Please also specify `--azureresourceschema-folder=`. + +### Tag: schema-contoso-2020-12-21 and azureresourceschema + +``` yaml $(tag) == 'schema-contoso-2020-12-21' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas + +# all the input files in this apiVersion +input-file: + - Microsoft.Contoso/preview/2020-12-21/contoso.json +``` diff --git a/specification/contoso/resource-manager/readme.csharp.md b/specification/contoso/resource-manager/readme.csharp.md new file mode 100644 index 000000000000..5c92cd99c572 --- /dev/null +++ b/specification/contoso/resource-manager/readme.csharp.md @@ -0,0 +1,15 @@ +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +```yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 1 + clear-output-folder: true + client-side-validation: false + namespace: Microsoft.Contoso + output-folder: $(csharp-sdks-folder)/contoso/management/Microsoft.Contoso/GeneratedProtocol +``` diff --git a/specification/contoso/resource-manager/readme.go.md b/specification/contoso/resource-manager/readme.go.md new file mode 100644 index 000000000000..f032ba09c1a4 --- /dev/null +++ b/specification/contoso/resource-manager/readme.go.md @@ -0,0 +1,26 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +```yaml $(go) +go: + license-header: MICROSOFT_APACHE_NO_VERSION + namespace: contoso + clear-output-folder: true +``` + +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2020-12-21-preview +``` + +### Tag: package-2020-12-21-preview and go + +These settings apply only when `--tag=package-2020-12-21-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +```yaml $(tag) == 'package-2020-12-21-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-12-21/$(namespace) +``` diff --git a/specification/contoso/resource-manager/readme.md b/specification/contoso/resource-manager/readme.md new file mode 100644 index 000000000000..0862cc5d94c3 --- /dev/null +++ b/specification/contoso/resource-manager/readme.md @@ -0,0 +1,83 @@ +# contoso + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for contoso. + +## Getting Started + +To build the SDKs for My API, simply install AutoRest via `npm` (`npm install -g autorest`) and then run: + +> `autorest readme.md` + +To see additional help and options, run: + +> `autorest --help` + +For other options on installation see [Installing AutoRest](https://aka.ms/autorest/install) on the AutoRest github page. + +--- + +## Configuration + +### Basic Information + +These are the global settings for the contoso. + +```yaml +openapi-type: arm +tag: package-2020-12-21 +``` + +### Tag: package-2020-12-21 + +These settings apply only when `--tag=package-2020-12-21` is specified on the command line. + +```yaml $(tag) == 'package-2020-12-21' +input-file: + - Microsoft.Contoso/preview/2020-12-21/contoso.json +``` + +--- + +# Code Generation + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +```yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-python + - repo: azure-sdk-for-java + - repo: azure-sdk-for-go + - repo: azure-sdk-for-js + - repo: azure-resource-manager-schemas + after_scripts: + - node sdkauto_afterscript.js contoso/resource-manager + - repo: azure-cli-extensions +``` +## Az + +See configuration in [readme.az.md](./readme.az.md) + +## Go + +See configuration in [readme.go.md](./readme.go.md) + +## Python + +See configuration in [readme.python.md](./readme.python.md) + +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + +## CSharp + +See configuration in [readme.csharp.md](./readme.csharp.md) + +## AzureResourceSchema + +See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) diff --git a/specification/contoso/resource-manager/readme.python.md b/specification/contoso/resource-manager/readme.python.md new file mode 100644 index 000000000000..7a1bac02e178 --- /dev/null +++ b/specification/contoso/resource-manager/readme.python.md @@ -0,0 +1,40 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + + +``` yaml $(python) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + package-name: azure-mgmt-contoso + no-namespace-folders: true + package-version: 1.0.0b1 +``` + +``` yaml $(python-mode) == 'update' +python: + output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso/azure/mgmt/contoso +``` +``` yaml $(python-mode) == 'create' +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso +``` + +``` yaml $(python) && $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-contoso +no-namespace-folders: true +package-version: 1.0.0b1 +``` + +``` yaml $(python-mode) == 'update' && $(track2) +output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso/azure/mgmt/contoso +``` +``` yaml $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso +``` diff --git a/specification/contoso/resource-manager/readme.typescript.md b/specification/contoso/resource-manager/readme.typescript.md new file mode 100644 index 000000000000..05891a4d2a7b --- /dev/null +++ b/specification/contoso/resource-manager/readme.typescript.md @@ -0,0 +1,14 @@ +## TypeScript + +These settings apply only when `--typescript` is specified on the command line. +Please also specify `--typescript-sdks-folder=`. + +``` yaml $(typescript) +typescript: + azure-arm: true + package-name: "@azure/arm-contoso" + output-folder: "$(typescript-sdks-folder)/sdk/contoso/arm-contoso" + payload-flattening-threshold: 1 + clear-output-folder: true + generate-metadata: true +``` From bcd929cdf0e9b6fe4207923ff67091de23effe61 Mon Sep 17 00:00:00 2001 From: Ruoxuan Wang <52271048+ruowan@users.noreply.github.com> Date: Mon, 4 Jan 2021 11:16:33 +0800 Subject: [PATCH 11/51] Update advisor.json --- .../Microsoft.Advisor/stable/2020-01-01/advisor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json index a2e0d41741c0..846c0d127b21 100644 --- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json +++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json @@ -57,7 +57,7 @@ }, "x-ms-examples": { "GetMetadata": { - "$ref": "./examples/GetRecommendationMetadataEntity.json" + "$ref": "./examples/GetRecommendationMetadataEntity1.json" } } } From 11df1010b8ea6f2fce3c06f5b12738ad222eae07 Mon Sep 17 00:00:00 2001 From: Ruoxuan Wang <52271048+ruowan@users.noreply.github.com> Date: Mon, 4 Jan 2021 11:16:45 +0800 Subject: [PATCH 12/51] Update advisor.json --- .../Microsoft.Advisor/stable/2020-01-01/advisor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json index 846c0d127b21..a2e0d41741c0 100644 --- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json +++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json @@ -57,7 +57,7 @@ }, "x-ms-examples": { "GetMetadata": { - "$ref": "./examples/GetRecommendationMetadataEntity1.json" + "$ref": "./examples/GetRecommendationMetadataEntity.json" } } } From 56c2daa00327d2189a8f1595ea91546b92f7f290 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 11:20:25 +0800 Subject: [PATCH 13/51] sdk automation for trenton --- specificationRepositoryConfiguration.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 771b5f5c5bab..b1acbe9b8774 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -40,6 +40,12 @@ "azure-resource-manager-schemas": { "integrationRepository": "AzureSDKAutomation/azure-resource-manager-schemas", "mainRepository": "Azure/azure-resource-manager-schemas" + }, + "azure-sdk-for-trenton": { + "integrationRepository": "Azure/azure-sdk-for-trenton", + "mainRepository": "Azure/azure-sdk-for-trenton", + "secondaryRepository": "Azure/azure-sdk-for-trenton", + "secondaryBranch": "secondary" } }, "overrides": { From e6b65dce833e93f73df97e1f94a9fd9b2da54a49 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 11:35:52 +0800 Subject: [PATCH 14/51] trenton pipeline test --- specification/iotspaces/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md index 49a0a68b3682..5846a3e19b49 100644 --- a/specification/iotspaces/resource-manager/readme.md +++ b/specification/iotspaces/resource-manager/readme.md @@ -100,4 +100,3 @@ See configuration in [readme.go.md](./readme.go.md) ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) - From 482eb8d68e87ce585ecfc494c6ae70fd6cf2e36e Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 11:37:24 +0800 Subject: [PATCH 15/51] test for trenton automation --- specification/iotspaces/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md index 5846a3e19b49..176a3475f475 100644 --- a/specification/iotspaces/resource-manager/readme.md +++ b/specification/iotspaces/resource-manager/readme.md @@ -73,6 +73,7 @@ swagger-to-sdk: - repo: azure-sdk-for-go - repo: azure-sdk-for-js - repo: azure-sdk-for-node + - repo: azure-sdk-for-trenton - repo: azure-resource-manager-schemas after_scripts: - node sdkauto_afterscript.js iotspaces/resource-manager From 79b29de36eb58b97c352cba7f9eeae24f826355f Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 14:25:09 +0800 Subject: [PATCH 16/51] add trenton automation --- specificationRepositoryConfiguration.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index b1acbe9b8774..86e7b21ca5e4 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -40,12 +40,6 @@ "azure-resource-manager-schemas": { "integrationRepository": "AzureSDKAutomation/azure-resource-manager-schemas", "mainRepository": "Azure/azure-resource-manager-schemas" - }, - "azure-sdk-for-trenton": { - "integrationRepository": "Azure/azure-sdk-for-trenton", - "mainRepository": "Azure/azure-sdk-for-trenton", - "secondaryRepository": "Azure/azure-sdk-for-trenton", - "secondaryBranch": "secondary" } }, "overrides": { @@ -90,6 +84,12 @@ "azure-sdk-for-net-minghc": { "mainRepository": "openapi-env-test/azure-sdk-for-net", "mainBranch": "v-minghc_testScript" + }, + "azure-sdk-for-trenton": { + "integrationRepository": "Azure/azure-sdk-for-trenton", + "mainRepository": "Azure/azure-sdk-for-trenton", + "secondaryRepository": "Azure/azure-sdk-for-trenton", + "secondaryBranch": "secondary" } } } From 1aafa3e8e1621bbb4e25bb4332f86a067704eae7 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 14:59:36 +0800 Subject: [PATCH 17/51] trenton automation test --- specification/iotspaces/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md index 176a3475f475..a405b1f149dd 100644 --- a/specification/iotspaces/resource-manager/readme.md +++ b/specification/iotspaces/resource-manager/readme.md @@ -101,3 +101,4 @@ See configuration in [readme.go.md](./readme.go.md) ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) + From 36f7c95225ba4e06ecdfdf579277842cb576b6b8 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 16:30:14 +0800 Subject: [PATCH 18/51] change test repo --- specificationRepositoryConfiguration.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 86e7b21ca5e4..c1066f6e48e6 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -86,9 +86,9 @@ "mainBranch": "v-minghc_testScript" }, "azure-sdk-for-trenton": { - "integrationRepository": "Azure/azure-sdk-for-trenton", - "mainRepository": "Azure/azure-sdk-for-trenton", - "secondaryRepository": "Azure/azure-sdk-for-trenton", + "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", + "mainRepository": "test-repo-billy/azure-sdk-for-trenton", + "secondaryRepository": "test-repo-billy/azure-sdk-for-trenton", "secondaryBranch": "secondary" } } From aaf49d814dfb33be380dc9e7fc15afa921223e6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=AE=AD=E9=A3=9E?= <32889038+chenjianfei2017@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:26:32 +0800 Subject: [PATCH 19/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index c1066f6e48e6..807183a0bf7e 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -88,8 +88,7 @@ "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", - "secondaryRepository": "test-repo-billy/azure-sdk-for-trenton", - "secondaryBranch": "secondary" + "mainBranch": "secondary" } } } From fe648dc24d74f1d573ee10ba1364934f5fd92397 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Fri, 22 Jan 2021 12:53:29 +0800 Subject: [PATCH 20/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 40 ----------------------- 1 file changed, 40 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 807183a0bf7e..0081605348a2 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,46 +45,6 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { - "azure-sdk-for-go": { - "mainRepository": "openapi-env-test/azure-sdk-for-go" - }, - "azure-sdk-for-java": { - "mainRepository": "openapi-env-test/azure-sdk-for-java", - "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" - }, - "azure-sdk-for-js": { - "mainRepository": "openapi-env-test/azure-sdk-for-js" - }, - "azure-sdk-for-net": { - "mainRepository": "openapi-env-test/azure-sdk-for-net" - }, - "azure-sdk-for-python": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track1-test" - }, - "azure-sdk-for-python-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-python" - }, - "azure-cli-extensions": { - "mainBranch": "report-diff-test", - "mainRepository": "openapi-env-test/azure-cli-extensions" - }, - "azure-resource-manager-schemas": { - "mainRepository": "openapi-env-test/azure-resource-manager-schemas" - }, - "azure-sdk-for-net-shivangi": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "Shivangi_AutomationScript", - "configFilePath": "eng/swagger_to_sdk_config.json" - }, - "azure-sdk-for-python-lmazuel": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "LMazuel_AutomationScript" - }, - "azure-sdk-for-net-minghc": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "v-minghc_testScript" - }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From 1f45b8c52ebc042fe13f075d326c1ea967e14cf7 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Thu, 28 Jan 2021 00:05:24 +0800 Subject: [PATCH 21/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 0081605348a2..b68a31afc37c 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,6 +45,46 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { + "azure-sdk-for-go": { + "mainRepository": "openapi-env-test/azure-sdk-for-go" + }, + "azure-sdk-for-java": { + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" + }, + "azure-sdk-for-js": { + "mainRepository": "openapi-env-test/azure-sdk-for-js" + }, + "azure-sdk-for-net": { + "mainRepository": "openapi-env-test/azure-sdk-for-net" + }, + "azure-sdk-for-python": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track1-test" + }, + "azure-sdk-for-python-track2": { + "mainRepository": "openapi-env-test/azure-sdk-for-python" + }, + "azure-cli-extensions": { + "mainBranch": "report-diff-test", + "mainRepository": "openapi-env-test/azure-cli-extensions" + }, + "azure-resource-manager-schemas": { + "mainRepository": "openapi-env-test/azure-resource-manager-schemas" + }, + "azure-sdk-for-net-shivangi": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "Shivangi_AutomationScript", + "configFilePath": "eng/swagger_to_sdk_config.json" + }, + "azure-sdk-for-python-lmazuel": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "LMazuel_AutomationScript" + }, + "azure-sdk-for-net-minghc": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "v-minghc_testScript" + }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From 6ab1288e46efce0721a595e5909e1897dbf4adc0 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Wed, 3 Feb 2021 16:31:33 +0800 Subject: [PATCH 22/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index b68a31afc37c..e6b3a805482e 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -63,7 +63,8 @@ "mainBranch": "python-track1-test" }, "azure-sdk-for-python-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-python" + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track2-test" }, "azure-cli-extensions": { "mainBranch": "report-diff-test", From 7c41702b41f0823c1c48f36b50051b0c8637279b Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Thu, 4 Feb 2021 15:30:54 +0800 Subject: [PATCH 23/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 41 ----------------------- 1 file changed, 41 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index e6b3a805482e..0081605348a2 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,47 +45,6 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { - "azure-sdk-for-go": { - "mainRepository": "openapi-env-test/azure-sdk-for-go" - }, - "azure-sdk-for-java": { - "mainRepository": "openapi-env-test/azure-sdk-for-java", - "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" - }, - "azure-sdk-for-js": { - "mainRepository": "openapi-env-test/azure-sdk-for-js" - }, - "azure-sdk-for-net": { - "mainRepository": "openapi-env-test/azure-sdk-for-net" - }, - "azure-sdk-for-python": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track1-test" - }, - "azure-sdk-for-python-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track2-test" - }, - "azure-cli-extensions": { - "mainBranch": "report-diff-test", - "mainRepository": "openapi-env-test/azure-cli-extensions" - }, - "azure-resource-manager-schemas": { - "mainRepository": "openapi-env-test/azure-resource-manager-schemas" - }, - "azure-sdk-for-net-shivangi": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "Shivangi_AutomationScript", - "configFilePath": "eng/swagger_to_sdk_config.json" - }, - "azure-sdk-for-python-lmazuel": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "LMazuel_AutomationScript" - }, - "azure-sdk-for-net-minghc": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "v-minghc_testScript" - }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From ee30aa374940257b8a8cd8c45201ecaea9a00616 Mon Sep 17 00:00:00 2001 From: Xiaogang Date: Fri, 5 Feb 2021 13:38:44 +0800 Subject: [PATCH 24/51] Add azure-powershell --- specificationRepositoryConfiguration.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 0081605348a2..0cea38260af6 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -49,6 +49,9 @@ "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", "mainBranch": "secondary" + }, + "azure-powershell": { + "mainRepository": "openapi-env-test/azure-powershell" } } } From b4ea581c911f3241153850aef27801441ec9fa18 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Sun, 7 Feb 2021 14:36:21 +0800 Subject: [PATCH 25/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 0cea38260af6..c14ab0b0b808 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,6 +45,47 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { + "azure-sdk-for-go": { + "mainRepository": "openapi-env-test/azure-sdk-for-go" + }, + "azure-sdk-for-java": { + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" + }, + "azure-sdk-for-js": { + "mainRepository": "openapi-env-test/azure-sdk-for-js" + }, + "azure-sdk-for-net": { + "mainRepository": "openapi-env-test/azure-sdk-for-net" + }, + "azure-sdk-for-python": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track1-test" + }, + "azure-sdk-for-python-track2": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track2-test" + }, + "azure-cli-extensions": { + "mainBranch": "report-diff-test", + "mainRepository": "openapi-env-test/azure-cli-extensions" + }, + "azure-resource-manager-schemas": { + "mainRepository": "openapi-env-test/azure-resource-manager-schemas" + }, + "azure-sdk-for-net-shivangi": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "Shivangi_AutomationScript", + "configFilePath": "eng/swagger_to_sdk_config.json" + }, + "azure-sdk-for-python-lmazuel": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "LMazuel_AutomationScript" + }, + "azure-sdk-for-net-minghc": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "v-minghc_testScript" + }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From 2cbb57741c7594286d0848ddcdb4f635c482f586 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Tue, 17 Nov 2020 15:27:52 +0800 Subject: [PATCH 26/51] merge changes on test --- .github/issue_assignment.yml | 11 ++-- .github/pull_request_assignment.yml | 68 +++++++++++------------ specificationRepositoryConfiguration.json | 60 ++++++++++++++------ 3 files changed, 81 insertions(+), 58 deletions(-) diff --git a/.github/issue_assignment.yml b/.github/issue_assignment.yml index db9ce6dfd4a2..b31a0e8a1880 100644 --- a/.github/issue_assignment.yml +++ b/.github/issue_assignment.yml @@ -1,12 +1,13 @@ --- - rule: - booleanFilterExpression: "needs-triage" + booleanFilterExpression: "Java" assignees: - - PhoenixHe-msft - - raych1 - - akning-ms - - leni-msft - ruowan - jianyexi - zhenglaizhang +- rule: + booleanFilterExpression: "Python" + assignees: + - ruowan + - PhoenixHe-msft diff --git a/.github/pull_request_assignment.yml b/.github/pull_request_assignment.yml index cae1b0e3f21d..3b2b0a413e3a 100644 --- a/.github/pull_request_assignment.yml +++ b/.github/pull_request_assignment.yml @@ -1,52 +1,50 @@ --- - rule: - # eventgrid data-plane PR - paths: - - "specification/eventgrid/data-plane/**" + paths: "documentation/**" reviewers: - - lmazuel - + - ruowan + - raych1 + +- rule: + paths: "specification/@(security|edgeorder|synapse)/**" + reviewers: + - ruowan + - rule: - # synapse data-plane PR - paths: - - "specification/synapse/data-plane/**" + paths: "specification/**/Microsoft.Network/**" reviewers: - - jonathandturner + - ruowan + - NullMDR + - Dreamgoing - rule: - # data-plane PR - paths: - - "specification/**/data-plane/**" + paths: + - "specification/@(containerservice|databricks|containerregistry|compute)/**" + - "specification/@(docker)/**" reviewers: - - anuchandy - - jhendrixMSFT - - tjprescott - + - ruowan + - Dreamgoing + - rule: - paths: - - "documentation/**" + paths: "specification/**/date-plane/**" reviewers: - - josefree - - akning-ms + - Dreamgoing +- rule: + paths: + - "specification/**/resource-manager/**" + reviewers: + - NullMDR + - ruowan - rule: - paths: - - "**/package.json" - - ".github/**" - - "**/azure-pipelines.yml" - - ".azure-pipelines/**" - - ".azure-pipelines-preproduction/**" + paths: + - "**/package.json" + - "package.json" reviewers: - - akning-ms - - PhoenixHe-msft - - raych1 - - zhenglaizhang + - ruowan - rule: - # manager-plane PR - paths: - - "**" + paths: "**" reviewers: - - allenjzhang - - markcowl + - ruowan diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 9733d1f05cd2..d88a90393224 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -1,7 +1,7 @@ { "$schema": "https://openapistorageprod.blob.core.windows.net/sdkautomation/prod/schemas/specificationRepositoryConfiguration.schema.json", - "pipelineName": "automation - sdk", - "sdkRepositoryMappings": { + "pipelineName": "automation - sdk - test", + "sdkRepositoryMappings": { "azure-sdk-for-go": { "integrationRepository": "AzureSDKAutomation/azure-sdk-for-go", "mainRepository": "Azure/azure-sdk-for-go" @@ -43,37 +43,61 @@ } }, "overrides": { - "Azure/azure-rest-api-specs-pr": { + "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { "azure-sdk-for-go": { - "integrationRepository": "azure-sdk/azure-sdk-for-go-pr", - "mainRepository": "Azure/azure-sdk-for-go-pr" + "mainBranch": "sdk-automation", + "mainRepository": "openapi-env-test/azure-sdk-for-go" }, "azure-sdk-for-java": { - "integrationRepository": "azure-sdk/azure-sdk-for-java-pr", - "mainRepository": "Azure/azure-sdk-for-java-pr", - "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" + "mainRepository": "openapi-env-test/azure-sdk-for-java" }, "azure-sdk-for-js": { - "integrationRepository": "azure-sdk/azure-sdk-for-js-pr", - "mainRepository": "Azure/azure-sdk-for-js-pr" + "mainRepository": "openapi-env-test/azure-sdk-for-js" }, "azure-sdk-for-net": { - "integrationRepository": "azure-sdk/azure-sdk-for-net-pr", - "mainRepository": "Azure/azure-sdk-for-net-pr" + "mainRepository": "openapi-env-test/azure-sdk-for-net" }, "azure-sdk-for-python": { - "integrationRepository": "azure-sdk/azure-sdk-for-python-pr", - "mainRepository": "Azure/azure-sdk-for-python-pr", + "mainRepository": "openapi-env-test/azure-sdk-for-python", "mainBranch": "release/v3" }, "azure-sdk-for-python-track2": { - "integrationRepository": "azure-sdk/azure-sdk-for-python-pr", - "mainRepository": "Azure/azure-sdk-for-python-pr" + "mainRepository": "openapi-env-test/azure-sdk-for-python" }, "azure-cli-extensions": { - "integrationRepository": "azure-sdk/azure-cli-extensions-pr", - "mainRepository": "Azure/azure-cli-extensions-pr" + "mainBranch": "report-diff-test", + "mainRepository": "openapi-env-test/azure-cli-extensions" + }, + "azure-sdk-for-ruby": { + "mainBranch": "latest", + "mainRepository": "openapi-env-test/azure-sdk-for-ruby" + }, + "azure-sdk-for-node": "openapi-env-test/azure-sdk-for-node", + "azure-sdk-for-trenton": { + "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", + "mainRepository": "test-repo-billy/azure-sdk-for-trenton", + "secondaryRepository":"test-repo-billy/azure-sdk-for-trenton", + "secondaryBranch":"secondary" + }, + "azure-resource-manager-schemas": { + "mainRepository": "openapi-env-test/azure-resource-manager-schemas" + }, + "azure-sdk-for-net-shivangi": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "Shivangi_AutomationScript" + }, + "azure-sdk-for-python-lmazuel": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "LMazuel_AutomationScript" + }, + "azure-sdk-for-net-minghc": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "v-minghc_testScript" + }, + "azure-sdk-for-java-track2": { + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "mainBranch": "v2" } } } From 134c24fb7b7234d841baa0d87f2e784b2ef32275 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Tue, 24 Nov 2020 12:24:42 +0800 Subject: [PATCH 27/51] python (#888) --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index d88a90393224..2e29fed48d5d 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -60,7 +60,7 @@ }, "azure-sdk-for-python": { "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "release/v3" + "mainBranch": "python-track1-test" }, "azure-sdk-for-python-track2": { "mainRepository": "openapi-env-test/azure-sdk-for-python" From 319232fd6310957aef29aa7852cd904b929c6012 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 25 Nov 2020 21:28:52 +0800 Subject: [PATCH 28/51] python-track1-test to release/v3 for test --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 2e29fed48d5d..d88a90393224 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -60,7 +60,7 @@ }, "azure-sdk-for-python": { "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track1-test" + "mainBranch": "release/v3" }, "azure-sdk-for-python-track2": { "mainRepository": "openapi-env-test/azure-sdk-for-python" From 2ada78e5ac5c8d6ec295c568e1a23a934b595018 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Thu, 26 Nov 2020 11:42:26 +0800 Subject: [PATCH 29/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index d88a90393224..2e29fed48d5d 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -60,7 +60,7 @@ }, "azure-sdk-for-python": { "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "release/v3" + "mainBranch": "python-track1-test" }, "azure-sdk-for-python-track2": { "mainRepository": "openapi-env-test/azure-sdk-for-python" From d8c938955a7a89d5e729fcd0965503cc84837ab6 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 2 Dec 2020 13:08:44 +0800 Subject: [PATCH 30/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 2e29fed48d5d..cf4ff9876272 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -85,7 +85,8 @@ }, "azure-sdk-for-net-shivangi": { "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "Shivangi_AutomationScript" + "mainBranch": "Shivangi_AutomationScript", + "configFilePath": "./eng/swagger_to_sdk_config.json" }, "azure-sdk-for-python-lmazuel": { "mainRepository": "openapi-env-test/azure-sdk-for-python", From 33c1ea3218dc419d13058680222146e42629fafc Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 2 Dec 2020 13:17:06 +0800 Subject: [PATCH 31/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index cf4ff9876272..27bfe0c81165 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -86,7 +86,7 @@ "azure-sdk-for-net-shivangi": { "mainRepository": "openapi-env-test/azure-sdk-for-net", "mainBranch": "Shivangi_AutomationScript", - "configFilePath": "./eng/swagger_to_sdk_config.json" + "configFilePath": "eng/swagger_to_sdk_config.json" }, "azure-sdk-for-python-lmazuel": { "mainRepository": "openapi-env-test/azure-sdk-for-python", From 140488418ed8facc272e881ed91a7b695ae42310 Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Fri, 4 Dec 2020 14:52:36 +0800 Subject: [PATCH 32/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 27bfe0c81165..e7693f96dd8a 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -69,17 +69,6 @@ "mainBranch": "report-diff-test", "mainRepository": "openapi-env-test/azure-cli-extensions" }, - "azure-sdk-for-ruby": { - "mainBranch": "latest", - "mainRepository": "openapi-env-test/azure-sdk-for-ruby" - }, - "azure-sdk-for-node": "openapi-env-test/azure-sdk-for-node", - "azure-sdk-for-trenton": { - "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", - "mainRepository": "test-repo-billy/azure-sdk-for-trenton", - "secondaryRepository":"test-repo-billy/azure-sdk-for-trenton", - "secondaryBranch":"secondary" - }, "azure-resource-manager-schemas": { "mainRepository": "openapi-env-test/azure-resource-manager-schemas" }, From 3172c37463f2eb6649255d2de93985fd03e2302a Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Mon, 7 Dec 2020 11:43:00 +0800 Subject: [PATCH 33/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index e7693f96dd8a..2ef2617abc2b 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -50,7 +50,8 @@ "mainRepository": "openapi-env-test/azure-sdk-for-go" }, "azure-sdk-for-java": { - "mainRepository": "openapi-env-test/azure-sdk-for-java" + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" }, "azure-sdk-for-js": { "mainRepository": "openapi-env-test/azure-sdk-for-js" @@ -84,10 +85,6 @@ "azure-sdk-for-net-minghc": { "mainRepository": "openapi-env-test/azure-sdk-for-net", "mainBranch": "v-minghc_testScript" - }, - "azure-sdk-for-java-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-java", - "mainBranch": "v2" } } } From 7da84814682747955a804519f6a033549e79c87f Mon Sep 17 00:00:00 2001 From: Phoenix He Date: Wed, 16 Dec 2020 11:10:17 +0800 Subject: [PATCH 34/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 2ef2617abc2b..771b5f5c5bab 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -46,7 +46,6 @@ "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { "azure-sdk-for-go": { - "mainBranch": "sdk-automation", "mainRepository": "openapi-env-test/azure-sdk-for-go" }, "azure-sdk-for-java": { From f5c27685ae1a4d120f6894b7ba962dddca49651a Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Tue, 22 Dec 2020 11:45:26 +0800 Subject: [PATCH 35/51] add ISV repo contoso 2020-12-21 api defs --- .../preview/2020-12-21/contoso.json | 232 ++++++++++++++++++ .../examples/OperationGroupGet.json | 16 ++ .../readme.azureresourceschema.md | 23 ++ .../contoso/resource-manager/readme.csharp.md | 15 ++ .../contoso/resource-manager/readme.go.md | 26 ++ .../contoso/resource-manager/readme.md | 83 +++++++ .../contoso/resource-manager/readme.python.md | 40 +++ .../resource-manager/readme.typescript.md | 14 ++ 8 files changed, 449 insertions(+) create mode 100644 specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json create mode 100644 specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json create mode 100644 specification/contoso/resource-manager/readme.azureresourceschema.md create mode 100644 specification/contoso/resource-manager/readme.csharp.md create mode 100644 specification/contoso/resource-manager/readme.go.md create mode 100644 specification/contoso/resource-manager/readme.md create mode 100644 specification/contoso/resource-manager/readme.python.md create mode 100644 specification/contoso/resource-manager/readme.typescript.md diff --git a/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json new file mode 100644 index 000000000000..9a6f63881817 --- /dev/null +++ b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/contoso.json @@ -0,0 +1,232 @@ +{ + "swagger": "2.0", + "info": { + "version": "2020-12-21", + "title": "contoso", + "description": "Description of the new service" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Contoso/foos/{fooName}": { + "get": { + "tags": [ + "Foos" + ], + "operationId": "Foos_Get", + "x-ms-examples": { + "BatchAccountDelete": { + "$ref": "./examples/OperationGroupGet.json" + } + }, + "description": "This is a sample get operation", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/FooName" + } + ], + "responses": { + "200": { + "description": "Describe the result of a successful operation.", + "schema": { + "$ref": "#/definitions/Result" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, + "/providers/Microsoft.Contoso/operations": { + "get": { + "tags": [ + "Operations" + ], + "description": "Lists all of the available RP operations.", + "operationId": "ListOperations", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK. The request has succeeded.", + "schema": { + "$ref": "#/definitions/OperationListResult" + } + }, + "default": { + "description": "Resource Provider error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "Result": { + "description": "Sample result definition", + "properties": { + "sampleProperty": { + "type": "string", + "description": "Sample property of type string" + } + } + }, + "Operation": { + "description": "A Consumption REST API operation.", + "type": "object", + "properties": { + "name": { + "description": "Operation name: {provider}/{resource}/{operation}.", + "type": "string", + "readOnly": true + }, + "display": { + "description": "The object that represents the operation.", + "properties": { + "provider": { + "description": "Service provider: Microsoft.Consumption.", + "type": "string", + "readOnly": true + }, + "resource": { + "description": "Resource on which the operation is performed: UsageDetail, etc.", + "type": "string", + "readOnly": true + }, + "operation": { + "description": "Operation type: Read, write, delete, etc.", + "type": "string", + "readOnly": true + } + } + } + } + }, + "OperationListResult": { + "description": "Result of listing consumption operations. It contains a list of operations and a URL link to get the next set of results.", + "properties": { + "value": { + "description": "List of consumption operations supported by the Microsoft.Consumption resource provider.", + "type": "array", + "readOnly": true, + "items": { + "$ref": "#/definitions/Operation" + } + }, + "nextLink": { + "description": "URL to get the next set of operation list results if there are any.", + "type": "string", + "readOnly": true + } + } + }, + "ErrorResponse": { + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "description": "Error definition.", + "properties": { + "code": { + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true + }, + "message": { + "description": "Description of the error.", + "type": "string", + "readOnly": true + }, + "details": { + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "required": true, + "type": "string", + "description": "The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000)" + }, + "ResourceGroupNameParameter": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group.", + "x-ms-parameter-location": "method" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "required": true, + "type": "string", + "description": "The API version to be used with the HTTP request." + }, + "FooName": { + "name": "fooName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the Foo", + "x-ms-parameter-location": "method" + } + } +} \ No newline at end of file diff --git a/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json new file mode 100644 index 000000000000..67da0b2c0904 --- /dev/null +++ b/specification/contoso/resource-manager/Microsoft.Contoso/preview/2020-12-21/examples/OperationGroupGet.json @@ -0,0 +1,16 @@ +{ + "parameters": { + "accountName": "sampleacct", + "resourceGroupName": "contosoClient", + "fooName": "foodName", + "api-version": "2020-12-21", + "subscriptionId": "subid" + }, + "responses": { + "200": { + "body": { + "sampleProperty": "sampleProperty" + } + } + } +} \ No newline at end of file diff --git a/specification/contoso/resource-manager/readme.azureresourceschema.md b/specification/contoso/resource-manager/readme.azureresourceschema.md new file mode 100644 index 000000000000..09cdd9a9cead --- /dev/null +++ b/specification/contoso/resource-manager/readme.azureresourceschema.md @@ -0,0 +1,23 @@ +## AzureResourceSchema + +These settings apply only when `--azureresourceschema` is specified on the command line. + +### AzureResourceSchema multi-api + +``` yaml $(azureresourceschema) && $(multiapi) +batch: + - tag: schema-contoso-2020-12-21 + +``` + +Please also specify `--azureresourceschema-folder=`. + +### Tag: schema-contoso-2020-12-21 and azureresourceschema + +``` yaml $(tag) == 'schema-contoso-2020-12-21' && $(azureresourceschema) +output-folder: $(azureresourceschema-folder)/schemas + +# all the input files in this apiVersion +input-file: + - Microsoft.Contoso/preview/2020-12-21/contoso.json +``` diff --git a/specification/contoso/resource-manager/readme.csharp.md b/specification/contoso/resource-manager/readme.csharp.md new file mode 100644 index 000000000000..5c92cd99c572 --- /dev/null +++ b/specification/contoso/resource-manager/readme.csharp.md @@ -0,0 +1,15 @@ +## C# + +These settings apply only when `--csharp` is specified on the command line. +Please also specify `--csharp-sdks-folder=`. + +```yaml $(csharp) +csharp: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + payload-flattening-threshold: 1 + clear-output-folder: true + client-side-validation: false + namespace: Microsoft.Contoso + output-folder: $(csharp-sdks-folder)/contoso/management/Microsoft.Contoso/GeneratedProtocol +``` diff --git a/specification/contoso/resource-manager/readme.go.md b/specification/contoso/resource-manager/readme.go.md new file mode 100644 index 000000000000..f032ba09c1a4 --- /dev/null +++ b/specification/contoso/resource-manager/readme.go.md @@ -0,0 +1,26 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +```yaml $(go) +go: + license-header: MICROSOFT_APACHE_NO_VERSION + namespace: contoso + clear-output-folder: true +``` + +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2020-12-21-preview +``` + +### Tag: package-2020-12-21-preview and go + +These settings apply only when `--tag=package-2020-12-21-preview --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +```yaml $(tag) == 'package-2020-12-21-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-12-21/$(namespace) +``` diff --git a/specification/contoso/resource-manager/readme.md b/specification/contoso/resource-manager/readme.md new file mode 100644 index 000000000000..0862cc5d94c3 --- /dev/null +++ b/specification/contoso/resource-manager/readme.md @@ -0,0 +1,83 @@ +# contoso + +> see https://aka.ms/autorest + +This is the AutoRest configuration file for contoso. + +## Getting Started + +To build the SDKs for My API, simply install AutoRest via `npm` (`npm install -g autorest`) and then run: + +> `autorest readme.md` + +To see additional help and options, run: + +> `autorest --help` + +For other options on installation see [Installing AutoRest](https://aka.ms/autorest/install) on the AutoRest github page. + +--- + +## Configuration + +### Basic Information + +These are the global settings for the contoso. + +```yaml +openapi-type: arm +tag: package-2020-12-21 +``` + +### Tag: package-2020-12-21 + +These settings apply only when `--tag=package-2020-12-21` is specified on the command line. + +```yaml $(tag) == 'package-2020-12-21' +input-file: + - Microsoft.Contoso/preview/2020-12-21/contoso.json +``` + +--- + +# Code Generation + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +```yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-python + - repo: azure-sdk-for-java + - repo: azure-sdk-for-go + - repo: azure-sdk-for-js + - repo: azure-resource-manager-schemas + after_scripts: + - node sdkauto_afterscript.js contoso/resource-manager + - repo: azure-cli-extensions +``` +## Az + +See configuration in [readme.az.md](./readme.az.md) + +## Go + +See configuration in [readme.go.md](./readme.go.md) + +## Python + +See configuration in [readme.python.md](./readme.python.md) + +## TypeScript + +See configuration in [readme.typescript.md](./readme.typescript.md) + +## CSharp + +See configuration in [readme.csharp.md](./readme.csharp.md) + +## AzureResourceSchema + +See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) diff --git a/specification/contoso/resource-manager/readme.python.md b/specification/contoso/resource-manager/readme.python.md new file mode 100644 index 000000000000..7a1bac02e178 --- /dev/null +++ b/specification/contoso/resource-manager/readme.python.md @@ -0,0 +1,40 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + + +``` yaml $(python) +python: + azure-arm: true + license-header: MICROSOFT_MIT_NO_VERSION + package-name: azure-mgmt-contoso + no-namespace-folders: true + package-version: 1.0.0b1 +``` + +``` yaml $(python-mode) == 'update' +python: + output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso/azure/mgmt/contoso +``` +``` yaml $(python-mode) == 'create' +python: + basic-setup-py: true + output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso +``` + +``` yaml $(python) && $(track2) +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-contoso +no-namespace-folders: true +package-version: 1.0.0b1 +``` + +``` yaml $(python-mode) == 'update' && $(track2) +output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso/azure/mgmt/contoso +``` +``` yaml $(python-mode) == 'create' && $(track2) +basic-setup-py: true +output-folder: $(python-sdks-folder)/contoso/azure-mgmt-contoso +``` diff --git a/specification/contoso/resource-manager/readme.typescript.md b/specification/contoso/resource-manager/readme.typescript.md new file mode 100644 index 000000000000..05891a4d2a7b --- /dev/null +++ b/specification/contoso/resource-manager/readme.typescript.md @@ -0,0 +1,14 @@ +## TypeScript + +These settings apply only when `--typescript` is specified on the command line. +Please also specify `--typescript-sdks-folder=`. + +``` yaml $(typescript) +typescript: + azure-arm: true + package-name: "@azure/arm-contoso" + output-folder: "$(typescript-sdks-folder)/sdk/contoso/arm-contoso" + payload-flattening-threshold: 1 + clear-output-folder: true + generate-metadata: true +``` From a70f09e4b4e510a149474ddbeaf5fa8edb3acb30 Mon Sep 17 00:00:00 2001 From: Ruoxuan Wang <52271048+ruowan@users.noreply.github.com> Date: Mon, 4 Jan 2021 11:16:33 +0800 Subject: [PATCH 36/51] Update advisor.json --- .../Microsoft.Advisor/stable/2020-01-01/advisor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json index a2e0d41741c0..846c0d127b21 100644 --- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json +++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json @@ -57,7 +57,7 @@ }, "x-ms-examples": { "GetMetadata": { - "$ref": "./examples/GetRecommendationMetadataEntity.json" + "$ref": "./examples/GetRecommendationMetadataEntity1.json" } } } From 55a55be0a57b4ba816b5b6be23c56d660110b654 Mon Sep 17 00:00:00 2001 From: Ruoxuan Wang <52271048+ruowan@users.noreply.github.com> Date: Mon, 4 Jan 2021 11:16:45 +0800 Subject: [PATCH 37/51] Update advisor.json --- .../Microsoft.Advisor/stable/2020-01-01/advisor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json index 846c0d127b21..a2e0d41741c0 100644 --- a/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json +++ b/specification/advisor/resource-manager/Microsoft.Advisor/stable/2020-01-01/advisor.json @@ -57,7 +57,7 @@ }, "x-ms-examples": { "GetMetadata": { - "$ref": "./examples/GetRecommendationMetadataEntity1.json" + "$ref": "./examples/GetRecommendationMetadataEntity.json" } } } From ec4c822b9bad3988ea1f347ee1ec46f05eba4e88 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 11:20:25 +0800 Subject: [PATCH 38/51] sdk automation for trenton --- specificationRepositoryConfiguration.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 771b5f5c5bab..b1acbe9b8774 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -40,6 +40,12 @@ "azure-resource-manager-schemas": { "integrationRepository": "AzureSDKAutomation/azure-resource-manager-schemas", "mainRepository": "Azure/azure-resource-manager-schemas" + }, + "azure-sdk-for-trenton": { + "integrationRepository": "Azure/azure-sdk-for-trenton", + "mainRepository": "Azure/azure-sdk-for-trenton", + "secondaryRepository": "Azure/azure-sdk-for-trenton", + "secondaryBranch": "secondary" } }, "overrides": { From ae9c84f3977478e4d7d1eb508a5e8ba679a4bbb5 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 11:35:52 +0800 Subject: [PATCH 39/51] trenton pipeline test --- specification/iotspaces/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md index 49a0a68b3682..5846a3e19b49 100644 --- a/specification/iotspaces/resource-manager/readme.md +++ b/specification/iotspaces/resource-manager/readme.md @@ -100,4 +100,3 @@ See configuration in [readme.go.md](./readme.go.md) ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) - From 01114e6b50d64bdec4f1597242d0216b7e0056ff Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 11:37:24 +0800 Subject: [PATCH 40/51] test for trenton automation --- specification/iotspaces/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md index 5846a3e19b49..176a3475f475 100644 --- a/specification/iotspaces/resource-manager/readme.md +++ b/specification/iotspaces/resource-manager/readme.md @@ -73,6 +73,7 @@ swagger-to-sdk: - repo: azure-sdk-for-go - repo: azure-sdk-for-js - repo: azure-sdk-for-node + - repo: azure-sdk-for-trenton - repo: azure-resource-manager-schemas after_scripts: - node sdkauto_afterscript.js iotspaces/resource-manager From 74000264743cb9435e42d2b7627d1a6edf2a772a Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 14:25:09 +0800 Subject: [PATCH 41/51] add trenton automation --- specificationRepositoryConfiguration.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index b1acbe9b8774..86e7b21ca5e4 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -40,12 +40,6 @@ "azure-resource-manager-schemas": { "integrationRepository": "AzureSDKAutomation/azure-resource-manager-schemas", "mainRepository": "Azure/azure-resource-manager-schemas" - }, - "azure-sdk-for-trenton": { - "integrationRepository": "Azure/azure-sdk-for-trenton", - "mainRepository": "Azure/azure-sdk-for-trenton", - "secondaryRepository": "Azure/azure-sdk-for-trenton", - "secondaryBranch": "secondary" } }, "overrides": { @@ -90,6 +84,12 @@ "azure-sdk-for-net-minghc": { "mainRepository": "openapi-env-test/azure-sdk-for-net", "mainBranch": "v-minghc_testScript" + }, + "azure-sdk-for-trenton": { + "integrationRepository": "Azure/azure-sdk-for-trenton", + "mainRepository": "Azure/azure-sdk-for-trenton", + "secondaryRepository": "Azure/azure-sdk-for-trenton", + "secondaryBranch": "secondary" } } } From 71ba6181e881d4168a0c3a134c2fc0992fac2fd6 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 14:59:36 +0800 Subject: [PATCH 42/51] trenton automation test --- specification/iotspaces/resource-manager/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/iotspaces/resource-manager/readme.md b/specification/iotspaces/resource-manager/readme.md index 176a3475f475..a405b1f149dd 100644 --- a/specification/iotspaces/resource-manager/readme.md +++ b/specification/iotspaces/resource-manager/readme.md @@ -101,3 +101,4 @@ See configuration in [readme.go.md](./readme.go.md) ## AzureResourceSchema See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md) + From 34e504a723c2f36e597bc9784c01f18aba952cd1 Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Wed, 6 Jan 2021 16:30:14 +0800 Subject: [PATCH 43/51] change test repo --- specificationRepositoryConfiguration.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 86e7b21ca5e4..c1066f6e48e6 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -86,9 +86,9 @@ "mainBranch": "v-minghc_testScript" }, "azure-sdk-for-trenton": { - "integrationRepository": "Azure/azure-sdk-for-trenton", - "mainRepository": "Azure/azure-sdk-for-trenton", - "secondaryRepository": "Azure/azure-sdk-for-trenton", + "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", + "mainRepository": "test-repo-billy/azure-sdk-for-trenton", + "secondaryRepository": "test-repo-billy/azure-sdk-for-trenton", "secondaryBranch": "secondary" } } From c09051a0c6b701f5b15e466d2cff097d8fe9fef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=AE=AD=E9=A3=9E?= <32889038+chenjianfei2017@users.noreply.github.com> Date: Wed, 6 Jan 2021 17:26:32 +0800 Subject: [PATCH 44/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index c1066f6e48e6..807183a0bf7e 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -88,8 +88,7 @@ "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", - "secondaryRepository": "test-repo-billy/azure-sdk-for-trenton", - "secondaryBranch": "secondary" + "mainBranch": "secondary" } } } From c0c1a091d04dae82be8954734e6fdaaf5468dc78 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Fri, 22 Jan 2021 12:53:29 +0800 Subject: [PATCH 45/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 40 ----------------------- 1 file changed, 40 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 807183a0bf7e..0081605348a2 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,46 +45,6 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { - "azure-sdk-for-go": { - "mainRepository": "openapi-env-test/azure-sdk-for-go" - }, - "azure-sdk-for-java": { - "mainRepository": "openapi-env-test/azure-sdk-for-java", - "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" - }, - "azure-sdk-for-js": { - "mainRepository": "openapi-env-test/azure-sdk-for-js" - }, - "azure-sdk-for-net": { - "mainRepository": "openapi-env-test/azure-sdk-for-net" - }, - "azure-sdk-for-python": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track1-test" - }, - "azure-sdk-for-python-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-python" - }, - "azure-cli-extensions": { - "mainBranch": "report-diff-test", - "mainRepository": "openapi-env-test/azure-cli-extensions" - }, - "azure-resource-manager-schemas": { - "mainRepository": "openapi-env-test/azure-resource-manager-schemas" - }, - "azure-sdk-for-net-shivangi": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "Shivangi_AutomationScript", - "configFilePath": "eng/swagger_to_sdk_config.json" - }, - "azure-sdk-for-python-lmazuel": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "LMazuel_AutomationScript" - }, - "azure-sdk-for-net-minghc": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "v-minghc_testScript" - }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From 2bc8350961c91f184a0d45f81dc7667341073748 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Thu, 28 Jan 2021 00:05:24 +0800 Subject: [PATCH 46/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 40 +++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 0081605348a2..b68a31afc37c 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,6 +45,46 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { + "azure-sdk-for-go": { + "mainRepository": "openapi-env-test/azure-sdk-for-go" + }, + "azure-sdk-for-java": { + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" + }, + "azure-sdk-for-js": { + "mainRepository": "openapi-env-test/azure-sdk-for-js" + }, + "azure-sdk-for-net": { + "mainRepository": "openapi-env-test/azure-sdk-for-net" + }, + "azure-sdk-for-python": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track1-test" + }, + "azure-sdk-for-python-track2": { + "mainRepository": "openapi-env-test/azure-sdk-for-python" + }, + "azure-cli-extensions": { + "mainBranch": "report-diff-test", + "mainRepository": "openapi-env-test/azure-cli-extensions" + }, + "azure-resource-manager-schemas": { + "mainRepository": "openapi-env-test/azure-resource-manager-schemas" + }, + "azure-sdk-for-net-shivangi": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "Shivangi_AutomationScript", + "configFilePath": "eng/swagger_to_sdk_config.json" + }, + "azure-sdk-for-python-lmazuel": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "LMazuel_AutomationScript" + }, + "azure-sdk-for-net-minghc": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "v-minghc_testScript" + }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From c49de72a39854d87d7b94cd83de4e07c14467165 Mon Sep 17 00:00:00 2001 From: msyyc <70930885+msyyc@users.noreply.github.com> Date: Wed, 3 Feb 2021 16:31:33 +0800 Subject: [PATCH 47/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index b68a31afc37c..e6b3a805482e 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -63,7 +63,8 @@ "mainBranch": "python-track1-test" }, "azure-sdk-for-python-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-python" + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track2-test" }, "azure-cli-extensions": { "mainBranch": "report-diff-test", From e6d1cd0a67c23b8211c7e7ff57e724e42a9c773e Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Thu, 4 Feb 2021 15:30:54 +0800 Subject: [PATCH 48/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 41 ----------------------- 1 file changed, 41 deletions(-) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index e6b3a805482e..0081605348a2 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,47 +45,6 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { - "azure-sdk-for-go": { - "mainRepository": "openapi-env-test/azure-sdk-for-go" - }, - "azure-sdk-for-java": { - "mainRepository": "openapi-env-test/azure-sdk-for-java", - "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" - }, - "azure-sdk-for-js": { - "mainRepository": "openapi-env-test/azure-sdk-for-js" - }, - "azure-sdk-for-net": { - "mainRepository": "openapi-env-test/azure-sdk-for-net" - }, - "azure-sdk-for-python": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track1-test" - }, - "azure-sdk-for-python-track2": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "python-track2-test" - }, - "azure-cli-extensions": { - "mainBranch": "report-diff-test", - "mainRepository": "openapi-env-test/azure-cli-extensions" - }, - "azure-resource-manager-schemas": { - "mainRepository": "openapi-env-test/azure-resource-manager-schemas" - }, - "azure-sdk-for-net-shivangi": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "Shivangi_AutomationScript", - "configFilePath": "eng/swagger_to_sdk_config.json" - }, - "azure-sdk-for-python-lmazuel": { - "mainRepository": "openapi-env-test/azure-sdk-for-python", - "mainBranch": "LMazuel_AutomationScript" - }, - "azure-sdk-for-net-minghc": { - "mainRepository": "openapi-env-test/azure-sdk-for-net", - "mainBranch": "v-minghc_testScript" - }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From 61e85af70bd7c4e79fb9f9d76fe0d9ac2b83aec6 Mon Sep 17 00:00:00 2001 From: Xiaogang Date: Fri, 5 Feb 2021 13:38:44 +0800 Subject: [PATCH 49/51] Add azure-powershell --- specificationRepositoryConfiguration.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 0081605348a2..0cea38260af6 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -49,6 +49,9 @@ "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", "mainBranch": "secondary" + }, + "azure-powershell": { + "mainRepository": "openapi-env-test/azure-powershell" } } } From e597a1cad6c0d0871210c304e40c455bed4fd5c1 Mon Sep 17 00:00:00 2001 From: Zhenglai Zhang Date: Sun, 7 Feb 2021 14:36:21 +0800 Subject: [PATCH 50/51] Update specificationRepositoryConfiguration.json --- specificationRepositoryConfiguration.json | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/specificationRepositoryConfiguration.json b/specificationRepositoryConfiguration.json index 0cea38260af6..c14ab0b0b808 100644 --- a/specificationRepositoryConfiguration.json +++ b/specificationRepositoryConfiguration.json @@ -45,6 +45,47 @@ "overrides": { "openapi-env-test/azure-rest-api-specs": { "sdkRepositoryMappings": { + "azure-sdk-for-go": { + "mainRepository": "openapi-env-test/azure-sdk-for-go" + }, + "azure-sdk-for-java": { + "mainRepository": "openapi-env-test/azure-sdk-for-java", + "configFilePath": "eng/mgmt/automation/swagger_to_sdk_config.json" + }, + "azure-sdk-for-js": { + "mainRepository": "openapi-env-test/azure-sdk-for-js" + }, + "azure-sdk-for-net": { + "mainRepository": "openapi-env-test/azure-sdk-for-net" + }, + "azure-sdk-for-python": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track1-test" + }, + "azure-sdk-for-python-track2": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "python-track2-test" + }, + "azure-cli-extensions": { + "mainBranch": "report-diff-test", + "mainRepository": "openapi-env-test/azure-cli-extensions" + }, + "azure-resource-manager-schemas": { + "mainRepository": "openapi-env-test/azure-resource-manager-schemas" + }, + "azure-sdk-for-net-shivangi": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "Shivangi_AutomationScript", + "configFilePath": "eng/swagger_to_sdk_config.json" + }, + "azure-sdk-for-python-lmazuel": { + "mainRepository": "openapi-env-test/azure-sdk-for-python", + "mainBranch": "LMazuel_AutomationScript" + }, + "azure-sdk-for-net-minghc": { + "mainRepository": "openapi-env-test/azure-sdk-for-net", + "mainBranch": "v-minghc_testScript" + }, "azure-sdk-for-trenton": { "integrationRepository": "test-repo-billy/azure-sdk-for-trenton", "mainRepository": "test-repo-billy/azure-sdk-for-trenton", From 7747d487a3d6bda53203a4dace1ab3fd3954964d Mon Sep 17 00:00:00 2001 From: Jianfei Chen Date: Mon, 8 Feb 2021 11:16:39 +0800 Subject: [PATCH 51/51] sql2018 --- specification/sql/resource-manager/readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 8ed65a56f734..4575a6aa1938 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -24,7 +24,7 @@ These are the global settings for the Sql API. title: SqlManagementClient description: 'The Azure SQL Database management API provides a RESTful set of web services that interact with Azure SQL Database services to manage your databases. The API enables you to create, retrieve, update, and delete databases.' openapi-type: arm -tag: package-composite-v4 +tag: package-pure-2018-06-preview ``` ### Composite packages @@ -1057,6 +1057,7 @@ This is not used by Autorest itself. ``` yaml $(swagger-to-sdk) swagger-to-sdk: - repo: azure-sdk-for-net + - repo: azure-sdk-for-trenton - repo: azure-sdk-for-python - repo: azure-sdk-for-java - repo: azure-sdk-for-go