From b977722fb9e7473230ebcc92610c58ac536656c2 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Mon, 27 Jan 2020 15:55:59 -0800 Subject: [PATCH 01/15] Update AzureStack API descriptions to include new GetCloudManifestFile API --- .../stable/2017-06-01/CloudManifestFile.json | 53 +++++++++++++++++++ .../2017-06-01/examples/Operation/List.json | 10 ++++ 2 files changed, 63 insertions(+) create mode 100644 specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json new file mode 100644 index 000000000000..56304ada204a --- /dev/null +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json @@ -0,0 +1,53 @@ +{ + "swagger": "2.0", + "info": { + "version": "2017-06-01", + "title": "Azure Stack Azure Bridge Client" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.AzureStack/cloudmanifestfile": { + "get": { + "tags": [ + "CloudManifestFile" + ], + "description": "Returns a cloud specific manifest JSON file.", + "operationId": "CloudManifestFile_Get", + "parameters": [ + { + "$ref": "AzureStack.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CloudManifestFileResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "AzureStack.json#/definitions/ErrorResponse" + } + } + } + } + } + }, + "definitions": { + "CloudManifestFileResponse": { + "description": "Cloud specific manifest JSON file.", + "type": "string", + "format": "binary" + } +} diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json index 11a9af187566..bfbef90d1567 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json @@ -105,6 +105,16 @@ }, "origin": "user,system" }, + { + "name": "Microsoft.AzureStack/cloudmanifestfile/read", + "display": { + "provider": "Azure Stack Resource Provider.", + "resource": "Azure Stack Cloud Manifest File.", + "operation": "Read Resource Provider Operations", + "description": "Gets the cloud specific manifest file." + }, + "origin": "user,system" + }, { "name": "Microsoft.AzureStack/Operations/read", "display": { From 173f80b4576e5b4e60bfbd6b5f6c152e2dcc03d5 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Mon, 3 Feb 2020 12:11:31 -0800 Subject: [PATCH 02/15] Add CloudManifestFile example --- .../stable/2017-06-01/CloudManifestFile.json | 64 ++++++++++++++++++- .../examples/CloudManifestFile/Get.json | 27 ++++++++ .../2017-06-01/examples/Operation/List.json | 2 +- 3 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json index 56304ada204a..8912995888a5 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json @@ -17,6 +17,11 @@ "paths": { "/providers/Microsoft.AzureStack/cloudmanifestfile": { "get": { + "x-ms-examples": { + "Returns the properties of a cloud specific manifest file.": { + "$ref": "examples/CloudManifestFile/Get.json" + } + }, "tags": [ "CloudManifestFile" ], @@ -25,6 +30,13 @@ "parameters": [ { "$ref": "AzureStack.json#/parameters/ApiVersionParameter" + }, + { + "name": "verificationVersion", + "in": "query", + "description": "Signing verification key version.", + "required": false, + "type": "string" } ], "responses": { @@ -47,7 +59,55 @@ "definitions": { "CloudManifestFileResponse": { "description": "Cloud specific manifest JSON file.", - "type": "string", - "format": "binary" + "type": "object", + "properties": { + "deploymentData": { + "description": "Cloud specific manifest data.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CloudManifestFileDeploymentData" + }, + "signature": { + "description": "Signature of the cloud specific manifest data.", + "type": "string" + } + } + }, + "CloudManifestFileDeploymentData": { + "description": "Cloud specific manifest data for AzureStack deployment.", + "type": "object", + "properties": { + "cloudName": { + "description": "Cloud identifier.", + "type": "string" + }, + "externalDSMSCertificates": { + "description": "DSMS external certificates.", + "type": "string" + }, + "customCloudVerificationKey": { + "description": "Signing verification public key.", + "type": "string" + }, + "customEnvironmentEndpoints": { + "description": "Environment endpoints.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CloudManifestFileEnvironmentEndpoints" + } + } + }, + "CloudManifestFileEnvironmentEndpoints": { + "description": "Cloud specific environment endpoints for AzureStack deployment.", + "type": "object", + "properties": { + "customCloudARMEndpoint": { + "description": "ARM endpoint.", + "type": "string" + }, + "externalDSMSEndpoint": { + "description": "DSMS endpoint.", + "type": "string" + } + } } + } } diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json new file mode 100644 index 000000000000..a6cccdcd8fb6 --- /dev/null +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "api-version": "2017-06-01" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.AzureStack/cloudmanifestfile", + "name": "azurestack", + "type": "Microsoft.AzureStack/cloudManifestFile", + "location": "global", + "properties": { + "deploymentData": { + "cloudName": "USSec", + "externalDSMSCertificates": "", + "customCloudVerificationKey": "", + "customEnvironmentEndpoints": { + "customCloudARMEndpoint": "https://management.azure.microsoft.scloud/", + "externalDSMSEndpoint": "https://global-dsms.dsms.core.microsoft.scloud/dsms/issuercertificates" + } + }, + "signature": "" + } + } + } + } +} diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json index bfbef90d1567..1acdcb272675 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json @@ -109,7 +109,7 @@ "name": "Microsoft.AzureStack/cloudmanifestfile/read", "display": { "provider": "Azure Stack Resource Provider.", - "resource": "Azure Stack Cloud Manifest File.", + "resource": "Azure Stack Cloud Manifest File", "operation": "Read Resource Provider Operations", "description": "Gets the cloud specific manifest file." }, From b5a54e6aabada2d667d717bc0f8015bb13a91173 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Mon, 3 Feb 2020 14:21:04 -0800 Subject: [PATCH 03/15] Fix for spell check --- .../stable/2017-06-01/CloudManifestFile.json | 26 ++++++++++++++++--- .../examples/CloudManifestFile/Get.json | 6 ++--- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json index 8912995888a5..26117524191a 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json @@ -80,7 +80,7 @@ "description": "Cloud identifier.", "type": "string" }, - "externalDSMSCertificates": { + "externalDsmsCertificates": { "description": "DSMS external certificates.", "type": "string" }, @@ -99,15 +99,33 @@ "description": "Cloud specific environment endpoints for AzureStack deployment.", "type": "object", "properties": { - "customCloudARMEndpoint": { + "customCloudArmEndpoint": { "description": "ARM endpoint.", "type": "string" }, - "externalDSMSEndpoint": { + "externalDsmsEndpoint": { "description": "DSMS endpoint.", "type": "string" } } } - } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Authorization uses an Azure Active Directory OAuth2 flow.", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ] } diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json index a6cccdcd8fb6..b6119abfe6a2 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json @@ -12,11 +12,11 @@ "properties": { "deploymentData": { "cloudName": "USSec", - "externalDSMSCertificates": "", + "externalDsmsCertificates": "", "customCloudVerificationKey": "", "customEnvironmentEndpoints": { - "customCloudARMEndpoint": "https://management.azure.microsoft.scloud/", - "externalDSMSEndpoint": "https://global-dsms.dsms.core.microsoft.scloud/dsms/issuercertificates" + "customCloudArmEndpoint": "https://management.azure.microsoft.scloud/", + "externalDsmsEndpoint": "https://global-dsms.dsms.core.microsoft.scloud/dsms/issuercertificates" } }, "signature": "" From 338096edca0835cda3c005883009ea80ae510be6 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 4 Feb 2020 15:46:52 -0800 Subject: [PATCH 04/15] Remove CloudName --- .../stable/2017-06-01/CloudManifestFile.json | 4 ---- .../stable/2017-06-01/examples/CloudManifestFile/Get.json | 1 - 2 files changed, 5 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json index 26117524191a..6a9121847d09 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json @@ -76,10 +76,6 @@ "description": "Cloud specific manifest data for AzureStack deployment.", "type": "object", "properties": { - "cloudName": { - "description": "Cloud identifier.", - "type": "string" - }, "externalDsmsCertificates": { "description": "DSMS external certificates.", "type": "string" diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json index b6119abfe6a2..867b3bcece62 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json @@ -11,7 +11,6 @@ "location": "global", "properties": { "deploymentData": { - "cloudName": "USSec", "externalDsmsCertificates": "", "customCloudVerificationKey": "", "customEnvironmentEndpoints": { From 93ff05e1552f03e7fa2d2f0399c68de72478b666 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Wed, 5 Feb 2020 12:23:48 -0800 Subject: [PATCH 05/15] Move new operation to AzureStack.json --- custom-words.txt | 2 + .../stable/2017-06-01/AzureStack.json | 99 ++++++++++++++ .../stable/2017-06-01/CloudManifestFile.json | 127 ------------------ .../{CloudManifestFile => Operation}/Get.json | 0 4 files changed, 101 insertions(+), 127 deletions(-) delete mode 100644 specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json rename specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/{CloudManifestFile => Operation}/Get.json (100%) diff --git a/custom-words.txt b/custom-words.txt index fecaa9a0cec5..3ddfb00fc86f 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1696,3 +1696,5 @@ getactivesessions disconnectactivesessions bsls sessionids +Dsms +cloudmanifestfile \ No newline at end of file diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index 29848118296c..8f5e2d5e521f 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -44,6 +44,46 @@ "nextLinkName": "nextLink" } } + }, + "/providers/Microsoft.AzureStack/cloudmanifestfile": { + "get": { + "x-ms-examples": { + "Returns the properties of a cloud specific manifest file.": { + "$ref": "examples/Operation/Get.json" + } + }, + "tags": [ + "AzureStack" + ], + "description": "Returns a cloud specific manifest JSON file.", + "operationId": "CloudManifestFile_Get", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "verificationVersion", + "in": "query", + "description": "Signing verification key version.", + "required": false, + "type": "string" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CloudManifestFileResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } } }, "definitions": { @@ -191,6 +231,65 @@ } } }, + "CloudManifestFileResponse": { + "description": "Cloud specific manifest GET response.", + "type": "object", + "properties": { + "properties": { + "description": "Cloud specific manifest data.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CloudManifestFileProperties" + } + } + }, + "CloudManifestFileProperties": { + "description": "Cloud specific manifest JSON properties.", + "type": "object", + "properties": { + "deploymentData": { + "description": "Cloud specific manifest data.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CloudManifestFileDeploymentData" + }, + "signature": { + "description": "Signature of the cloud specific manifest data.", + "type": "string" + } + } + }, + "CloudManifestFileDeploymentData": { + "description": "Cloud specific manifest data for AzureStack deployment.", + "type": "object", + "properties": { + "externalDsmsCertificates": { + "description": "Dsms external certificates.", + "type": "string" + }, + "customCloudVerificationKey": { + "description": "Signing verification public key.", + "type": "string" + }, + "customEnvironmentEndpoints": { + "description": "Environment endpoints.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/CloudManifestFileEnvironmentEndpoints" + } + } + }, + "CloudManifestFileEnvironmentEndpoints": { + "description": "Cloud specific environment endpoints for AzureStack deployment.", + "type": "object", + "properties": { + "customCloudArmEndpoint": { + "description": "ARM endpoint.", + "type": "string" + }, + "externalDsmsEndpoint": { + "description": "Dsms endpoint.", + "type": "string" + } + } + }, "ErrorDetails": { "description": "The details of the error.", "properties": { diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json deleted file mode 100644 index 6a9121847d09..000000000000 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/CloudManifestFile.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "version": "2017-06-01", - "title": "Azure Stack Azure Bridge Client" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/providers/Microsoft.AzureStack/cloudmanifestfile": { - "get": { - "x-ms-examples": { - "Returns the properties of a cloud specific manifest file.": { - "$ref": "examples/CloudManifestFile/Get.json" - } - }, - "tags": [ - "CloudManifestFile" - ], - "description": "Returns a cloud specific manifest JSON file.", - "operationId": "CloudManifestFile_Get", - "parameters": [ - { - "$ref": "AzureStack.json#/parameters/ApiVersionParameter" - }, - { - "name": "verificationVersion", - "in": "query", - "description": "Signing verification key version.", - "required": false, - "type": "string" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/CloudManifestFileResponse" - } - }, - "default": { - "description": "Error response describing why the operation failed.", - "schema": { - "$ref": "AzureStack.json#/definitions/ErrorResponse" - } - } - } - } - } - }, - "definitions": { - "CloudManifestFileResponse": { - "description": "Cloud specific manifest JSON file.", - "type": "object", - "properties": { - "deploymentData": { - "description": "Cloud specific manifest data.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/CloudManifestFileDeploymentData" - }, - "signature": { - "description": "Signature of the cloud specific manifest data.", - "type": "string" - } - } - }, - "CloudManifestFileDeploymentData": { - "description": "Cloud specific manifest data for AzureStack deployment.", - "type": "object", - "properties": { - "externalDsmsCertificates": { - "description": "DSMS external certificates.", - "type": "string" - }, - "customCloudVerificationKey": { - "description": "Signing verification public key.", - "type": "string" - }, - "customEnvironmentEndpoints": { - "description": "Environment endpoints.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/CloudManifestFileEnvironmentEndpoints" - } - } - }, - "CloudManifestFileEnvironmentEndpoints": { - "description": "Cloud specific environment endpoints for AzureStack deployment.", - "type": "object", - "properties": { - "customCloudArmEndpoint": { - "description": "ARM endpoint.", - "type": "string" - }, - "externalDsmsEndpoint": { - "description": "DSMS endpoint.", - "type": "string" - } - } - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "flow": "implicit", - "description": "Authorization uses an Azure Active Directory OAuth2 flow.", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - }, - "security": [ - { - "azure_auth": [ - "user_impersonation" - ] - } - ] -} diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json similarity index 100% rename from specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json rename to specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json From cc8fc0d4998aa5e564aaf42d853399eea789f397 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Wed, 5 Feb 2020 12:48:09 -0800 Subject: [PATCH 06/15] Fix model error --- .../Microsoft.AzureStack/stable/2017-06-01/AzureStack.json | 4 +--- .../stable/2017-06-01/examples/Operation/Get.json | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index 8f5e2d5e521f..3676496002ac 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -235,9 +235,8 @@ "description": "Cloud specific manifest GET response.", "type": "object", "properties": { - "properties": { + "value": { "description": "Cloud specific manifest data.", - "x-ms-client-flatten": true, "$ref": "#/definitions/CloudManifestFileProperties" } } @@ -248,7 +247,6 @@ "properties": { "deploymentData": { "description": "Cloud specific manifest data.", - "x-ms-client-flatten": true, "$ref": "#/definitions/CloudManifestFileDeploymentData" }, "signature": { diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json index 867b3bcece62..4d6d4eae4fe3 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json @@ -5,11 +5,7 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.AzureStack/cloudmanifestfile", - "name": "azurestack", - "type": "Microsoft.AzureStack/cloudManifestFile", - "location": "global", - "properties": { + "value": { "deploymentData": { "externalDsmsCertificates": "", "customCloudVerificationKey": "", From 42fd4b227c5b25ea174b63f02eed5469b9b184b4 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Thu, 13 Feb 2020 13:16:36 -0800 Subject: [PATCH 07/15] Add one more optional query parameter --- .../Microsoft.AzureStack/stable/2017-06-01/AzureStack.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index 3676496002ac..4fb48e777231 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -67,6 +67,13 @@ "description": "Signing verification key version.", "required": false, "type": "string" + }, + { + "name": "versionCreationDate", + "in": "query", + "description": "Signing verification key version creation date.", + "required": false, + "type": "string" } ], "responses": { From 9be1c3169040187d6dbc447f3755ec68eb6b4555 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Fri, 14 Feb 2020 15:38:30 -0800 Subject: [PATCH 08/15] Address PR comments --- .../stable/2017-06-01/AzureStack.json | 21 ++++++++++++------- .../2017-06-01/examples/Operation/Get.json | 6 +++++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index 4fb48e777231..8f4352bb563e 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -45,7 +45,7 @@ } } }, - "/providers/Microsoft.AzureStack/cloudmanifestfile": { + "/providers/Microsoft.AzureStack/cloudmanifestfiles/{verificationVersion}": { "get": { "x-ms-examples": { "Returns the properties of a cloud specific manifest file.": { @@ -58,14 +58,11 @@ "description": "Returns a cloud specific manifest JSON file.", "operationId": "CloudManifestFile_Get", "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, { "name": "verificationVersion", - "in": "query", + "in": "path", "description": "Signing verification key version.", - "required": false, + "required": true, "type": "string" }, { @@ -74,6 +71,9 @@ "description": "Signing verification key version creation date.", "required": false, "type": "string" + }, + { + "$ref": "#/parameters/ApiVersionParameter" } ], "responses": { @@ -242,11 +242,16 @@ "description": "Cloud specific manifest GET response.", "type": "object", "properties": { - "value": { + "properties": { "description": "Cloud specific manifest data.", "$ref": "#/definitions/CloudManifestFileProperties" } - } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] }, "CloudManifestFileProperties": { "description": "Cloud specific manifest JSON properties.", diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json index 4d6d4eae4fe3..78c412543105 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json @@ -1,11 +1,15 @@ { "parameters": { + "verificationVersion": "latest", "api-version": "2017-06-01" }, "responses": { "200": { "body": { - "value": { + "id": "/providers/Microsoft.AzureStack/cloudmanifestfiles/latest", + "name": "latest", + "type": "Microsoft.AzureStack/cloudmanifestfiles", + "properties": { "deploymentData": { "externalDsmsCertificates": "", "customCloudVerificationKey": "", From a1af0c7ef47316ccdc78da7f23f27c6677d884a9 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Fri, 14 Feb 2020 15:48:03 -0800 Subject: [PATCH 09/15] Fix spell check --- custom-words.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 3ddfb00fc86f..3e0969d87364 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1697,4 +1697,4 @@ disconnectactivesessions bsls sessionids Dsms -cloudmanifestfile \ No newline at end of file +cloudmanifestfiles \ No newline at end of file From 4994215ee32a27af7aa45d86642eff6ef3cb36c8 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 18 Feb 2020 10:23:49 -0800 Subject: [PATCH 10/15] Add list operation --- .../stable/2017-06-01/AzureStack.json | 35 ++++++++++++++++++- .../{Operation => CloudManifestFile}/Get.json | 0 .../examples/CloudManifestFile/List.json | 26 ++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) rename specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/{Operation => CloudManifestFile}/Get.json (100%) create mode 100644 specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index 8f4352bb563e..8890b3bae679 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -45,11 +45,44 @@ } } }, + "/providers/Microsoft.AzureStack/cloudmanifestfiles": { + "get": { + "x-ms-examples": { + "Returns the properties of the cloud specific manifest file latest version.": { + "$ref": "examples/CloudManifestFile/List.json" + } + }, + "tags": [ + "AzureStack" + ], + "description": "Returns the cloud specific manifest JSON file latest version.", + "operationId": "CloudManifestFile_List", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/CloudManifestFileResponse" + } + }, + "default": { + "description": "Error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/ErrorResponse" + } + } + } + } + }, "/providers/Microsoft.AzureStack/cloudmanifestfiles/{verificationVersion}": { "get": { "x-ms-examples": { "Returns the properties of a cloud specific manifest file.": { - "$ref": "examples/Operation/Get.json" + "$ref": "examples/CloudManifestFile/Get.json" } }, "tags": [ diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json similarity index 100% rename from specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/Get.json rename to specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json new file mode 100644 index 000000000000..1cb611e53634 --- /dev/null +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "api-version": "2017-06-01" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.AzureStack/cloudmanifestfiles/latest", + "name": "latest", + "type": "Microsoft.AzureStack/cloudmanifestfiles", + "properties": { + "deploymentData": { + "externalDsmsCertificates": "", + "customCloudVerificationKey": "", + "customEnvironmentEndpoints": { + "customCloudArmEndpoint": "https://management.azure.microsoft.scloud/", + "externalDsmsEndpoint": "https://global-dsms.dsms.core.microsoft.scloud/dsms/issuercertificates" + } + }, + "signature": "" + } + } + } + } + } + \ No newline at end of file From 0726bf6c2a1f8fca7733b8a48252f8bc1ec732c1 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 18 Feb 2020 10:37:02 -0800 Subject: [PATCH 11/15] Fix style --- .../stable/2017-06-01/examples/CloudManifestFile/List.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json index 1cb611e53634..015f2ef71bfd 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json @@ -22,5 +22,4 @@ } } } - } - \ No newline at end of file + } \ No newline at end of file From c0bee0830c52a7f90ca2bd2b28326b279b98bb1b Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 18 Feb 2020 11:29:02 -0800 Subject: [PATCH 12/15] Actually fix stykle --- .../examples/CloudManifestFile/List.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json index 015f2ef71bfd..d54afb44c0a8 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json @@ -1,25 +1,25 @@ { - "parameters": { - "api-version": "2017-06-01" - }, - "responses": { - "200": { - "body": { - "id": "/providers/Microsoft.AzureStack/cloudmanifestfiles/latest", - "name": "latest", - "type": "Microsoft.AzureStack/cloudmanifestfiles", - "properties": { - "deploymentData": { - "externalDsmsCertificates": "", - "customCloudVerificationKey": "", - "customEnvironmentEndpoints": { - "customCloudArmEndpoint": "https://management.azure.microsoft.scloud/", - "externalDsmsEndpoint": "https://global-dsms.dsms.core.microsoft.scloud/dsms/issuercertificates" - } - }, - "signature": "" - } + "parameters": { + "api-version": "2017-06-01" + }, + "responses": { + "200": { + "body": { + "id": "/providers/Microsoft.AzureStack/cloudmanifestfiles/latest", + "name": "latest", + "type": "Microsoft.AzureStack/cloudmanifestfiles", + "properties": { + "deploymentData": { + "externalDsmsCertificates": "", + "customCloudVerificationKey": "", + "customEnvironmentEndpoints": { + "customCloudArmEndpoint": "https://management.azure.microsoft.scloud/", + "externalDsmsEndpoint": "https://global-dsms.dsms.core.microsoft.scloud/dsms/issuercertificates" + } + }, + "signature": "" } } } - } \ No newline at end of file + } +} From 9d58298789f68d0dd91df3c60ef18aaebdaf73c8 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 18 Feb 2020 11:59:51 -0800 Subject: [PATCH 13/15] Use camel case name --- custom-words.txt | 2 +- .../Microsoft.AzureStack/stable/2017-06-01/AzureStack.json | 4 ++-- .../stable/2017-06-01/examples/CloudManifestFile/Get.json | 4 ++-- .../stable/2017-06-01/examples/CloudManifestFile/List.json | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/custom-words.txt b/custom-words.txt index 3e0969d87364..52510f3abd5b 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -1697,4 +1697,4 @@ disconnectactivesessions bsls sessionids Dsms -cloudmanifestfiles \ No newline at end of file +cloudManifestFiles \ No newline at end of file diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index 8890b3bae679..bb17f768930e 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -45,7 +45,7 @@ } } }, - "/providers/Microsoft.AzureStack/cloudmanifestfiles": { + "/providers/Microsoft.AzureStack/cloudManifestFiles": { "get": { "x-ms-examples": { "Returns the properties of the cloud specific manifest file latest version.": { @@ -78,7 +78,7 @@ } } }, - "/providers/Microsoft.AzureStack/cloudmanifestfiles/{verificationVersion}": { + "/providers/Microsoft.AzureStack/cloudManifestFiles/{verificationVersion}": { "get": { "x-ms-examples": { "Returns the properties of a cloud specific manifest file.": { diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json index 78c412543105..7552a85e4d63 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/Get.json @@ -6,9 +6,9 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.AzureStack/cloudmanifestfiles/latest", + "id": "/providers/Microsoft.AzureStack/cloudManifestFiles/latest", "name": "latest", - "type": "Microsoft.AzureStack/cloudmanifestfiles", + "type": "Microsoft.AzureStack/cloudManifestFiles", "properties": { "deploymentData": { "externalDsmsCertificates": "", diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json index d54afb44c0a8..3c07c3d46355 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/CloudManifestFile/List.json @@ -5,9 +5,9 @@ "responses": { "200": { "body": { - "id": "/providers/Microsoft.AzureStack/cloudmanifestfiles/latest", + "id": "/providers/Microsoft.AzureStack/cloudManifestFiles/latest", "name": "latest", - "type": "Microsoft.AzureStack/cloudmanifestfiles", + "type": "Microsoft.AzureStack/cloudManifestFiles", "properties": { "deploymentData": { "externalDsmsCertificates": "", From 4085491fb5539d5cc21e93874f4a9551aaca0945 Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 18 Feb 2020 13:42:00 -0800 Subject: [PATCH 14/15] Modify operation description --- .../Microsoft.AzureStack/stable/2017-06-01/AzureStack.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json index bb17f768930e..6afb591f359f 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/AzureStack.json @@ -48,14 +48,14 @@ "/providers/Microsoft.AzureStack/cloudManifestFiles": { "get": { "x-ms-examples": { - "Returns the properties of the cloud specific manifest file latest version.": { + "Returns the properties of a cloud specific manifest file with latest version.": { "$ref": "examples/CloudManifestFile/List.json" } }, "tags": [ "AzureStack" ], - "description": "Returns the cloud specific manifest JSON file latest version.", + "description": "Returns a cloud specific manifest JSON file with latest version.", "operationId": "CloudManifestFile_List", "parameters": [ { From fe0236293c6d5fdf2d22585bde488fe90e16a4ae Mon Sep 17 00:00:00 2001 From: Andy Tao Date: Tue, 18 Feb 2020 14:02:40 -0800 Subject: [PATCH 15/15] Fix Operation List example --- .../stable/2017-06-01/examples/Operation/List.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json index 1acdcb272675..03cb6984d239 100644 --- a/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json +++ b/specification/azurestack/resource-manager/Microsoft.AzureStack/stable/2017-06-01/examples/Operation/List.json @@ -106,7 +106,7 @@ "origin": "user,system" }, { - "name": "Microsoft.AzureStack/cloudmanifestfile/read", + "name": "Microsoft.AzureStack/cloudManifestFiles/read", "display": { "provider": "Azure Stack Resource Provider.", "resource": "Azure Stack Cloud Manifest File",