From 89c791a1b35c6708b22900e497795b2bbc8bbb85 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 30 Apr 2020 11:21:47 -0700 Subject: [PATCH 01/44] added swagger for 'actionplan/operation/attempts' , 'operationresults' endpoints and corrected Product Package Secrets endpoint --- .../ActionPlanOperationAttempt.json | 133 ++++++++++++++++ .../preview/2019-01-01/OperationResults.json | 147 ++++++++++++++++++ .../preview/2019-01-01/ProductSecret.json | 124 ++++++++------- .../ActionPlanOperationAttempt/Get.json | 24 +++ .../examples/OperationResults/Get.json | 21 +++ .../examples/ProductSecret/Get.Json | 3 +- .../examples/ProductSecret/Import.json | 3 +- 7 files changed, 395 insertions(+), 60 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json new file mode 100644 index 000000000000..38876eaa1624 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -0,0 +1,133 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/actionplans/{planId}/operations/{operationId}/attempts": { + "get": { + "x-ms-examples": { + "Gets the information about Action Plan operation attempts.": { + "$ref": "./examples/ActionPlanOperationAttempt/Get.json" + } + }, + "description": "Returns the information about action plan operation attempt.", + "tags": [ + "ActionPlanOperationAttempt" + ], + "operationId": "ActionPlanOperationAttempt_List", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/PlanIdParameter" + }, + { + "$ref": "#/parameters/OperationIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationAttemptResult" + } + } + } + } + } + }, + "definitions": { + "OperationAttemptResult": { + "description": "Result of an Operation Attempt.", + "type": "object", + "properties": { + "properties": { + "description": "Result of an Operation Attempt.", + "$ref": "#/definitions/OperationAttemptProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "Deployment.json#/definitions/Resource" + } + ] + }, + "OperationAttemptProperties": { + "type": "object", + "description": "Operation Attempt Properties.", + "properties": { + "startTime": { + "description": "The deployment start time", + "type": "string", + "format": "date-time" + }, + "endTime": { + "description": "The deployment end time", + "type": "string", + "format": "date-time" + }, + "provisioningState": { + "description": "Provisioning state of the resource.", + "type": "string" + } + } + } + }, + "parameters": { + "PlanIdParameter": { + "description": "Identifier of the action plan.", + "name": "planId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "OperationIdParameter": { + "description": "The operation identifier.", + "name": "operationId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json new file mode 100644 index 000000000000..e56c74b6dcb6 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -0,0 +1,147 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/operationresults/{operationResultId}": { + "get": { + "x-ms-examples": { + "Get the operation details.": { + "$ref": "./examples/OperationResults/Get.json" + } + }, + "description": "Retrieves the specific operation results.", + "tags": [ + "OperationResults" + ], + "operationId": "OperationResults_Get", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/OperationResultIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationResult" + } + }, + "404": { + "description": "Not Found" + } + } + } + } + }, + "definitions": { + "OperationResult": { + "description": "Operation Result Entity.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "status": { + "description": "status of the Operation result.", + "$ref": "#/definitions/Status" + }, + "starttime": { + "description": "The deployment start time", + "type": "string", + "format": "date-time" + }, + "endtime": { + "description": "The deployment end time", + "type": "string", + "format": "date-time" + }, + "percentComplete": { + "type": "number", + "format": "double", + "minimum": 0, + "maximum": 100, + "description": "Percentage completed." + } + } + }, + "Status": { + "description": "Specifies the state of the Operation result.", + "type": "string", + "enum": [ + "Bootstrapping", + "Creating", + "ExecutingRunner", + "Updating", + "Deleting", + "Deploying", + "Removing", + "RotatingSecrets", + "Canceled", + "Failed", + "Succeeded" + ], + "x-ms-enum": { + "modelAsString": true, + "name": "Status" + } + } + }, + "parameters": { + "OperationResultIdParameter": { + "description": "The operation result identifier.", + "name": "operationResultId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 2b4950722d0d..7a2ed835f15f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -10,7 +10,7 @@ "https" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -26,6 +26,9 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, @@ -52,27 +55,30 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productSecrets/{productId}/secrets/{secretName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}": { "get": { "x-ms-examples": { - "Return the product package details.": { - "$ref": "./examples/ProductSecret/Get.Json" + "Return product secrets list.": { + "$ref": "./examples/ProductSecret/Get.json" } }, - "description": "Retrieves the specific product secret details.", + "description": "Returns the specific product secret.", "tags": [ "ProductSecrets" ], - "operationId": "ProductSecrets_Get", + "operationId": "ProductSecrets_GET", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { - "$ref": "Deployment.json#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/LocationParameter" + }, + { + "$ref": "Deployment.json#/parameters/ProductIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -97,7 +103,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productSecrets/{productId}/secrets/{secretName}/import": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/import": { "post": { "x-ms-examples": { "Imports a product secret.": { @@ -113,6 +119,9 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, @@ -143,7 +152,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productSecrets/{productId}/secrets/{secretName}/validate": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/validate": { "post": { "x-ms-examples": { "Validates a product secret.": { @@ -159,6 +168,9 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, @@ -373,54 +385,54 @@ "x-ms-enum": { "modelAsString": true, "name": "SecretRotationStatus" - } - }, - "SecretValue": { - "description": "The secret value in a secure string format.", - "type": "string" - }, - "PfxFileName": { - "description": "The pfx certificate file location.", - "type": "string" - }, - "PfxPassword": { - "description": "The pfx certificate file password as a secure string.", - "type": "string" - }, - "SymmetricKey": { - "description": "The symmetric key as a secure string.", - "type": "string" - }, - "Password": { - "description": "The password as a secure string.", - "type": "string" - }, - "SecretParameters": { - "description": "Parameters required for creating/updating a product secret.", - "type": "object", - "properties": { - "secretValue": { - "description": "The secret value in a secure string format.", - "$ref": "#/definitions/SecretValue" - }, - "pfxFileName": { - "description": "The pfx certificate file location.", - "$ref": "#/definitions/PfxFileName" - }, - "pfxPassword": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/PfxPassword" - }, - "symmetricKey": { - "description": "The symmetric key.", - "$ref": "#/definitions/SymmetricKey" - }, - "password": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/Password" + } + }, + "SecretValue": { + "description": "The secret value in a secure string format.", + "type": "string" + }, + "PfxFileName": { + "description": "The pfx certificate file location.", + "type": "file" + }, + "PfxPassword": { + "description": "The pfx certificate file password as a secure string.", + "type": "string" + }, + "SymmetricKey": { + "description": "The symmetric key as a secure string.", + "type": "string" + }, + "Password": { + "description": "The password as a secure string.", + "type": "string" + }, + "SecretParameters": { + "description": "Parameters required for creating/updating a product secret.", + "type": "object", + "properties": { + "secretValue": { + "description": "The secret value in a secure string format.", + "$ref": "#/definitions/SecretValue" + }, + "pfxFileName": { + "description": "The pfx certificate file location.", + "$ref": "#/definitions/PfxFileName" + }, + "pfxPassword": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/PfxPassword" + }, + "symmetricKey": { + "description": "The symmetric key.", + "$ref": "#/definitions/SymmetricKey" + }, + "password": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/Password" + } } } - } }, "parameters": { "SecretNameParameter": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json new file mode 100644 index 000000000000..6c54721d2f68 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", + "location": "global", + "api-version": "2019-01-01", + "planId": "0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced", + "operationId": "UpgradeSFRuntimeInEventHubDataClusters" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/global/actionplans/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/operations/UpgradeSFRuntimeInEventHubDataClusters/attempts/1", + "name": "global/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/UpgradeSFRuntimeInEventHubDataClusters/1", + "type": "Microsoft.Deployment.Admin/locations/actionplans/operations/attempts", + "properties": { + "startTime": "2020-04-23T02:59:50.5512046Z", + "endTime": "2020-04-23T03:02:48.2542795Z", + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json new file mode 100644 index 000000000000..a448bffdbd44 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", + "location": "redmond", + "api-version": "2019-01-01", + "operationResultId": "5cf211b1-5971-4edd-8ee2-11c0f651d469" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/redmond/operationResults/5cf211b1-5971-4edd-8ee2-11c0f651d469", + "name": "5cf211b1-5971-4edd-8ee2-11c0f651d469", + "status": "Bootstrapping", + "startTime": "2020-04-28T04:12:45.1800272Z", + "endTime": "0001-01-01T00:00:00Z", + "percentComplete": 0.0 + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index b6c83ec44937..9d25ff82023c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -4,8 +4,7 @@ "location": "global", "api-version": "2019-01-01", "productId": "Microsoft.IotHubPreview.1.0.2", - "secretName": "secretName", - "secretValue": "sslCert" + "secretName": "sslCert" }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index bf7340c44ac4..8cc9e7399a8f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -18,7 +18,6 @@ } }, "responses": { - "200": {}, - "404": {} + "200": {} } } From 890a75f03854350b61f83698104a48a342f50cd5 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 30 Apr 2020 11:42:45 -0700 Subject: [PATCH 02/44] updated the pfx file name type --- .../preview/2019-01-01/ProductSecret.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 7a2ed835f15f..0541ad79e244 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -393,7 +393,7 @@ }, "PfxFileName": { "description": "The pfx certificate file location.", - "type": "file" + "type": "string" }, "PfxPassword": { "description": "The pfx certificate file password as a secure string.", From e54ba1e736642d4e235e4a10f5e9f8cbf7dcb44e Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 30 Apr 2020 14:47:44 -0700 Subject: [PATCH 03/44] fix LintDiff erros --- .../ActionPlanOperationAttempt.json | 2 +- .../preview/2019-01-01/ProductSecret.json | 92 +++++++++---------- .../ActionPlanOperationAttempt/Get.json | 44 ++++----- .../resource-manager/deployment/readme.md | 2 + 4 files changed, 71 insertions(+), 69 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json index 38876eaa1624..f6e996f0899f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -104,7 +104,7 @@ "x-ms-parameter-location": "method" }, "OperationIdParameter": { - "description": "The operation identifier.", + "description": "Identifier of the action plan operation.", "name": "operationId", "in": "path", "required": true, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 0541ad79e244..babdfaf9c351 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -385,54 +385,54 @@ "x-ms-enum": { "modelAsString": true, "name": "SecretRotationStatus" - } - }, - "SecretValue": { - "description": "The secret value in a secure string format.", - "type": "string" - }, - "PfxFileName": { - "description": "The pfx certificate file location.", - "type": "string" - }, - "PfxPassword": { - "description": "The pfx certificate file password as a secure string.", - "type": "string" - }, - "SymmetricKey": { - "description": "The symmetric key as a secure string.", - "type": "string" - }, - "Password": { - "description": "The password as a secure string.", - "type": "string" - }, - "SecretParameters": { - "description": "Parameters required for creating/updating a product secret.", - "type": "object", - "properties": { - "secretValue": { - "description": "The secret value in a secure string format.", - "$ref": "#/definitions/SecretValue" - }, - "pfxFileName": { - "description": "The pfx certificate file location.", - "$ref": "#/definitions/PfxFileName" - }, - "pfxPassword": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/PfxPassword" - }, - "symmetricKey": { - "description": "The symmetric key.", - "$ref": "#/definitions/SymmetricKey" - }, - "password": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/Password" - } + } + }, + "SecretValue": { + "description": "The secret value in a secure string format.", + "type": "string" + }, + "PfxFileName": { + "description": "The pfx certificate file location.", + "type": "string" + }, + "PfxPassword": { + "description": "The pfx certificate file password as a secure string.", + "type": "string" + }, + "SymmetricKey": { + "description": "The symmetric key as a secure string.", + "type": "string" + }, + "Password": { + "description": "The password as a secure string.", + "type": "string" + }, + "SecretParameters": { + "description": "Parameters required for creating/updating a product secret.", + "type": "object", + "properties": { + "secretValue": { + "description": "The secret value in a secure string format.", + "$ref": "#/definitions/SecretValue" + }, + "pfxFileName": { + "description": "The pfx certificate file location.", + "$ref": "#/definitions/PfxFileName" + }, + "pfxPassword": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/PfxPassword" + }, + "symmetricKey": { + "description": "The symmetric key.", + "$ref": "#/definitions/SymmetricKey" + }, + "password": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/Password" } } + } }, "parameters": { "SecretNameParameter": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json index 6c54721d2f68..f261249130e6 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -1,24 +1,24 @@ { - "parameters": { - "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", - "location": "global", - "api-version": "2019-01-01", - "planId": "0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced", - "operationId": "UpgradeSFRuntimeInEventHubDataClusters" + "parameters": { + "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", + "location": "global", + "api-version": "2019-01-01", + "planId": "0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced", + "operationId": "UpgradeSFRuntimeInEventHubDataClusters" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/global/actionplans/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/operations/UpgradeSFRuntimeInEventHubDataClusters/attempts/1", + "name": "global/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/UpgradeSFRuntimeInEventHubDataClusters/1", + "type": "Microsoft.Deployment.Admin/locations/actionplans/operations/attempts", + "properties": { + "startTime": "2020-04-23T02:59:50.5512046Z", + "endTime": "2020-04-23T03:02:48.2542795Z", + "provisioningState": "Succeeded" + } + } }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/global/actionplans/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/operations/UpgradeSFRuntimeInEventHubDataClusters/attempts/1", - "name": "global/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/UpgradeSFRuntimeInEventHubDataClusters/1", - "type": "Microsoft.Deployment.Admin/locations/actionplans/operations/attempts", - "properties": { - "startTime": "2020-04-23T02:59:50.5512046Z", - "endTime": "2020-04-23T03:02:48.2542795Z", - "provisioningState": "Succeeded" - } - } - }, - "404": {} - } -} \ No newline at end of file + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/readme.md b/specification/azsadmin/resource-manager/deployment/readme.md index 0fd649383551..3c6da64d7a30 100644 --- a/specification/azsadmin/resource-manager/deployment/readme.md +++ b/specification/azsadmin/resource-manager/deployment/readme.md @@ -72,10 +72,12 @@ input-file: - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json ``` From f94f0f4da5adb7f46e42b4e95f066a7c5a073018 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 7 May 2020 18:47:32 -0700 Subject: [PATCH 04/44] added locations endpoint and fixed other changes --- custom-words.txt | 4 + .../preview/2018-07-01/FileContainer.json | 363 ++++++++++++++++++ .../preview/2018-07-01/ProductPackage.json | 320 +++++++++++++++ .../examples/FileContainer/Create.json | 27 ++ .../examples/FileContainer/Delete.json | 12 + .../examples/FileContainer/Get.json | 24 ++ .../examples/FileContainer/List.json | 26 ++ .../examples/ProductPackage/Create.json | 29 ++ .../examples/ProductPackage/Delete.json | 12 + .../examples/ProductPackage/Get.json | 24 ++ .../examples/ProductPackage/List.json | 26 ++ .../preview/2019-01-01/Locations.json | 86 +++++ .../preview/2019-01-01/OperationResults.json | 7 +- .../preview/2019-01-01/ProductDeployment.json | 83 ---- .../ActionPlanOperationAttempt/Get.json | 3 +- .../2019-01-01/examples/Locations/Get.json | 15 + .../examples/OperationResults/Get.json | 3 +- .../examples/ProductDeployment/Lock.json | 11 - .../examples/ProductDeployment/Unlock.json | 14 - .../examples/ProductSecret/Get.Json | 2 +- .../examples/ProductSecret/Import.json | 7 +- .../examples/ProductSecret/Validate.json | 4 +- .../resource-manager/deployment/readme.md | 11 + 23 files changed, 988 insertions(+), 125 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json delete mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json delete mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json diff --git a/custom-words.txt b/custom-words.txt index 3584fbca536e..45b981b073c3 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -483,6 +483,7 @@ endpointkeys endpointname endswith endtime +endTime Enein engagementfabric endzone @@ -1062,6 +1063,7 @@ PCNET peerings Pendingissuance Pendingrevocation +percentComplete perfcounters perfmon performant @@ -1126,6 +1128,7 @@ projectable Protectable provisioner provisioningservices +provisioningState Psec ptrdname publicipaddresses @@ -1417,6 +1420,7 @@ startswith starttask starttaskfailed starttime +startTime stateful staticsite statusdir diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json new file mode 100644 index 000000000000..d76594a53700 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -0,0 +1,363 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-07-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/fileContainers": { + "get": { + "x-ms-examples": { + "Return file containers list.": { + "$ref": "./examples/FileContainer/List.json" + } + }, + "description": "Returns an array of file containers.", + "tags": [ + "FileContainers" + ], + "operationId": "FileContainers_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FileContainersList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/{fileContainerId}": { + "get": { + "x-ms-examples": { + "Return the file container details.": { + "$ref": "./examples/FileContainer/Get.json" + } + }, + "description": "Retrieves the specific file container details.", + "tags": [ + "FileContainers" + ], + "operationId": "FileContainers_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/FileContainerIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FileContainer" + } + }, + "404": { + "description": "Not Found" + } + } + }, + "put": { + "x-ms-examples": { + "Creates a new file container.": { + "$ref": "./examples/FileContainer/Create.json" + } + }, + "description": "Creates a new file container.", + "tags": [ + "FileContainers" + ], + "operationId": "FileContainers_Create", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/FileContainerParameters" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/FileContainerIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FileContainer" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ] + }, + "delete": { + "x-ms-examples": { + "Deletes specified file container.": { + "$ref": "examples/FileContainer/Delete.json" + } + }, + "tags": [ + "FileContainers" + ], + "summary": "Deletes specified file container.", + "description": "Delete an existing file container.", + "operationId": "FileContainers_Delete", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/FileContainerIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "404": { + "description": "Not found" + } + } + } + } + }, + "definitions": { + "Resource": { + "description": "Object model of azure resource manager base.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "type": { + "readOnly": true, + "description": "Type of Resource.", + "type": "string" + }, + "location": { + "description": "Location of the resource.", + "type": "string" + } + }, + "x-ms-azure-resource": true + }, + "FileContainer": { + "type": "object", + "description": "File container entity.", + "properties": { + "properties": { + "description": "File Container properties", + "$ref": "#/definitions/FileContainerAdminProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "FileContainerAdminProperties": { + "description": "File Container Properties.", + "type": "object", + "properties": { + "fileContainerId": { + "description": "File container resource identifier containing product manifest.", + "$ref": "#/definitions/FileContainerId" + }, + "sourceUri": { + "description": "The remote file location. This is write-only property, DRP never returns it back to a user.", + "$ref": "#/definitions/SourceUri" + }, + "uri": { + "description": "The file or container Uri. This is read-only property; a user cannot set it.", + "type": "string" + }, + "postCopyAction": { + "description": "Specifies the file post copy action.", + "$ref": "#/definitions/PostCopyAction" + }, + "error": { + "description": "The error response message.", + "$ref": "#/definitions/ErrorInfo" + }, + "provisioningState": { + "description": "Provisioning state of the resource.", + "type": "string" + } + } + }, + "FileContainersList": { + "description": "List of file containers.", + "properties": { + "value": { + "description": "List of file containers.", + "type": "array", + "items": { + "$ref": "#/definitions/FileContainer" + } + }, + "nextLink": { + "description": "Continuation token.", + "type": "string" + } + } + }, + "ErrorInfo": { + "description": "Extended Error Information.", + "type": "object", + "properties": { + "code": { + "description": "The error code.", + "type": "string" + }, + "message": { + "description": "The error message.", + "type": "string" + }, + "details": { + "description": "The detailed error messages.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorInfo" + } + } + } + }, + "PostCopyAction": { + "description": "Specifies the file post copy action.", + "type": "string", + "enum": [ + "None", + "Unzip" + ], + "x-ms-enum": { + "modelAsString": true, + "name": "PostCopyAction" + } + }, + "SourceUri": { + "description": "Specifies The remote file location.", + "type": "string" + }, + "FileContainerId": { + "description": "File container resource identifier containing product manifest.", + "type": "string" + }, + "FileContainerParameters": { + "description": "Parameters for creating a new file container.", + "type": "object", + "properties": { + "postCopyAction": { + "description": "Specifies the file post copy action.", + "$ref": "#/definitions/PostCopyAction" + }, + "sourceUri": { + "description": "Specifies The remote file location.", + "$ref": "#/definitions/SourceUri" + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "required": true, + "type": "string" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2018-07-01" + }, + "FileContainerIdParameter": { + "description": "The file container identifier.", + "name": "fileContainerId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "FileContainerParameters": { + "description": "The parameters required to create a new file container.", + "name": "fileContainerParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FileContainerParameters" + }, + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json new file mode 100644 index 000000000000..95298fd6fbbc --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -0,0 +1,320 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-07-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages": { + "get": { + "x-ms-examples": { + "Return product packages list.": { + "$ref": "./examples/ProductPackage/List.json" + } + }, + "description": "Returns an array of product packages.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProductPackagesList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}": { + "get": { + "x-ms-examples": { + "Return the product package details.": { + "$ref": "./examples/ProductPackage/Get.json" + } + }, + "description": "Retrieves the specific product package details.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ProductIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProductPackage" + } + }, + "404": { + "description": "Not Found" + } + } + }, + "put": { + "x-ms-examples": { + "Creates a new product package.": { + "$ref": "./examples/ProductPackage/Create.json" + } + }, + "description": "Creates a new product package.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_Create", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ProductIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProductPackage" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "x-ms-examples": { + "Removes a product package.": { + "$ref": "./examples/ProductPackage/Delete.json" + } + }, + "description": "Deletes a product package.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_Delete", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ProductIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "404": { + "description": "Not found" + } + }, + "x-ms-long-running-operation": true + } + } + }, + "definitions": { + "Resource": { + "description": "Object model of azure resource manager base.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "type": { + "readOnly": true, + "description": "Type of Resource.", + "type": "string" + }, + "location": { + "description": "Location of the resource.", + "type": "string" + } + }, + "x-ms-azure-resource": true + }, + "ProductPackage": { + "description": "Properties for a product package.", + "type": "object", + "properties": { + "properties": { + "description": "Properties of a product package.", + "$ref": "#/definitions/ProductPackageProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProductPackagesList": { + "description": "List of product packages.", + "properties": { + "value": { + "description": "List of product packages.", + "type": "array", + "items": { + "$ref": "#/definitions/ProductPackage" + } + }, + "nextLink": { + "description": "Continuation Token.", + "type": "string" + } + } + }, + "ProductPackageProperties": { + "type": "object", + "description": "Properties for Product package.", + "properties": { + "fileContainerId": { + "description": "File container resource identifier containing product manifest.", + "$ref": "#/definitions/FileContainerId" + }, + "isDeployable": { + "description": "Value indicating whether the package is applicable for deployment.", + "type": "boolean" + }, + "isUpdatable": { + "description": "Value indicating whether the package is applicable for update.", + "type": "boolean" + }, + "productDeploymentId": { + "description": "The identifier of product deployment; null if this version is not installed.", + "type": "string" + }, + "provisioningState": { + "description": "Provisioning state of the resource.", + "type": "string" + } + } + }, + "FileContainerId": { + "description": "File container resource identifier containing product manifest.", + "type": "string" + }, + "ProductProperties": { + "description": "Additional properties of the product", + "type": "object", + "properties": { + "version": { + "description": "The version of the product", + "type": "string" + } + } + }, + "ProductLink": { + "description": "Link to a product.", + "type": "object", + "properties": { + "displayName": { + "description": "Displayed name of product.", + "type": "string" + }, + "uri": { + "description": "URI to product.", + "type": "string" + } + } + }, + "ProductLinks": { + "description": "List of product links.", + "type": "array", + "items": { + "$ref": "#/definitions/ProductLink" + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "required": true, + "type": "string" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2018-07-01" + }, + "ProductIdParameter": { + "name": "productId", + "in": "path", + "description": "The product identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json new file mode 100644 index 000000000000..570826b0edce --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "fileContainerId": "Microsoft.NullProvider.1.1", + "fileContainerParameters": { + "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", + "postCopyAction": "Unzip" + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/fileContainers", + "location": "global", + "properties": { + "postCopyAction": "Unzip", + "provisioningState": "Creating" + } + } + }, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json new file mode 100644 index 000000000000..ade8de53434c --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "fileContainerId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": {}, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json new file mode 100644 index 000000000000..c12b99661b22 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "fileContainerId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/fileContainers", + "location": "global", + "properties": { + "postCopyAction": "Unzip", + "uri": "https://deploymentrp.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/msdpfilecontainer-cb72641657134ed79ffeb632a58a671e/", + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json new file mode 100644 index 000000000000..8c80323e8199 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/fileContainers", + "location": "global", + "properties": { + "postCopyAction": "Unzip", + "uri": "https://deploymentrp.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/msdpfilecontainer-cb72641657134ed79ffeb632a58a671e/", + "provisioningState": "Succeeded" + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json new file mode 100644 index 000000000000..b2a9cd4c1179 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "productId": "Microsoft.NullProvider.1.1", + "fileContainerParameter": { + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/productPackages/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/productPackages", + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1", + "isDeployable": true, + "isUpdatable": true, + "provisioningState": "Succeeded" + } + } + }, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json new file mode 100644 index 000000000000..bc55f3cbd5c4 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "productId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": {}, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json new file mode 100644 index 000000000000..b2147dd289b9 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "productId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/productPackages/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/productPackages", + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1", + "isDeployable": true, + "isUpdatable": true, + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json new file mode 100644 index 000000000000..c8e773cca19d --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/productPackages/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/productPackages", + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1", + "isDeployable": true, + "isUpdatable": true, + "provisioningState": "Succeeded" + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json new file mode 100644 index 000000000000..ae1f871db957 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -0,0 +1,86 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global": { + "get": { + "x-ms-examples": { + "Gets the location": { + "$ref": "./examples/Locations/Get.json" + } + }, + "description": "Gets the location", + "tags": [ + "Locations" + ], + "operationId": "Locations_Get", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/LocationsResourceEntity" + } + } + } + } + } + }, + "definitions": { + "LocationsResourceEntity": { + "description": "Get the location", + "properties": { + "subscriptionId": { + "description": "the subscription id", + "title": "subscriptionId", + "type": "string" + }, + "location": { + "description": "the location name", + "title": "location", + "type": "string" + } + } + } + }, + "parameters": {}, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json index e56c74b6dcb6..6eb2450873a7 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -48,9 +48,6 @@ "schema": { "$ref": "#/definitions/OperationResult" } - }, - "404": { - "description": "Not Found" } } } @@ -75,12 +72,12 @@ "description": "status of the Operation result.", "$ref": "#/definitions/Status" }, - "starttime": { + "startTime": { "description": "The deployment start time", "type": "string", "format": "date-time" }, - "endtime": { + "endTime": { "description": "The deployment end time", "type": "string", "format": "date-time" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 2d066392edfe..c11bcda2d194 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -226,69 +226,6 @@ }, "x-ms-long-running-operation": true } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productDeployments/{productId}/unlock": { - "post": { - "x-ms-examples": { - "Unlocks the product subscription": { - "$ref": "./examples/ProductDeployment/Unlock.json" - } - }, - "description": "Unlocks the product subscription", - "tags": [ - "ProductDeployments" - ], - "operationId": "ProductDeployments_Unlock", - "parameters": [ - { - "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" - }, - { - "$ref": "ProductDeployment.json#/parameters/UnlockActionParameter" - }, - { - "$ref": "Deployment.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productDeployments/{productId}/lock": { - "post": { - "x-ms-examples": { - "locks the product subscription": { - "$ref": "./examples/ProductDeployment/Lock.json" - } - }, - "description": "locks the product subscription", - "tags": [ - "ProductDeployments" - ], - "operationId": "ProductDeployments_Lock", - "parameters": [ - { - "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" - }, - { - "$ref": "Deployment.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } } }, "definitions": { @@ -492,16 +429,6 @@ "type": "string" } } - }, - "UnlockActionParameters": { - "description": "Parameters for bootstrap action", - "type": "object", - "properties": { - "duration": { - "description": "Duration in TimeSpan format(Define which ISO format)", - "type": "string" - } - } } }, "parameters": { @@ -523,16 +450,6 @@ }, "x-ms-parameter-location": "method" }, - "UnlockActionParameter": { - "description": "Represents bootstrap action parameter", - "name": "unlockActionParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/UnlockActionParameters" - }, - "x-ms-parameter-location": "method" - }, "DeployActionParameter": { "description": "Represents bootstrap action parameter", "name": "deployActionParameter", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json index f261249130e6..0aac2fceef65 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json new file mode 100644 index 000000000000..06d4972a8ce8 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "location": "global", + "api-version": "2019-01-01" + }, + "responses": { + "200": { + "body": { + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "location": "GLOBAL" + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json index a448bffdbd44..dfc9780b5021 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json @@ -15,7 +15,6 @@ "endTime": "0001-01-01T00:00:00Z", "percentComplete": 0.0 } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json deleted file mode 100644 index 2f0b39fa1bb4..000000000000 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parameters": { - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "location": "global", - "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview" - }, - "responses": { - "200": {} - } -} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json deleted file mode 100644 index 648670de33b3..000000000000 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "location": "global", - "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview", - "unlockActionParameter": { - "duration": "P5D" - } - }, - "responses": { - "200": {} - } -} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index 9d25ff82023c..c4416debdd46 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -28,6 +28,6 @@ } } }, - "404": {} + "404":{} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index 8cc9e7399a8f..9293a3756871 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -6,9 +6,7 @@ "productId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "properties": { - "secretValue": "sslCert" - } + "secretValue": "sslCert" }, "newOffer": { "properties": { @@ -18,6 +16,7 @@ } }, "responses": { - "200": {} + "200": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json index 09fc63e01e89..ceb402794239 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json @@ -6,9 +6,7 @@ "productId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "properties": { - "secretValue": "sslCert" - } + "secretValue": "sslCert" }, "secretValue": "sslCert", "newOffer": { diff --git a/specification/azsadmin/resource-manager/deployment/readme.md b/specification/azsadmin/resource-manager/deployment/readme.md index 3c6da64d7a30..5dff5c3a4ce0 100644 --- a/specification/azsadmin/resource-manager/deployment/readme.md +++ b/specification/azsadmin/resource-manager/deployment/readme.md @@ -41,7 +41,15 @@ input-file: - Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json ``` +### Tag: package-2018-07-01 +These settings apply only when `--tag=package-2018-07-01` is specified on the command line. + +``` yaml $(tag) == 'package-2018-07-01' +input-file: + - Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json + - Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +``` --- # Code Generation @@ -74,10 +82,13 @@ input-file: - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json ``` From 6452914bd7ebe6b9a416439ecc763bd35c2b510b Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Fri, 8 May 2020 08:41:04 -0700 Subject: [PATCH 05/44] added actionplans to custom-words.txt and uodated ProductSecret.json --- custom-words.txt | 1 + .../preview/2019-01-01/ProductSecret.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index 45b981b073c3..bf67ab64c629 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -13,6 +13,7 @@ accountid accountname ACLs aclspec +actionplans acquisitionid acrapi activityruns diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index babdfaf9c351..dba8b346cde1 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -59,7 +59,7 @@ "get": { "x-ms-examples": { "Return product secrets list.": { - "$ref": "./examples/ProductSecret/Get.json" + "$ref": "./examples/ProductSecret/Get.Json" } }, "description": "Returns the specific product secret.", From a309df7b7ff4fbc55b213389d072379024ebf4ab Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 18 May 2020 19:55:25 -0700 Subject: [PATCH 06/44] updated locations endpoint response --- .../preview/2019-01-01/Locations.json | 16 ++++++++++++++++ .../2019-01-01/examples/Locations/Get.json | 9 +++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index ae1f871db957..a936048e0ded 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -50,6 +50,22 @@ "definitions": { "LocationsResourceEntity": { "description": "Get the location", + "properties": { + "properties": { + "description": "Location Properties", + "$ref": "#/definitions/LocationAdminProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "Deployment.json#/definitions/Resource" + } + ] + }, + "LocationAdminProperties": { + "description": "Location Admin Properties", + "type": "object", "properties": { "subscriptionId": { "description": "the subscription id", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json index 06d4972a8ce8..461dea961619 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -7,8 +7,13 @@ "responses": { "200": { "body": { - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "location": "GLOBAL" + "id": "/subscriptions/b42940a9-c92c-44c8-b745-7558ad4b08d9/providers/Microsoft.Deployment.Admin/locations/global", + "name": "global", + "type": "Microsoft.Deployment.Admin/locations", + "properties": { + "subscriptionId": "b42940a9-c92c-44c8-b745-7558ad4b08d9", + "location": "global" + } } } } From 0f9581f9f56de02f974686fde21253afc52fab18 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 18 May 2020 20:15:38 -0700 Subject: [PATCH 07/44] updated the location parameter to global --- .../preview/2019-01-01/ProductSecret.json | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index dba8b346cde1..9fa88fc7fd03 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -10,7 +10,7 @@ "https" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -26,9 +26,6 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, - { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, @@ -55,7 +52,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets/{secretName}": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -74,9 +71,6 @@ { "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, - { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, @@ -103,7 +97,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/import": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets/{secretName}/import": { "post": { "x-ms-examples": { "Imports a product secret.": { @@ -119,9 +113,6 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, - { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, @@ -152,7 +143,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/validate": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets/{secretName}/validate": { "post": { "x-ms-examples": { "Validates a product secret.": { @@ -168,9 +159,6 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, - { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, From 3c02a0b8650a9085ac3d098acb217d9e74d51df3 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 1 Jun 2020 19:31:16 -0700 Subject: [PATCH 08/44] added 404 and default responses --- .../preview/2018-07-01/ProductPackage.json | 6 +++ .../examples/ProductPackage/Create.json | 3 +- .../examples/ProductPackage/List.json | 3 +- .../preview/2019-01-01/ActionPlan.json | 12 +++++ .../2019-01-01/ActionPlanOperation.json | 15 ++++++ .../ActionPlanOperationAttempt.json | 9 ++++ .../preview/2019-01-01/Locations.json | 9 ++++ .../preview/2019-01-01/OperationResults.json | 9 ++++ .../preview/2019-01-01/ProductDeployment.json | 51 +++++++++++++++++++ .../preview/2019-01-01/ProductPackage.json | 34 ++++++++++++- .../preview/2019-01-01/ProductSecret.json | 33 ++++++++++-- .../2019-01-01/examples/ActionPlan/List.json | 3 +- .../ActionPlanOperationAttempt/Get.json | 3 +- .../examples/ActionPlanOperations/List.json | 3 +- .../2019-01-01/examples/Locations/Get.json | 3 +- .../examples/OperationResults/Get.json | 3 +- .../examples/ProductDeployment/Bootstrap.json | 3 +- .../examples/ProductDeployment/Deploy.json | 3 +- .../examples/ProductDeployment/List.json | 3 +- .../examples/ProductDeployment/Remove.json | 3 +- .../ProductDeployment/RotateSecrets.json | 3 +- .../examples/ProductPackage/Create.json | 3 +- .../examples/ProductPackage/List.json | 3 +- .../examples/ProductSecret/Get.Json | 2 +- .../examples/ProductSecret/List.json | 3 +- 25 files changed, 203 insertions(+), 22 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index 95298fd6fbbc..faae0d360109 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -42,6 +42,9 @@ "schema": { "$ref": "#/definitions/ProductPackagesList" } + }, + "404": { + "description": "Not Found" } }, "x-ms-pageable": { @@ -115,6 +118,9 @@ }, "202": { "description": "Accepted" + }, + "404": { + "description": "Not Found" } }, "x-ms-long-running-operation": true diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json index b2a9cd4c1179..ca975518260c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json @@ -24,6 +24,7 @@ } } }, - "202": {} + "202": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json index c8e773cca19d..4bcfe76a2dc2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json @@ -21,6 +21,7 @@ } ] } - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json index f374728e2b99..28dbfa115a75 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json @@ -42,6 +42,12 @@ "schema": { "$ref": "#/definitions/ActionPlanList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -81,6 +87,12 @@ }, "404": { "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json index 574331ae41c9..d3c41027983c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json @@ -45,6 +45,15 @@ "schema": { "$ref": "#/definitions/ActionPlanOperationsList" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -87,6 +96,12 @@ }, "404": { "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json index f6e996f0899f..54a16de49479 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -51,6 +51,15 @@ "schema": { "$ref": "#/definitions/OperationAttemptResult" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index a936048e0ded..c0d7f1be0bbf 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -42,6 +42,15 @@ "schema": { "$ref": "#/definitions/LocationsResourceEntity" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json index 6eb2450873a7..950bc2998838 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -48,6 +48,15 @@ "schema": { "$ref": "#/definitions/OperationResult" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index c11bcda2d194..aac092e81dae 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -42,6 +42,15 @@ "schema": { "$ref": "#/definitions/ProductDeploymentsList" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -81,6 +90,12 @@ }, "404": { "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } @@ -117,6 +132,15 @@ }, "202": { "description": "ACCEPTED" + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -154,6 +178,15 @@ }, "202": { "description": "ACCEPTED" + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -188,6 +221,15 @@ }, "202": { "description": "ACCEPTED" + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -222,6 +264,15 @@ }, "202": { "description": "ACCEPTED" + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json index 150376191118..74db3124d7e5 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json @@ -42,6 +42,15 @@ "schema": { "$ref": "#/definitions/ProductPackagesList" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -80,7 +89,13 @@ } }, "404": { - "description": "Not Found" + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } }, @@ -115,6 +130,15 @@ }, "202": { "description": "Accepted" + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -146,7 +170,13 @@ "description": "OK" }, "404": { - "description": "Not found" + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 9fa88fc7fd03..2fa1c4a844fc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -39,6 +39,15 @@ "schema": { "$ref": "#/definitions/ProductSecretsList" } + }, + "404": { + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "produces": [ @@ -86,7 +95,13 @@ } }, "404": { - "description": "Not Found" + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "produces": [ @@ -131,7 +146,13 @@ "description": "Accepted" }, "404": { - "description": "Not Found" + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true, @@ -177,7 +198,13 @@ "description": "Accepted" }, "404": { - "description": "Not Found" + "description": "NOT FOUND" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json index 9dcd1b396f30..7762b7c897ac 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json @@ -25,8 +25,7 @@ } } ] - }, - "404": {} + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json index 0aac2fceef65..f261249130e6 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -18,6 +18,7 @@ "provisioningState": "Succeeded" } } - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json index 90e650806121..5760bcb03108 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json @@ -442,6 +442,7 @@ } ] } - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json index 461dea961619..c5d6e2ac6f18 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -15,6 +15,7 @@ "location": "global" } } - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json index dfc9780b5021..a448bffdbd44 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json @@ -15,6 +15,7 @@ "endTime": "0001-01-01T00:00:00Z", "percentComplete": 0.0 } - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json index 1231430f0a43..22fb6fa63eda 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json @@ -10,6 +10,7 @@ }, "responses": { "202": {}, - "200": {} + "200": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json index 47466509160e..0d35a8e0a87b 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json @@ -10,6 +10,7 @@ }, "responses": { "202": {}, - "200": {} + "200": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json index d505ca50cf2e..44d5a0148e79 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json @@ -38,6 +38,7 @@ } } ] - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json index 05fdceedfbb6..c3567643ae7c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json @@ -7,6 +7,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json index 05fdceedfbb6..c3567643ae7c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json @@ -7,6 +7,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json index b3439f9c6e71..85e66a8949ab 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json @@ -24,6 +24,7 @@ } } }, - "202": {} + "202": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json index 6138961357d4..f77e3559a137 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json @@ -21,6 +21,7 @@ } ] } - } + }, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index c4416debdd46..9d25ff82023c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -28,6 +28,6 @@ } } }, - "404":{} + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json index cc35a2b5b53a..4c653bab2f9d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json @@ -87,6 +87,7 @@ } ] } - } + }, + "404": {} } } From ff0d4efce53583fdcb2d73effe7e4c0697576b50 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 3 Jun 2020 14:19:13 -0700 Subject: [PATCH 09/44] added locations endpoint - list operation --- .../preview/2019-01-01/Locations.json | 81 +++++++++++++++++-- .../2019-01-01/examples/Locations/Get.json | 5 +- .../2019-01-01/examples/Locations/List.json | 22 +++++ 3 files changed, 97 insertions(+), 11 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index c0d7f1be0bbf..0d2e8eafed00 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -40,7 +40,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/LocationsResourceEntity" + "$ref": "#/definitions/LocationEntity" } }, "404": { @@ -54,16 +54,76 @@ } } } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations": { + "get": { + "x-ms-examples": { + "Gets the list of locations": { + "$ref": "./examples/Locations/List.json" + } + }, + "description": "Gets the list of locations", + "tags": [ + "Locations" + ], + "operationId": "Locations_List", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/LocationList" + } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } } }, "definitions": { + "LocationList": { + "description": "List of locations", + "properties": { + "value": { + "description": "Array of locations.", + "type": "array", + "items": { + "$ref": "#/definitions/LocationsResourceEntity" + } + }, + "nextLink": { + "type": "string", + "description": "Continuation token" + } + } + }, "LocationsResourceEntity": { - "description": "Get the location", + "type": "object", + "description": "Location Resource Entity", "properties": { "properties": { "description": "Location Properties", "$ref": "#/definitions/LocationAdminProperties", "x-ms-client-flatten": true + }, + "eTag": { + "description": "Entity tag of the resource", + "type": "string" } }, "allOf": [ @@ -76,17 +136,24 @@ "description": "Location Admin Properties", "type": "object", "properties": { - "subscriptionId": { - "description": "the subscription id", - "title": "subscriptionId", - "type": "string" - }, "location": { "description": "the location name", "title": "location", "type": "string" } } + }, + "LocationEntity": { + "type": "object", + "description": "Location Entity", + "properties": { + "properties": {} + }, + "allOf": [ + { + "$ref": "Deployment.json#/definitions/Resource" + } + ] } }, "parameters": {}, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json index c5d6e2ac6f18..9097bcd0caa3 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -10,10 +10,7 @@ "id": "/subscriptions/b42940a9-c92c-44c8-b745-7558ad4b08d9/providers/Microsoft.Deployment.Admin/locations/global", "name": "global", "type": "Microsoft.Deployment.Admin/locations", - "properties": { - "subscriptionId": "b42940a9-c92c-44c8-b745-7558ad4b08d9", - "location": "global" - } + "properties": {} } }, "404": {} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json new file mode 100644 index 000000000000..1c67797c584c --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "api-version": "2019-01-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Deployment.Admin/locations/1", + "name": "1", + "type": "Microsoft.Deployment.Admin/locations/1", + "properties": { + "location": "global" + } + } + ] + } + } + } +} From a7ac2caeac72fd6b601ecfff4ffdff4ead005463 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 3 Jun 2020 18:10:56 -0700 Subject: [PATCH 10/44] removed 404 response for the 'ProductDeployment-remove operation' --- .../preview/2019-01-01/ProductDeployment.json | 3 --- .../preview/2019-01-01/examples/ProductDeployment/Remove.json | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index aac092e81dae..9b40264b7ce4 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -222,9 +222,6 @@ "202": { "description": "ACCEPTED" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json index c3567643ae7c..05fdceedfbb6 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json @@ -7,7 +7,6 @@ }, "responses": { "200": {}, - "202": {}, - "404": {} + "202": {} } } From 21b0cd0949b7a5c1018154f091622e6e23e33b35 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Fri, 5 Jun 2020 17:35:06 -0700 Subject: [PATCH 11/44] Adding 'productDeployments/executeRunner/action'' --- .../preview/2019-01-01/ProductDeployment.json | 41 ++++++++++++++++++- .../ProductDeployment/ExecuteRunner.json | 12 ++++++ .../ProductDeployment/RotateSecrets.json | 3 +- 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 9b40264b7ce4..5d18e4d24351 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -262,8 +262,45 @@ "202": { "description": "ACCEPTED" }, - "404": { - "description": "NOT FOUND" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productDeployments/{productId}/executeRunner": { + "post": { + "x-ms-examples": { + "Invokes rotate secrets action on the product deployment": { + "$ref": "./examples/ProductDeployment/ExecuteRunner.json" + } + }, + "description": "Invokes execute runner action on the product deployment", + "tags": [ + "ProductDeployments" + ], + "operationId": "ProductDeployments_ExecuteRunner", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ProductIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "ACCEPTED" }, "default": { "description": "Default Response.", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json new file mode 100644 index 000000000000..bcb18431473b --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "7715e512-3adf-48e8-baeb-6d3fcc3de665", + "location": "global", + "api-version": "2019-01-01", + "productId": "Microsoft.NullProvider" + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json index c3567643ae7c..05fdceedfbb6 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/RotateSecrets.json @@ -7,7 +7,6 @@ }, "responses": { "200": {}, - "202": {}, - "404": {} + "202": {} } } From 2bebce336ade4842956073fefd53d9b2f8cd295f Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Sun, 7 Jun 2020 12:18:10 -0700 Subject: [PATCH 12/44] removed 404 responses --- .../preview/2018-07-01/ProductPackage.json | 46 +++++++++++++++---- .../examples/ProductPackage/Create.json | 3 +- .../examples/ProductPackage/Delete.json | 3 +- .../examples/ProductPackage/Get.json | 3 +- .../examples/ProductPackage/List.json | 3 +- .../preview/2019-01-01/ActionPlan.json | 3 -- .../2019-01-01/ActionPlanOperation.json | 6 --- .../ActionPlanOperationAttempt.json | 3 -- .../preview/2019-01-01/Locations.json | 3 -- .../preview/2019-01-01/OperationResults.json | 3 -- .../preview/2019-01-01/ProductDeployment.json | 12 ----- .../preview/2019-01-01/ProductPackage.json | 12 ----- .../preview/2019-01-01/ProductSecret.json | 12 ----- .../2019-01-01/examples/ActionPlan/Get.json | 3 +- .../ActionPlanOperationAttempt/Get.json | 3 +- .../examples/ActionPlanOperations/Get.json | 3 +- .../examples/ActionPlanOperations/List.json | 3 +- .../2019-01-01/examples/Locations/Get.json | 3 +- .../examples/OperationResults/Get.json | 3 +- .../examples/ProductDeployment/Bootstrap.json | 3 +- .../examples/ProductDeployment/Deploy.json | 3 +- .../examples/ProductDeployment/Get.json | 3 +- .../examples/ProductDeployment/List.json | 3 +- .../examples/ProductPackage/Create.json | 3 +- .../examples/ProductPackage/Delete.json | 3 +- .../examples/ProductPackage/Get.json | 3 +- .../examples/ProductPackage/List.json | 3 +- .../examples/ProductSecret/Get.Json | 3 +- .../examples/ProductSecret/Import.json | 3 +- .../examples/ProductSecret/List.json | 3 +- .../examples/ProductSecret/Validate.json | 3 +- 31 files changed, 60 insertions(+), 106 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index faae0d360109..bb692a620719 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -43,8 +43,11 @@ "$ref": "#/definitions/ProductPackagesList" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -82,8 +85,11 @@ "$ref": "#/definitions/ProductPackage" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "#/definitions/ExtendedErrorInfo" + } } } }, @@ -119,8 +125,11 @@ "202": { "description": "Accepted" }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -151,8 +160,11 @@ "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -278,6 +290,24 @@ "items": { "$ref": "#/definitions/ProductLink" } + }, + "ExtendedErrorInfo": { + "description": "Error information", + "type": "object", + "properties": { + "code": { + "description": "Error Code", + "type": "string" + }, + "message": { + "description": "Error Message", + "type": "string" + }, + "details": { + "description": "Error message details", + "$ref": "#/definitions/ExtendedErrorInfo" + } + } } }, "parameters": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json index ca975518260c..b2a9cd4c1179 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json @@ -24,7 +24,6 @@ } } }, - "202": {}, - "404": {} + "202": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json index bc55f3cbd5c4..f21f09622f17 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json @@ -6,7 +6,6 @@ "productId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json index b2147dd289b9..8e1cddf94fd6 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json index 4bcfe76a2dc2..c8e773cca19d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json @@ -21,7 +21,6 @@ } ] } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json index 28dbfa115a75..fb687b4690f2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json @@ -85,9 +85,6 @@ "$ref": "#/definitions/ActionPlanResourceEntity" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json index d3c41027983c..f88251943ac5 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json @@ -46,9 +46,6 @@ "$ref": "#/definitions/ActionPlanOperationsList" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -94,9 +91,6 @@ "$ref": "#/definitions/ActionPlanOperationResourceEntity" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json index 54a16de49479..3e588278ebbc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -52,9 +52,6 @@ "$ref": "#/definitions/OperationAttemptResult" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index 0d2e8eafed00..fa6c17f8dfef 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -43,9 +43,6 @@ "$ref": "#/definitions/LocationEntity" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json index 950bc2998838..1e8f1dffb547 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -49,9 +49,6 @@ "$ref": "#/definitions/OperationResult" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 5d18e4d24351..24a0a2697369 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -43,9 +43,6 @@ "$ref": "#/definitions/ProductDeploymentsList" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -88,9 +85,6 @@ "$ref": "#/definitions/ProductDeploymentResourceEntity" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -133,9 +127,6 @@ "202": { "description": "ACCEPTED" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -179,9 +170,6 @@ "202": { "description": "ACCEPTED" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json index 74db3124d7e5..34485d474be0 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json @@ -43,9 +43,6 @@ "$ref": "#/definitions/ProductPackagesList" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -88,9 +85,6 @@ "$ref": "#/definitions/ProductPackage" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -131,9 +125,6 @@ "202": { "description": "Accepted" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -169,9 +160,6 @@ "200": { "description": "OK" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 2fa1c4a844fc..623e6935e2fe 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -40,9 +40,6 @@ "$ref": "#/definitions/ProductSecretsList" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -94,9 +91,6 @@ "$ref": "#/definitions/ProductSecret" } }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -145,9 +139,6 @@ "200": { "description": "Accepted" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { @@ -197,9 +188,6 @@ "200": { "description": "Accepted" }, - "404": { - "description": "NOT FOUND" - }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json index bd293cc207e7..9eb46e88e746 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json @@ -22,7 +22,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json index f261249130e6..0aac2fceef65 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json index 916645557aa5..b2f8a694300c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json @@ -78,7 +78,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json index 5760bcb03108..90e650806121 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/List.json @@ -442,7 +442,6 @@ } ] } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json index 9097bcd0caa3..0245e58eed85 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -12,7 +12,6 @@ "type": "Microsoft.Deployment.Admin/locations", "properties": {} } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json index a448bffdbd44..dfc9780b5021 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json @@ -15,7 +15,6 @@ "endTime": "0001-01-01T00:00:00Z", "percentComplete": 0.0 } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json index 22fb6fa63eda..1231430f0a43 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Bootstrap.json @@ -10,7 +10,6 @@ }, "responses": { "202": {}, - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json index 0d35a8e0a87b..47466509160e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json @@ -10,7 +10,6 @@ }, "responses": { "202": {}, - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json index 260d2b3f837e..c338e71fa21d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json @@ -17,7 +17,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json index 44d5a0148e79..d505ca50cf2e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/List.json @@ -38,7 +38,6 @@ } } ] - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json index 85e66a8949ab..b3439f9c6e71 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json @@ -24,7 +24,6 @@ } } }, - "202": {}, - "404": {} + "202": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json index 106199cd1975..10b325402f2a 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json @@ -6,7 +6,6 @@ "productId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json index 593f444612a6..ecbe6513051d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json index f77e3559a137..6138961357d4 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/List.json @@ -21,7 +21,6 @@ } ] } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index 9d25ff82023c..d9a2530bacee 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -27,7 +27,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index 9293a3756871..6f0639ebe303 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -16,7 +16,6 @@ } }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json index 4c653bab2f9d..cc35a2b5b53a 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json @@ -87,7 +87,6 @@ } ] } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json index ceb402794239..46cb0a4b99cc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json @@ -17,7 +17,6 @@ } }, "responses": { - "200": {}, - "404": {} + "200": {} } } From 5ed5bfef467b4c1b610172dac86425f0476a15b8 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 8 Jun 2020 15:13:51 -0700 Subject: [PATCH 13/44] added default error responses and deleted 404 responses for file containers --- .../preview/2018-07-01/FileContainer.json | 14 ++++++++++---- .../2018-07-01/examples/FileContainer/Delete.json | 3 +-- .../2018-07-01/examples/FileContainer/Get.json | 3 +-- .../preview/2019-01-01/FileContainer.json | 14 ++++++++++---- .../2019-01-01/examples/FileContainer/Create.json | 6 ++---- .../2019-01-01/examples/FileContainer/Delete.json | 3 +-- .../2019-01-01/examples/FileContainer/Get.json | 3 +-- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json index d76594a53700..ec05da218636 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -79,8 +79,11 @@ "$ref": "#/definitions/FileContainer" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "#/definitions/ErrorInfo" + } } } }, @@ -155,8 +158,11 @@ "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "#/definitions/ErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json index ade8de53434c..ce950454bbe8 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json @@ -6,7 +6,6 @@ "fileContainerId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json index c12b99661b22..b10ce0aa7c22 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json index a8885fc7244d..18c38d638875 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json @@ -79,8 +79,11 @@ "$ref": "#/definitions/FileContainer" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } }, @@ -155,8 +158,11 @@ "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json index 66908fa86cf1..a7cc79052e8f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json @@ -5,10 +5,8 @@ "api-version": "2019-01-01", "fileContainerId": "Microsoft.NullProvider.1.1", "fileContainerParameters": { - "properties": { - "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", - "postCopyAction": "Unzip" - } + "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", + "postCopyAction": "Unzip" } }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json index 7ee403600e6d..e9bafdcf68fb 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json @@ -6,7 +6,6 @@ "fileContainerId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json index 1825d47eb2a0..937784a74cbb 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } From eaad50f79b37e74768b6f5043a4c73e4a4db3f77 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 8 Jun 2020 16:40:45 -0700 Subject: [PATCH 14/44] removed older version in the read.md 'input-file' section --- specification/azsadmin/resource-manager/deployment/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/readme.md b/specification/azsadmin/resource-manager/deployment/readme.md index 5dff5c3a4ce0..1f31ebeadde9 100644 --- a/specification/azsadmin/resource-manager/deployment/readme.md +++ b/specification/azsadmin/resource-manager/deployment/readme.md @@ -87,8 +87,6 @@ input-file: - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json - - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json - - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json ``` From e085877e230d51f857adbddbab5b2af10f89ebe3 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 8 Jun 2020 18:40:30 -0700 Subject: [PATCH 15/44] changed details info in the "ExtendedErrorInfo" --- .../preview/2018-07-01/ProductPackage.json | 8 ++++++-- .../preview/2019-01-01/Deployment.json | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index bb692a620719..2f1764b383a2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -304,8 +304,12 @@ "type": "string" }, "details": { - "description": "Error message details", - "$ref": "#/definitions/ExtendedErrorInfo" + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ExtendedErrorInfo" + }, + "readOnly": true } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json index 9dc085092803..d20fddeb03fc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json @@ -87,8 +87,12 @@ "type": "string" }, "details": { - "description": "Error message details", - "$ref": "#/definitions/ExtendedErrorInfo" + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ExtendedErrorInfo" + }, + "readOnly": true } } }, From 0329a470fe55f8b5293af93d6ef900bee9007265 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 8 Jun 2020 18:53:25 -0700 Subject: [PATCH 16/44] changed ExtendedErrorInfo object --- .../preview/2019-01-01/Deployment.json | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json index d20fddeb03fc..0a0b23ae51d4 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json @@ -75,24 +75,23 @@ "x-ms-azure-resource": true }, "ExtendedErrorInfo": { - "description": "Error information", + "description": "Extended Error Information.", "type": "object", "properties": { "code": { - "description": "Error Code", + "description": "The error code.", "type": "string" }, "message": { - "description": "Error Message", + "description": "The error message.", "type": "string" }, "details": { - "description": "Internal error details.", + "description": "The detailed error messages.", "type": "array", "items": { "$ref": "#/definitions/ExtendedErrorInfo" - }, - "readOnly": true + } } } }, From 021f70e193c7d75fa2fe0c0242ce686b9d211dcc Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 9 Jun 2020 09:57:49 -0700 Subject: [PATCH 17/44] updating error definition --- .../preview/2019-01-01/Deployment.json | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json index 0a0b23ae51d4..673781c0cf9b 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json @@ -75,23 +75,36 @@ "x-ms-azure-resource": true }, "ExtendedErrorInfo": { - "description": "Extended Error Information.", "type": "object", + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "type": "object", + "description": "Error definition.", "properties": { "code": { - "description": "The error code.", - "type": "string" + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true }, "message": { - "description": "The error message.", - "type": "string" + "description": "Description of the error.", + "type": "string", + "readOnly": true }, "details": { - "description": "The detailed error messages.", + "description": "Internal error details.", "type": "array", "items": { - "$ref": "#/definitions/ExtendedErrorInfo" - } + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true } } }, From e012c279b18002bdf909b7fcd3e08c22e05e7157 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 9 Jun 2020 11:40:22 -0700 Subject: [PATCH 18/44] changing error definition in 2018-07-01 version --- .../preview/2018-07-01/FileContainer.json | 29 ++++++++++++++----- .../preview/2018-07-01/ProductPackage.json | 24 +++++++++++---- 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json index ec05da218636..5d3a223494c0 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -258,23 +258,36 @@ } }, "ErrorInfo": { - "description": "Extended Error Information.", "type": "object", + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "type": "object", + "description": "Error definition.", "properties": { "code": { - "description": "The error code.", - "type": "string" + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true }, "message": { - "description": "The error message.", - "type": "string" + "description": "Description of the error.", + "type": "string", + "readOnly": true }, "details": { - "description": "The detailed error messages.", + "description": "Internal error details.", "type": "array", "items": { - "$ref": "#/definitions/ErrorInfo" - } + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true } } }, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index 2f1764b383a2..fb9925921067 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -292,22 +292,34 @@ } }, "ExtendedErrorInfo": { - "description": "Error information", "type": "object", + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "type": "object", + "description": "Error definition.", "properties": { "code": { - "description": "Error Code", - "type": "string" + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true }, "message": { - "description": "Error Message", - "type": "string" + "description": "Description of the error.", + "type": "string", + "readOnly": true }, "details": { "description": "Internal error details.", "type": "array", "items": { - "$ref": "#/definitions/ExtendedErrorInfo" + "$ref": "#/definitions/ErrorDefinition" }, "readOnly": true } From 78bca1da75dad66409bfa6a950ca58ba02580b88 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 25 Jun 2020 13:09:09 -0700 Subject: [PATCH 19/44] updated location responses --- .../preview/2019-01-01/Locations.json | 37 ++----------------- .../2019-01-01/examples/Locations/List.json | 10 ++--- 2 files changed, 8 insertions(+), 39 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index fa6c17f8dfef..f30a682d8cfc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -100,7 +100,7 @@ "description": "Array of locations.", "type": "array", "items": { - "$ref": "#/definitions/LocationsResourceEntity" + "$ref": "#/definitions/LocationEntity" } }, "nextLink": { @@ -109,42 +109,13 @@ } } }, - "LocationsResourceEntity": { - "type": "object", - "description": "Location Resource Entity", - "properties": { - "properties": { - "description": "Location Properties", - "$ref": "#/definitions/LocationAdminProperties", - "x-ms-client-flatten": true - }, - "eTag": { - "description": "Entity tag of the resource", - "type": "string" - } - }, - "allOf": [ - { - "$ref": "Deployment.json#/definitions/Resource" - } - ] - }, - "LocationAdminProperties": { - "description": "Location Admin Properties", - "type": "object", - "properties": { - "location": { - "description": "the location name", - "title": "location", - "type": "string" - } - } - }, "LocationEntity": { "type": "object", "description": "Location Entity", "properties": { - "properties": {} + "properties": { + "description": "Location Properties" + } }, "allOf": [ { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json index 1c67797c584c..3831b7f9be58 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json @@ -8,12 +8,10 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Deployment.Admin/locations/1", - "name": "1", - "type": "Microsoft.Deployment.Admin/locations/1", - "properties": { - "location": "global" - } + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Deployment.Admin/locations/global", + "name": "global", + "type": "Microsoft.Deployment.Admin/locations", + "properties": {} } ] } From 2c7e079dadbf5298640af902cec7f42f8ff442d9 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 25 Jun 2020 15:12:19 -0700 Subject: [PATCH 20/44] changed the entity name --- .../preview/2019-01-01/Locations.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index f30a682d8cfc..763f04ff0fc8 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -40,7 +40,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/LocationEntity" + "$ref": "#/definitions/LocationProp" } }, "default": { @@ -100,7 +100,7 @@ "description": "Array of locations.", "type": "array", "items": { - "$ref": "#/definitions/LocationEntity" + "$ref": "#/definitions/LocationProp" } }, "nextLink": { @@ -109,7 +109,7 @@ } } }, - "LocationEntity": { + "LocationProp": { "type": "object", "description": "Location Entity", "properties": { From 995b49e67eeaddea5ddbf3794c40db829c2d49c9 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 25 Jun 2020 15:29:26 -0700 Subject: [PATCH 21/44] Revert "changed the entity name" This reverts commit 2c7e079dadbf5298640af902cec7f42f8ff442d9. --- .../preview/2019-01-01/Locations.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index 763f04ff0fc8..f30a682d8cfc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -40,7 +40,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/LocationProp" + "$ref": "#/definitions/LocationEntity" } }, "default": { @@ -100,7 +100,7 @@ "description": "Array of locations.", "type": "array", "items": { - "$ref": "#/definitions/LocationProp" + "$ref": "#/definitions/LocationEntity" } }, "nextLink": { @@ -109,7 +109,7 @@ } } }, - "LocationProp": { + "LocationEntity": { "type": "object", "description": "Location Entity", "properties": { From c76c06d9b757c78b832fd8eac949486f6e04c7db Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 25 Jun 2020 15:32:15 -0700 Subject: [PATCH 22/44] Revert "updated location responses" This reverts commit 78bca1da75dad66409bfa6a950ca58ba02580b88. --- .../preview/2019-01-01/Locations.json | 37 +++++++++++++++++-- .../2019-01-01/examples/Locations/List.json | 10 +++-- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index f30a682d8cfc..fa6c17f8dfef 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -100,7 +100,7 @@ "description": "Array of locations.", "type": "array", "items": { - "$ref": "#/definitions/LocationEntity" + "$ref": "#/definitions/LocationsResourceEntity" } }, "nextLink": { @@ -109,13 +109,42 @@ } } }, - "LocationEntity": { + "LocationsResourceEntity": { "type": "object", - "description": "Location Entity", + "description": "Location Resource Entity", "properties": { "properties": { - "description": "Location Properties" + "description": "Location Properties", + "$ref": "#/definitions/LocationAdminProperties", + "x-ms-client-flatten": true + }, + "eTag": { + "description": "Entity tag of the resource", + "type": "string" + } + }, + "allOf": [ + { + "$ref": "Deployment.json#/definitions/Resource" } + ] + }, + "LocationAdminProperties": { + "description": "Location Admin Properties", + "type": "object", + "properties": { + "location": { + "description": "the location name", + "title": "location", + "type": "string" + } + } + }, + "LocationEntity": { + "type": "object", + "description": "Location Entity", + "properties": { + "properties": {} }, "allOf": [ { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json index 3831b7f9be58..1c67797c584c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json @@ -8,10 +8,12 @@ "body": { "value": [ { - "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Deployment.Admin/locations/global", - "name": "global", - "type": "Microsoft.Deployment.Admin/locations", - "properties": {} + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Deployment.Admin/locations/1", + "name": "1", + "type": "Microsoft.Deployment.Admin/locations/1", + "properties": { + "location": "global" + } } ] } From 1ce44dcbe09ddd5a21fc7039e36463207a009f88 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 25 Jun 2020 15:35:07 -0700 Subject: [PATCH 23/44] updated locations Get response --- .../preview/2019-01-01/Locations.json | 14 +------------- .../preview/2019-01-01/examples/Locations/Get.json | 4 +++- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index fa6c17f8dfef..039a230e26ef 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -40,7 +40,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/LocationEntity" + "$ref": "#/definitions/LocationsResourceEntity" } }, "default": { @@ -139,18 +139,6 @@ "type": "string" } } - }, - "LocationEntity": { - "type": "object", - "description": "Location Entity", - "properties": { - "properties": {} - }, - "allOf": [ - { - "$ref": "Deployment.json#/definitions/Resource" - } - ] } }, "parameters": {}, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json index 0245e58eed85..b097755df967 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -10,7 +10,9 @@ "id": "/subscriptions/b42940a9-c92c-44c8-b745-7558ad4b08d9/providers/Microsoft.Deployment.Admin/locations/global", "name": "global", "type": "Microsoft.Deployment.Admin/locations", - "properties": {} + "properties": { + "location": "global" + } } } } From 013de80d0871bff9f5adabbeb08c78b549124149 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 14 Jul 2020 17:48:37 -0700 Subject: [PATCH 24/44] change for New-AzFileContainer command --- .../preview/2019-01-01/FileContainer.json | 10 ++++++++++ .../2019-01-01/examples/FileContainer/Create.json | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json index 18c38d638875..5a5ea37e25c4 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json @@ -275,6 +275,16 @@ "FileContainerParameters": { "description": "Parameters for creating a new file container.", "type": "object", + "properties": { + "properties": { + "description": "Specifies the file container body", + "$ref": "#/definitions/FileContainerBody" + } + } + }, + "FileContainerBody": { + "description": "Body for creating a new file container.", + "type": "object", "properties": { "postCopyAction": { "description": "Specifies the file post copy action.", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json index a7cc79052e8f..66908fa86cf1 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Create.json @@ -5,8 +5,10 @@ "api-version": "2019-01-01", "fileContainerId": "Microsoft.NullProvider.1.1", "fileContainerParameters": { - "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", - "postCopyAction": "Unzip" + "properties": { + "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", + "postCopyAction": "Unzip" + } } }, "responses": { From c687567845690fd320c868ee9696608c16c76474 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 13:42:57 -0700 Subject: [PATCH 25/44] added Parameter for the New-AzsProductPackage --- .../preview/2019-01-01/ProductPackage.json | 36 ++++++++++++++++++- .../examples/ProductPackage/Create.json | 2 +- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json index 34485d474be0..dfe0b3a5a19a 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json @@ -111,6 +111,9 @@ { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, + { + "$ref": "#/parameters/ProductPackageParameters" + }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" } @@ -264,9 +267,40 @@ "items": { "$ref": "#/definitions/ProductLink" } + }, + "ProductPackageParameters": { + "description": "Parameters for creating a new product package.", + "type": "object", + "properties": { + "properties": { + "description": "Specifies the product package", + "$ref": "#/definitions/ProductPackageBody" + } + } + }, + "ProductPackageBody": { + "description": "Body for creating a new product package.", + "type": "object", + "properties": { + "fileContainerId": { + "description": "Specifies the file container.", + "$ref": "#/definitions/FileContainerId" + } + } + } + }, + "parameters": { + "ProductPackageParameters": { + "description": "The parameters required to create a new product package.", + "name": "ProductPackageParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ProductPackageParameters" + }, + "x-ms-parameter-location": "method" } }, - "parameters": {}, "securityDefinitions": { "azure_auth": { "type": "oauth2", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json index b3439f9c6e71..0c8283e8a243 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json @@ -4,7 +4,7 @@ "location": "global", "api-version": "2019-01-01", "productId": "Microsoft.NullProvider.1.1", - "fileContainerParameter": { + "ProductPackageParameters": { "properties": { "fileContainerId": "Microsoft.NullProvider.1.1" } From a9719675080a23c2c1a75a11b4fd952a5afd8eb7 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 15:58:11 -0700 Subject: [PATCH 26/44] changed productId to packageId --- .../preview/2019-01-01/Deployment.json | 8 ++++++++ .../preview/2019-01-01/ProductPackage.json | 8 ++++---- .../2019-01-01/examples/ProductPackage/Create.json | 2 +- .../2019-01-01/examples/ProductPackage/Delete.json | 2 +- .../preview/2019-01-01/examples/ProductPackage/Get.json | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json index 673781c0cf9b..3f662c28d526 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json @@ -205,6 +205,14 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "PackageIdParameter": { + "name": "packageId", + "in": "path", + "description": "The package identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } }, "securityDefinitions": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json index dfe0b3a5a19a..9a17438d2b4e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json @@ -55,7 +55,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}": { "get": { "x-ms-examples": { "Return the product package details.": { @@ -72,7 +72,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" @@ -109,7 +109,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/ProductPackageParameters" @@ -153,7 +153,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json index 0c8283e8a243..bf9573250475 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider.1.1", + "packageId": "Microsoft.NullProvider.1.1", "ProductPackageParameters": { "properties": { "fileContainerId": "Microsoft.NullProvider.1.1" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json index 10b325402f2a..0e1cfe43407e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { "200": {} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json index ecbe6513051d..bc5abce11e66 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { "200": { From 4e547a5117f85b1ddfa63931ee9e64d74b90a164 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 17:15:56 -0700 Subject: [PATCH 27/44] updated operationId for Bootstrap --- .../preview/2019-01-01/ProductDeployment.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 24a0a2697369..5c8da817ba3d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -105,7 +105,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_BootStrap", + "operationId": "BootstrapAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" From ec4cefce425bb6607b9b9c97bce99be60e5649fa Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 17:29:53 -0700 Subject: [PATCH 28/44] changed operationId for deploy action --- .../preview/2019-01-01/ProductDeployment.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 5c8da817ba3d..5f94fbb82828 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -148,7 +148,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_Deploy", + "operationId": "DeployAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" From ada5eb4d0f810fd8682f7229757780afc789ef57 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 18:01:22 -0700 Subject: [PATCH 29/44] changed paramters to object --- .../preview/2019-01-01/ProductDeployment.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 5f94fbb82828..5924162cd275 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -489,7 +489,7 @@ }, "parameters": { "description": "Deployment parameters, value in JToken", - "type": "string" + "type": "object" } } }, From 265ac135ac945b97e68871057223b9ab8dd3b26a Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 18:05:49 -0700 Subject: [PATCH 30/44] changed the operation Ids --- .../preview/2019-01-01/ProductDeployment.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 5924162cd275..4c19c16665bb 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -105,7 +105,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "BootstrapAction_Product", + "operationId": "Bootstrap_ProductAction", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -148,7 +148,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "DeployAction_Product", + "operationId": "Deploy_ProductAction", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -231,7 +231,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_RotateSecrets", + "operationId": "RotateSecrets_ProductAction", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -271,7 +271,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_ExecuteRunner", + "operationId": "ExecuteRunner_ProductAction", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" From 07ca3fe14df56c3810f9f2a2c7cd66ad63c10f72 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 15 Jul 2020 18:08:11 -0700 Subject: [PATCH 31/44] changed operationIds for the right command names --- .../preview/2019-01-01/ProductDeployment.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 4c19c16665bb..dd938c2f38ee 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -105,7 +105,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "Bootstrap_ProductAction", + "operationId": "BootstrapAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -148,7 +148,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "Deploy_ProductAction", + "operationId": "DeployAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -231,7 +231,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "RotateSecrets_ProductAction", + "operationId": "RotateSecretsAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -271,7 +271,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ExecuteRunner_ProductAction", + "operationId": "ExecuteRunnerAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" From 093b870f7691239ace7dbc4e798ef1d11bdddaac Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Fri, 17 Jul 2020 15:20:12 -0700 Subject: [PATCH 32/44] execute runner changes --- .../preview/2019-01-01/ProductDeployment.json | 23 +++++++++++++++++++ .../examples/ProductDeployment/Deploy.json | 3 ++- .../ProductDeployment/ExecuteRunner.json | 5 +++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index dd938c2f38ee..1d6b205c8fc2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -281,6 +281,9 @@ }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ExecuteRunnerActionParameter" } ], "responses": { @@ -502,6 +505,16 @@ "type": "string" } } + }, + "ExecuteRunnerActionParameters": { + "description": "Parameters for execute runner action", + "type": "object", + "properties": { + "parameters": { + "description": "Execute Runner parameters, value in JToken", + "type": "object" + } + } } }, "parameters": { @@ -532,6 +545,16 @@ "$ref": "#/definitions/DeployActionParameters" }, "x-ms-parameter-location": "method" + }, + "ExecuteRunnerActionParameter": { + "description": "Represents excute runner action parameter", + "name": "executeRunnerActionParameter", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExecuteRunnerActionParameters" + }, + "x-ms-parameter-location": "method" } }, "securityDefinitions": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json index 47466509160e..2ce6071df747 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json @@ -5,7 +5,8 @@ "api-version": "2019-01-01", "productId": "Microsoft.IotHubPreview", "deployActionParameter": { - "version": "1.0.2" + "version": "1.0.2", + "parameters": {} } }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json index bcb18431473b..e2594cdc0f4a 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json @@ -3,7 +3,10 @@ "subscriptionId": "7715e512-3adf-48e8-baeb-6d3fcc3de665", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider" + "productId": "Microsoft.NullProvider", + "executeRunnerActionParameter": { + "parameters": {} + } }, "responses": { "200": {}, From 2ffa2046cb973e3483ad02ba7ed15399e7014e4a Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Fri, 17 Jul 2020 16:35:35 -0700 Subject: [PATCH 33/44] fixed path parameter for secrets and remove command name --- .../preview/2019-01-01/ProductDeployment.json | 2 +- .../preview/2019-01-01/ProductSecret.json | 16 ++++++++-------- .../2019-01-01/examples/ProductSecret/Get.Json | 2 +- .../examples/ProductSecret/Import.json | 2 +- .../2019-01-01/examples/ProductSecret/List.json | 2 +- .../examples/ProductSecret/Validate.json | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 1d6b205c8fc2..dad7a9d00b3e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -191,7 +191,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_Remove", + "operationId": "RemoveAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 623e6935e2fe..ad3ded59eb4f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -10,7 +10,7 @@ "https" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -30,7 +30,7 @@ "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" } ], "responses": { @@ -58,7 +58,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets/{secretName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets/{secretName}": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -78,7 +78,7 @@ "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -106,7 +106,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets/{secretName}/import": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets/{secretName}/import": { "post": { "x-ms-examples": { "Imports a product secret.": { @@ -123,7 +123,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -155,7 +155,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets/{secretName}/validate": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets/{secretName}/validate": { "post": { "x-ms-examples": { "Validates a product secret.": { @@ -172,7 +172,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index d9a2530bacee..16b0913aeec5 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -3,7 +3,7 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "sslCert" }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index 6f0639ebe303..58591c142be2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -3,7 +3,7 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { "secretValue": "sslCert" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json index cc35a2b5b53a..ee029a30fccd 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json @@ -3,7 +3,7 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretValue": "sslCert" }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json index 46cb0a4b99cc..2364e713e1b8 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json @@ -3,7 +3,7 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { "secretValue": "sslCert" From 60043c65f4edd66057bf2398aa7114939c40fef3 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 20 Jul 2020 10:23:15 -0700 Subject: [PATCH 34/44] changed the secret name --- .../preview/2019-01-01/ProductSecret.json | 10 +++++----- .../2019-01-01/examples/ProductSecret/Import.json | 2 +- .../2019-01-01/examples/ProductSecret/List.json | 2 +- .../2019-01-01/examples/ProductSecret/Validate.json | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index ad3ded59eb4f..f3f37c705705 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -117,7 +117,7 @@ "tags": [ "ProductSecrets" ], - "operationId": "ProductSecrets_Import", + "operationId": "ProductSecrets_Set", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -390,7 +390,7 @@ "name": "SecretRotationStatus" } }, - "SecretValue": { + "value": { "description": "The secret value in a secure string format.", "type": "string" }, @@ -414,9 +414,9 @@ "description": "Parameters required for creating/updating a product secret.", "type": "object", "properties": { - "secretValue": { + "value": { "description": "The secret value in a secure string format.", - "$ref": "#/definitions/SecretValue" + "$ref": "#/definitions/value" }, "pfxFileName": { "description": "The pfx certificate file location.", @@ -462,7 +462,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/SecretValue" + "$ref": "#/definitions/value" }, "x-ms-parameter-location": "method" }, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index 58591c142be2..faf14789152a 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -6,7 +6,7 @@ "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "secretValue": "sslCert" + "value": "sslCert" }, "newOffer": { "properties": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json index ee029a30fccd..8ef03a210b70 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json @@ -4,7 +4,7 @@ "location": "global", "api-version": "2019-01-01", "packageId": "Microsoft.IotHubPreview.1.0.2", - "secretValue": "sslCert" + "value": "sslCert" }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json index 2364e713e1b8..5c6252cd8143 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json @@ -6,7 +6,7 @@ "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "secretValue": "sslCert" + "value": "sslCert" }, "secretValue": "sslCert", "newOffer": { From 7c78aea2946e6094c845ec7a4d1924f0709dd90b Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 20 Jul 2020 14:03:30 -0700 Subject: [PATCH 35/44] changed secret parameters --- .../preview/2019-01-01/ProductSecret.json | 70 +++---------------- 1 file changed, 11 insertions(+), 59 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index f3f37c705705..948a731ec7fc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -394,19 +394,15 @@ "description": "The secret value in a secure string format.", "type": "string" }, - "PfxFileName": { - "description": "The pfx certificate file location.", + "data": { + "description": "The converted Base64 String from a certificate pfx file.", "type": "string" }, - "PfxPassword": { - "description": "The pfx certificate file password as a secure string.", - "type": "string" - }, - "SymmetricKey": { + "key": { "description": "The symmetric key as a secure string.", "type": "string" }, - "Password": { + "password": { "description": "The password as a secure string.", "type": "string" }, @@ -418,21 +414,17 @@ "description": "The secret value in a secure string format.", "$ref": "#/definitions/value" }, - "pfxFileName": { - "description": "The pfx certificate file location.", - "$ref": "#/definitions/PfxFileName" + "data": { + "description": "The pfx certificate converted Base64 data.", + "$ref": "#/definitions/data" }, - "pfxPassword": { + "password": { "description": "The pfx certificate file password.", - "$ref": "#/definitions/PfxPassword" + "$ref": "#/definitions/password" }, - "symmetricKey": { + "key": { "description": "The symmetric key.", - "$ref": "#/definitions/SymmetricKey" - }, - "password": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/Password" + "$ref": "#/definitions/key" } } } @@ -465,46 +457,6 @@ "$ref": "#/definitions/value" }, "x-ms-parameter-location": "method" - }, - "PfxFileNameParameter": { - "description": "The pfx certificate file location.", - "name": "pfxFileName", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/PfxFileName" - }, - "x-ms-parameter-location": "method" - }, - "PfxPasswordParameter": { - "description": "The pfx certificate file password.", - "name": "pfxPasswordParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/PfxPassword" - }, - "x-ms-parameter-location": "method" - }, - "SymmetricKeyParameter": { - "description": "The symmetric key.", - "name": "SymmetricKeyParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/SymmetricKey" - }, - "x-ms-parameter-location": "method" - }, - "PasswordParameter": { - "description": "The password.", - "name": "PasswordParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Password" - }, - "x-ms-parameter-location": "method" } }, "securityDefinitions": { From d9dd4eb56fe65e26d8d620981de8e2cc2a989b26 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 21 Jul 2020 13:24:10 -0700 Subject: [PATCH 36/44] added changes to resolve conflicts --- .../preview/2018-07-01/Deployment.json | 236 ++++++++++++++++++ .../preview/2018-07-01/FileContainer.json | 102 +++----- .../preview/2018-07-01/ProductPackage.json | 124 +++------ .../examples/FileContainer/Create.json | 6 +- .../2018-07-01/examples/Operations/List.json | 159 ++++++++++++ .../examples/ProductPackage/Create.json | 4 +- .../examples/ProductPackage/Delete.json | 2 +- .../examples/ProductPackage/Get.json | 2 +- .../preview/2019-01-01/ProductDeployment.json | 2 +- 9 files changed, 470 insertions(+), 167 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json new file mode 100644 index 000000000000..3f662c28d526 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json @@ -0,0 +1,236 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.Deployment.Admin/operations": { + "get": { + "x-ms-examples": { + "Returns the list of supported REST operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Returns the list of supported REST operations.", + "tags": [ + "Deployment" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "Resource": { + "description": "Object model of azure resource manager base.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "type": { + "readOnly": true, + "description": "Type of Resource.", + "type": "string" + }, + "location": { + "description": "Location of the resource.", + "type": "string" + } + }, + "x-ms-azure-resource": true + }, + "ExtendedErrorInfo": { + "type": "object", + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "type": "object", + "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 + } + } + }, + "JTokenString": { + "description": "Error information", + "type": "object", + "properties": { + "value": { + "description": "Parameters as JToken string", + "type": "string" + } + } + }, + "Operation": { + "description": "Describes the supported REST operation.", + "properties": { + "name": { + "description": "The name of the operation being performed on this particular object. This name should match the name that appears in RBAC or the event service.", + "type": "string" + }, + "display": { + "description": "Contains the localized display information for this particular operation or action.", + "$ref": "#/definitions/Display" + }, + "origin": { + "description": "Origin for the operation. Eg. User, System", + "type": "string" + } + } + }, + "Display": { + "description": "Contains the localized display information for this particular operation or action.", + "properties": { + "provider": { + "description": "The localized, friendly version of the resource provider name. The provider name is expected to include the name of the publisher or company responsible. The provider name format should use title case and begin with \"Microsoft\" for first-party services. For example, the provider name may be\"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", + "type": "string" + }, + "resource": { + "description": "The localized, friendly version of the resource type related to this action or operation; the resource type should match the public documentation for the resource provider.", + "type": "string" + }, + "operation": { + "description": "The localized, friendly name for the operation. Use the name as it will displayed to the user.", + "type": "string" + }, + "description": { + "description": "The localized, friendly description for the operation. The description will be displayed to the user. It should be thorough and concise for used in both tooltips and detailed views.", + "type": "string" + } + } + }, + "OperationList": { + "description": "List of Operations", + "properties": { + "value": { + "description": "Array of operations", + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + } + }, + "nextLink": { + "description": "URI to the next page of operations.", + "type": "string" + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "required": true, + "type": "string" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2019-01-01" + }, + "LocationParameter": { + "description": "Location of the resource.", + "name": "location", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method", + "default": "2019-01-01" + }, + "ProductIdParameter": { + "name": "productId", + "in": "path", + "description": "The product identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "PackageIdParameter": { + "name": "packageId", + "in": "path", + "description": "The package identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json index 5d3a223494c0..0fa18ee52515 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -30,10 +30,10 @@ "operationId": "FileContainers_List", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -63,13 +63,13 @@ "operationId": "FileContainers_Get", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/FileContainerIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -82,7 +82,7 @@ "default": { "description": "Default Response.", "schema": { - "$ref": "#/definitions/ErrorInfo" + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" } } } @@ -100,13 +100,13 @@ "operationId": "FileContainers_Create", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/FileContainerParameters" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/FileContainerIdParameter" @@ -145,13 +145,13 @@ "operationId": "FileContainers_Delete", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/FileContainerIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -161,7 +161,7 @@ "default": { "description": "Default Response.", "schema": { - "$ref": "#/definitions/ErrorInfo" + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" } } } @@ -169,32 +169,6 @@ } }, "definitions": { - "Resource": { - "description": "Object model of azure resource manager base.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "description": "ID of the resource.", - "type": "string" - }, - "name": { - "readOnly": true, - "description": "Name of the resource.", - "type": "string" - }, - "type": { - "readOnly": true, - "description": "Type of Resource.", - "type": "string" - }, - "location": { - "description": "Location of the resource.", - "type": "string" - } - }, - "x-ms-azure-resource": true - }, "FileContainer": { "type": "object", "description": "File container entity.", @@ -207,7 +181,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "Deployment.json#/definitions/Resource" } ] }, @@ -258,36 +232,23 @@ } }, "ErrorInfo": { + "description": "Extended Error Information.", "type": "object", - "description": "Error response.", - "properties": { - "error": { - "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." - } - } - }, - "ErrorDefinition": { - "type": "object", - "description": "Error definition.", "properties": { "code": { - "description": "Service specific error code which serves as the substatus for the HTTP error code.", - "type": "string", - "readOnly": true + "description": "The error code.", + "type": "string" }, "message": { - "description": "Description of the error.", - "type": "string", - "readOnly": true + "description": "The error message.", + "type": "string" }, "details": { - "description": "Internal error details.", + "description": "The detailed error messages.", "type": "array", "items": { - "$ref": "#/definitions/ErrorDefinition" - }, - "readOnly": true + "$ref": "#/definitions/ErrorInfo" + } } } }, @@ -314,6 +275,16 @@ "FileContainerParameters": { "description": "Parameters for creating a new file container.", "type": "object", + "properties": { + "properties": { + "description": "Specifies the file container body", + "$ref": "#/definitions/FileContainerBody" + } + } + }, + "FileContainerBody": { + "description": "Body for creating a new file container.", + "type": "object", "properties": { "postCopyAction": { "description": "Specifies the file post copy action.", @@ -327,21 +298,6 @@ } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", - "required": true, - "type": "string" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "description": "Client API Version.", - "required": true, - "type": "string", - "default": "2018-07-01" - }, "FileContainerIdParameter": { "description": "The file container identifier.", "name": "fileContainerId", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index fb9925921067..4814fb0cea16 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -30,10 +30,10 @@ "operationId": "ProductPackages_List", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -46,7 +46,7 @@ "default": { "description": "Default Response.", "schema": { - "$ref": "#/definitions/ExtendedErrorInfo" + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" } } }, @@ -55,7 +55,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}": { "get": { "x-ms-examples": { "Return the product package details.": { @@ -69,13 +69,13 @@ "operationId": "ProductPackages_Get", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -88,7 +88,7 @@ "default": { "description": "Default Response.", "schema": { - "$ref": "#/definitions/ExtendedErrorInfo" + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" } } } @@ -106,13 +106,16 @@ "operationId": "ProductPackages_Create", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "#/parameters/ProductPackageParameters" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -128,7 +131,7 @@ "default": { "description": "Default Response.", "schema": { - "$ref": "#/definitions/ExtendedErrorInfo" + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" } } }, @@ -147,13 +150,13 @@ "operationId": "ProductPackages_Delete", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -163,7 +166,7 @@ "default": { "description": "Default Response.", "schema": { - "$ref": "#/definitions/ExtendedErrorInfo" + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" } } }, @@ -172,32 +175,6 @@ } }, "definitions": { - "Resource": { - "description": "Object model of azure resource manager base.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "description": "ID of the resource.", - "type": "string" - }, - "name": { - "readOnly": true, - "description": "Name of the resource.", - "type": "string" - }, - "type": { - "readOnly": true, - "description": "Type of Resource.", - "type": "string" - }, - "location": { - "description": "Location of the resource.", - "type": "string" - } - }, - "x-ms-azure-resource": true - }, "ProductPackage": { "description": "Properties for a product package.", "type": "object", @@ -210,7 +187,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "Deployment.json#/definitions/Resource" } ] }, @@ -291,63 +268,36 @@ "$ref": "#/definitions/ProductLink" } }, - "ExtendedErrorInfo": { + "ProductPackageParameters": { + "description": "Parameters for creating a new product package.", "type": "object", - "description": "Error response.", "properties": { - "error": { - "$ref": "#/definitions/ErrorDefinition", - "description": "The error details." + "properties": { + "description": "Specifies the product package", + "$ref": "#/definitions/ProductPackageBody" } } }, - "ErrorDefinition": { + "ProductPackageBody": { + "description": "Body for creating a new product package.", "type": "object", - "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 + "fileContainerId": { + "description": "Specifies the file container.", + "$ref": "#/definitions/FileContainerId" } } } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", - "required": true, - "type": "string" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "description": "Client API Version.", + "ProductPackageParameters": { + "description": "The parameters required to create a new product package.", + "name": "ProductPackageParameters", + "in": "body", "required": true, - "type": "string", - "default": "2018-07-01" - }, - "ProductIdParameter": { - "name": "productId", - "in": "path", - "description": "The product identifier.", - "required": true, - "type": "string", + "schema": { + "$ref": "#/definitions/ProductPackageParameters" + }, "x-ms-parameter-location": "method" } }, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json index 570826b0edce..43bbdc5c5942 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json @@ -5,8 +5,10 @@ "api-version": "2018-07-01", "fileContainerId": "Microsoft.NullProvider.1.1", "fileContainerParameters": { - "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", - "postCopyAction": "Unzip" + "properties": { + "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", + "postCopyAction": "Unzip" + } } }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json new file mode 100644 index 000000000000..6a927b325599 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json @@ -0,0 +1,159 @@ +{ + "parameters": { + "api-version": "2019-01-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Deployment.Admin/locations/fileContainers/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "File Container", + "operation": "List/Get File Container(s)", + "description": "Returns the list of file containers or gets properties for the specified file container." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/fileContainers/write", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "File Container", + "operation": "Create/Update File Container", + "description": "Creates or updates a file container." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/fileContainers/delete", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "File Container", + "operation": "Delete File Container", + "description": "Deletes an existing file container." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/operationresults/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Operation Result", + "operation": "Poll Asynchronous Operation", + "description": "Polls the status of an asynchronous operation." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Deployment.Admin/Operations/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Operation", + "operation": "List Supported Operations", + "description": "Returns the list of supported operations." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "List/Get Product Deployment(s)", + "description": "Returns the list of product deployments or gets properties for the specified product deployment." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/bootstrap/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Execute Bootstrap Deployment Phase", + "description": "Executes 'bootstrap' deployment phase." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/deploy/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Execute Provision Deployment Phase", + "description": "Executes 'provision' deployment phase." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/remove/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Remove Installed Product", + "description": "Removes installed product." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/setexternalaccess/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Set External Access", + "description": "Enables or disables operator's access to product subscription." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/secrets/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Secret", + "operation": "List/Get Secret(s)", + "description": "Returns the list of secrets or gets properties for the specified secret." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/secrets/import/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Secret", + "operation": "Import Secret Value", + "description": "Imports a new secret value." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/secrets/validateImport/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Secret", + "operation": "Validate Import", + "description": "Validates input for the import action." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productPackages/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Package", + "operation": "List/Get Product Package(s)", + "description": "Returns the list of product packages or gets properties for the specified product package." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productPackages/write", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Package", + "operation": "Create/Update Product Package", + "description": "Creates or updates a product package." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productPackages/delete", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Package", + "operation": "Delete Product Package", + "description": "Deletes an existing product package." + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json index b2a9cd4c1179..0a762d6b6146 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json @@ -3,8 +3,8 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2018-07-01", - "productId": "Microsoft.NullProvider.1.1", - "fileContainerParameter": { + "packageId": "Microsoft.NullProvider.1.1", + "ProductPackageParameters": { "properties": { "fileContainerId": "Microsoft.NullProvider.1.1" } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json index f21f09622f17..d19e65465a6c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2018-07-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { "200": {} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json index 8e1cddf94fd6..7055b9e4b4a2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2018-07-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index dad7a9d00b3e..89d89df51336 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -547,7 +547,7 @@ "x-ms-parameter-location": "method" }, "ExecuteRunnerActionParameter": { - "description": "Represents excute runner action parameter", + "description": "Represents execute runner action parameter", "name": "executeRunnerActionParameter", "in": "body", "required": true, From 267c2fba950893dbabb4e2790b42db88f0401b67 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 21 Jul 2020 14:29:56 -0700 Subject: [PATCH 37/44] changed version number --- .../preview/2018-07-01/Deployment.json | 2 +- .../preview/2018-07-01/examples/Operations/List.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json index 3f662c28d526..035b920590e5 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json @@ -1,7 +1,7 @@ { "swagger": "2.0", "info": { - "version": "2019-01-01", + "version": "2018-07-01", "title": "DeploymentAdminClient", "description": "Deployment Admin Client." }, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json index 6a927b325599..0f8927a3d630 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-01-01" + "api-version": "2018-07-01" }, "responses": { "200": { From de220c56fb093052a1a2bf4e4a5cb6afe2a69e11 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 21 Jul 2020 15:10:34 -0700 Subject: [PATCH 38/44] changed the version number --- .../preview/2018-07-01/Deployment.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json index 035b920590e5..4d71f0cb71c7 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json @@ -187,7 +187,7 @@ "description": "Client API Version.", "required": true, "type": "string", - "default": "2019-01-01" + "default": "2018-07-01" }, "LocationParameter": { "description": "Location of the resource.", @@ -196,7 +196,7 @@ "required": true, "type": "string", "x-ms-parameter-location": "method", - "default": "2019-01-01" + "default": "2018-07-01" }, "ProductIdParameter": { "name": "productId", From 42249c92f54a7f08582a099655f93eb8b8f4bc09 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 21 Jul 2020 16:01:52 -0700 Subject: [PATCH 39/44] changed the tag name --- .../preview/2018-07-01/Deployment.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json index 4d71f0cb71c7..e2dd6e9c4384 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json @@ -25,7 +25,7 @@ }, "description": "Returns the list of supported REST operations.", "tags": [ - "Deployment" + "Operations" ], "operationId": "Operations_List", "parameters": [ From b2ae2fde68f90e3a48e4c53d769c834e583e522a Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Tue, 21 Jul 2020 16:31:37 -0700 Subject: [PATCH 40/44] to fix conflicts --- .../preview/2018-07-01/Deployment.json | 2 +- .../preview/2018-07-01/ProductPackage.json | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json index e2dd6e9c4384..4d71f0cb71c7 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json @@ -25,7 +25,7 @@ }, "description": "Returns the list of supported REST operations.", "tags": [ - "Operations" + "Deployment" ], "operationId": "Operations_List", "parameters": [ diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index 4814fb0cea16..b17e778c26b0 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -16,6 +16,36 @@ "application/json" ], "paths": { + "/providers/Microsoft.Deployment.Admin/operations": { + "get": { + "x-ms-examples": { + "Returns the list of supported REST operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Returns the list of supported REST operations.", + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "Deployment.json#/definitions/OperationList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages": { "get": { "x-ms-examples": { From 1cc29368dd35ccdfd5f4227289ccc25145ee4fbc Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 30 Apr 2020 11:21:47 -0700 Subject: [PATCH 41/44] added swagger for missing endpoints of the Deployment Resource Provider fixed CI failures --- .../ActionPlanOperationAttempt.json | 133 ++++++++++++++++ .../preview/2019-01-01/OperationResults.json | 147 ++++++++++++++++++ .../preview/2019-01-01/ProductSecret.json | 124 ++++++++------- .../ActionPlanOperationAttempt/Get.json | 24 +++ .../examples/OperationResults/Get.json | 21 +++ .../examples/ProductSecret/Get.Json | 3 +- .../examples/ProductSecret/Import.json | 3 +- 7 files changed, 395 insertions(+), 60 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json new file mode 100644 index 000000000000..38876eaa1624 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -0,0 +1,133 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/actionplans/{planId}/operations/{operationId}/attempts": { + "get": { + "x-ms-examples": { + "Gets the information about Action Plan operation attempts.": { + "$ref": "./examples/ActionPlanOperationAttempt/Get.json" + } + }, + "description": "Returns the information about action plan operation attempt.", + "tags": [ + "ActionPlanOperationAttempt" + ], + "operationId": "ActionPlanOperationAttempt_List", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/PlanIdParameter" + }, + { + "$ref": "#/parameters/OperationIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationAttemptResult" + } + } + } + } + } + }, + "definitions": { + "OperationAttemptResult": { + "description": "Result of an Operation Attempt.", + "type": "object", + "properties": { + "properties": { + "description": "Result of an Operation Attempt.", + "$ref": "#/definitions/OperationAttemptProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "Deployment.json#/definitions/Resource" + } + ] + }, + "OperationAttemptProperties": { + "type": "object", + "description": "Operation Attempt Properties.", + "properties": { + "startTime": { + "description": "The deployment start time", + "type": "string", + "format": "date-time" + }, + "endTime": { + "description": "The deployment end time", + "type": "string", + "format": "date-time" + }, + "provisioningState": { + "description": "Provisioning state of the resource.", + "type": "string" + } + } + } + }, + "parameters": { + "PlanIdParameter": { + "description": "Identifier of the action plan.", + "name": "planId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "OperationIdParameter": { + "description": "The operation identifier.", + "name": "operationId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json new file mode 100644 index 000000000000..e56c74b6dcb6 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -0,0 +1,147 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/operationresults/{operationResultId}": { + "get": { + "x-ms-examples": { + "Get the operation details.": { + "$ref": "./examples/OperationResults/Get.json" + } + }, + "description": "Retrieves the specific operation results.", + "tags": [ + "OperationResults" + ], + "operationId": "OperationResults_Get", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, + { + "$ref": "#/parameters/OperationResultIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationResult" + } + }, + "404": { + "description": "Not Found" + } + } + } + } + }, + "definitions": { + "OperationResult": { + "description": "Operation Result Entity.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "status": { + "description": "status of the Operation result.", + "$ref": "#/definitions/Status" + }, + "starttime": { + "description": "The deployment start time", + "type": "string", + "format": "date-time" + }, + "endtime": { + "description": "The deployment end time", + "type": "string", + "format": "date-time" + }, + "percentComplete": { + "type": "number", + "format": "double", + "minimum": 0, + "maximum": 100, + "description": "Percentage completed." + } + } + }, + "Status": { + "description": "Specifies the state of the Operation result.", + "type": "string", + "enum": [ + "Bootstrapping", + "Creating", + "ExecutingRunner", + "Updating", + "Deleting", + "Deploying", + "Removing", + "RotatingSecrets", + "Canceled", + "Failed", + "Succeeded" + ], + "x-ms-enum": { + "modelAsString": true, + "name": "Status" + } + } + }, + "parameters": { + "OperationResultIdParameter": { + "description": "The operation result identifier.", + "name": "operationResultId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 2b4950722d0d..0541ad79e244 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -10,7 +10,7 @@ "https" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}/secrets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -26,6 +26,9 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, @@ -52,27 +55,30 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productSecrets/{productId}/secrets/{secretName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}": { "get": { "x-ms-examples": { - "Return the product package details.": { - "$ref": "./examples/ProductSecret/Get.Json" + "Return product secrets list.": { + "$ref": "./examples/ProductSecret/Get.json" } }, - "description": "Retrieves the specific product secret details.", + "description": "Returns the specific product secret.", "tags": [ "ProductSecrets" ], - "operationId": "ProductSecrets_Get", + "operationId": "ProductSecrets_GET", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { - "$ref": "Deployment.json#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/LocationParameter" + }, + { + "$ref": "Deployment.json#/parameters/ProductIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -97,7 +103,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productSecrets/{productId}/secrets/{secretName}/import": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/import": { "post": { "x-ms-examples": { "Imports a product secret.": { @@ -113,6 +119,9 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, @@ -143,7 +152,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productSecrets/{productId}/secrets/{secretName}/validate": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/validate": { "post": { "x-ms-examples": { "Validates a product secret.": { @@ -159,6 +168,9 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, + { + "$ref": "Deployment.json#/parameters/LocationParameter" + }, { "$ref": "Deployment.json#/parameters/ProductIdParameter" }, @@ -373,54 +385,54 @@ "x-ms-enum": { "modelAsString": true, "name": "SecretRotationStatus" - } - }, - "SecretValue": { - "description": "The secret value in a secure string format.", - "type": "string" - }, - "PfxFileName": { - "description": "The pfx certificate file location.", - "type": "string" - }, - "PfxPassword": { - "description": "The pfx certificate file password as a secure string.", - "type": "string" - }, - "SymmetricKey": { - "description": "The symmetric key as a secure string.", - "type": "string" - }, - "Password": { - "description": "The password as a secure string.", - "type": "string" - }, - "SecretParameters": { - "description": "Parameters required for creating/updating a product secret.", - "type": "object", - "properties": { - "secretValue": { - "description": "The secret value in a secure string format.", - "$ref": "#/definitions/SecretValue" - }, - "pfxFileName": { - "description": "The pfx certificate file location.", - "$ref": "#/definitions/PfxFileName" - }, - "pfxPassword": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/PfxPassword" - }, - "symmetricKey": { - "description": "The symmetric key.", - "$ref": "#/definitions/SymmetricKey" - }, - "password": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/Password" + } + }, + "SecretValue": { + "description": "The secret value in a secure string format.", + "type": "string" + }, + "PfxFileName": { + "description": "The pfx certificate file location.", + "type": "string" + }, + "PfxPassword": { + "description": "The pfx certificate file password as a secure string.", + "type": "string" + }, + "SymmetricKey": { + "description": "The symmetric key as a secure string.", + "type": "string" + }, + "Password": { + "description": "The password as a secure string.", + "type": "string" + }, + "SecretParameters": { + "description": "Parameters required for creating/updating a product secret.", + "type": "object", + "properties": { + "secretValue": { + "description": "The secret value in a secure string format.", + "$ref": "#/definitions/SecretValue" + }, + "pfxFileName": { + "description": "The pfx certificate file location.", + "$ref": "#/definitions/PfxFileName" + }, + "pfxPassword": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/PfxPassword" + }, + "symmetricKey": { + "description": "The symmetric key.", + "$ref": "#/definitions/SymmetricKey" + }, + "password": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/Password" + } } } - } }, "parameters": { "SecretNameParameter": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json new file mode 100644 index 000000000000..6c54721d2f68 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", + "location": "global", + "api-version": "2019-01-01", + "planId": "0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced", + "operationId": "UpgradeSFRuntimeInEventHubDataClusters" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/global/actionplans/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/operations/UpgradeSFRuntimeInEventHubDataClusters/attempts/1", + "name": "global/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/UpgradeSFRuntimeInEventHubDataClusters/1", + "type": "Microsoft.Deployment.Admin/locations/actionplans/operations/attempts", + "properties": { + "startTime": "2020-04-23T02:59:50.5512046Z", + "endTime": "2020-04-23T03:02:48.2542795Z", + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} \ No newline at end of file diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json new file mode 100644 index 000000000000..a448bffdbd44 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", + "location": "redmond", + "api-version": "2019-01-01", + "operationResultId": "5cf211b1-5971-4edd-8ee2-11c0f651d469" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/redmond/operationResults/5cf211b1-5971-4edd-8ee2-11c0f651d469", + "name": "5cf211b1-5971-4edd-8ee2-11c0f651d469", + "status": "Bootstrapping", + "startTime": "2020-04-28T04:12:45.1800272Z", + "endTime": "0001-01-01T00:00:00Z", + "percentComplete": 0.0 + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index b6c83ec44937..9d25ff82023c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -4,8 +4,7 @@ "location": "global", "api-version": "2019-01-01", "productId": "Microsoft.IotHubPreview.1.0.2", - "secretName": "secretName", - "secretValue": "sslCert" + "secretName": "sslCert" }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index bf7340c44ac4..8cc9e7399a8f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -18,7 +18,6 @@ } }, "responses": { - "200": {}, - "404": {} + "200": {} } } From f2f929d89b4f78c65117b51a077da0e2774ce5be Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Thu, 30 Apr 2020 14:47:44 -0700 Subject: [PATCH 42/44] fix LintDiff erros added locations endpoint and fixed other changes added actionplans to custom-words.txt and uodated ProductSecret.json updated locations endpoint response --- custom-words.txt | 5 + .../preview/2018-07-01/FileContainer.json | 363 ++++++++++++++++++ .../preview/2018-07-01/ProductPackage.json | 320 +++++++++++++++ .../examples/FileContainer/Create.json | 27 ++ .../examples/FileContainer/Delete.json | 12 + .../examples/FileContainer/Get.json | 24 ++ .../examples/FileContainer/List.json | 26 ++ .../examples/ProductPackage/Create.json | 29 ++ .../examples/ProductPackage/Delete.json | 12 + .../examples/ProductPackage/Get.json | 24 ++ .../examples/ProductPackage/List.json | 26 ++ .../ActionPlanOperationAttempt.json | 2 +- .../preview/2019-01-01/Locations.json | 102 +++++ .../preview/2019-01-01/OperationResults.json | 7 +- .../preview/2019-01-01/ProductDeployment.json | 83 ---- .../preview/2019-01-01/ProductSecret.json | 94 ++--- .../ActionPlanOperationAttempt/Get.json | 43 +-- .../2019-01-01/examples/Locations/Get.json | 20 + .../examples/OperationResults/Get.json | 3 +- .../examples/ProductDeployment/Lock.json | 11 - .../examples/ProductDeployment/Unlock.json | 14 - .../examples/ProductSecret/Get.Json | 2 +- .../examples/ProductSecret/Import.json | 7 +- .../examples/ProductSecret/Validate.json | 4 +- .../resource-manager/deployment/readme.md | 14 + 25 files changed, 1081 insertions(+), 193 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json delete mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json delete mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json diff --git a/custom-words.txt b/custom-words.txt index 0aa7135edfb9..52c2048130e3 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -16,6 +16,7 @@ accountid accountname ACLs aclspec +actionplans acquisitionid acrapi activityruns @@ -494,6 +495,7 @@ endpointkeys endpointname endswith endtime +endTime Enein engagementfabric endzone @@ -1086,6 +1088,7 @@ PCNET peerings Pendingissuance Pendingrevocation +percentComplete perfcounters perfmon performant @@ -1152,6 +1155,7 @@ projectable Protectable provisioner provisioningservices +provisioningState Psec ptrdname publicipaddresses @@ -1451,6 +1455,7 @@ startswith starttask starttaskfailed starttime +startTime stateful staticsite statusdir diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json new file mode 100644 index 000000000000..d76594a53700 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -0,0 +1,363 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-07-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/fileContainers": { + "get": { + "x-ms-examples": { + "Return file containers list.": { + "$ref": "./examples/FileContainer/List.json" + } + }, + "description": "Returns an array of file containers.", + "tags": [ + "FileContainers" + ], + "operationId": "FileContainers_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FileContainersList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/{fileContainerId}": { + "get": { + "x-ms-examples": { + "Return the file container details.": { + "$ref": "./examples/FileContainer/Get.json" + } + }, + "description": "Retrieves the specific file container details.", + "tags": [ + "FileContainers" + ], + "operationId": "FileContainers_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/FileContainerIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FileContainer" + } + }, + "404": { + "description": "Not Found" + } + } + }, + "put": { + "x-ms-examples": { + "Creates a new file container.": { + "$ref": "./examples/FileContainer/Create.json" + } + }, + "description": "Creates a new file container.", + "tags": [ + "FileContainers" + ], + "operationId": "FileContainers_Create", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/FileContainerParameters" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/FileContainerIdParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/FileContainer" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true, + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ] + }, + "delete": { + "x-ms-examples": { + "Deletes specified file container.": { + "$ref": "examples/FileContainer/Delete.json" + } + }, + "tags": [ + "FileContainers" + ], + "summary": "Deletes specified file container.", + "description": "Delete an existing file container.", + "operationId": "FileContainers_Delete", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/FileContainerIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "404": { + "description": "Not found" + } + } + } + } + }, + "definitions": { + "Resource": { + "description": "Object model of azure resource manager base.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "type": { + "readOnly": true, + "description": "Type of Resource.", + "type": "string" + }, + "location": { + "description": "Location of the resource.", + "type": "string" + } + }, + "x-ms-azure-resource": true + }, + "FileContainer": { + "type": "object", + "description": "File container entity.", + "properties": { + "properties": { + "description": "File Container properties", + "$ref": "#/definitions/FileContainerAdminProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "FileContainerAdminProperties": { + "description": "File Container Properties.", + "type": "object", + "properties": { + "fileContainerId": { + "description": "File container resource identifier containing product manifest.", + "$ref": "#/definitions/FileContainerId" + }, + "sourceUri": { + "description": "The remote file location. This is write-only property, DRP never returns it back to a user.", + "$ref": "#/definitions/SourceUri" + }, + "uri": { + "description": "The file or container Uri. This is read-only property; a user cannot set it.", + "type": "string" + }, + "postCopyAction": { + "description": "Specifies the file post copy action.", + "$ref": "#/definitions/PostCopyAction" + }, + "error": { + "description": "The error response message.", + "$ref": "#/definitions/ErrorInfo" + }, + "provisioningState": { + "description": "Provisioning state of the resource.", + "type": "string" + } + } + }, + "FileContainersList": { + "description": "List of file containers.", + "properties": { + "value": { + "description": "List of file containers.", + "type": "array", + "items": { + "$ref": "#/definitions/FileContainer" + } + }, + "nextLink": { + "description": "Continuation token.", + "type": "string" + } + } + }, + "ErrorInfo": { + "description": "Extended Error Information.", + "type": "object", + "properties": { + "code": { + "description": "The error code.", + "type": "string" + }, + "message": { + "description": "The error message.", + "type": "string" + }, + "details": { + "description": "The detailed error messages.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorInfo" + } + } + } + }, + "PostCopyAction": { + "description": "Specifies the file post copy action.", + "type": "string", + "enum": [ + "None", + "Unzip" + ], + "x-ms-enum": { + "modelAsString": true, + "name": "PostCopyAction" + } + }, + "SourceUri": { + "description": "Specifies The remote file location.", + "type": "string" + }, + "FileContainerId": { + "description": "File container resource identifier containing product manifest.", + "type": "string" + }, + "FileContainerParameters": { + "description": "Parameters for creating a new file container.", + "type": "object", + "properties": { + "postCopyAction": { + "description": "Specifies the file post copy action.", + "$ref": "#/definitions/PostCopyAction" + }, + "sourceUri": { + "description": "Specifies The remote file location.", + "$ref": "#/definitions/SourceUri" + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "required": true, + "type": "string" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2018-07-01" + }, + "FileContainerIdParameter": { + "description": "The file container identifier.", + "name": "fileContainerId", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "FileContainerParameters": { + "description": "The parameters required to create a new file container.", + "name": "fileContainerParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/FileContainerParameters" + }, + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json new file mode 100644 index 000000000000..95298fd6fbbc --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -0,0 +1,320 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-07-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages": { + "get": { + "x-ms-examples": { + "Return product packages list.": { + "$ref": "./examples/ProductPackage/List.json" + } + }, + "description": "Returns an array of product packages.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_List", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProductPackagesList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}": { + "get": { + "x-ms-examples": { + "Return the product package details.": { + "$ref": "./examples/ProductPackage/Get.json" + } + }, + "description": "Retrieves the specific product package details.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_Get", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ProductIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProductPackage" + } + }, + "404": { + "description": "Not Found" + } + } + }, + "put": { + "x-ms-examples": { + "Creates a new product package.": { + "$ref": "./examples/ProductPackage/Create.json" + } + }, + "description": "Creates a new product package.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_Create", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ProductIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ProductPackage" + } + }, + "202": { + "description": "Accepted" + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "x-ms-examples": { + "Removes a product package.": { + "$ref": "./examples/ProductPackage/Delete.json" + } + }, + "description": "Deletes a product package.", + "tags": [ + "ProductPackages" + ], + "operationId": "ProductPackages_Delete", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ProductIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "404": { + "description": "Not found" + } + }, + "x-ms-long-running-operation": true + } + } + }, + "definitions": { + "Resource": { + "description": "Object model of azure resource manager base.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "type": { + "readOnly": true, + "description": "Type of Resource.", + "type": "string" + }, + "location": { + "description": "Location of the resource.", + "type": "string" + } + }, + "x-ms-azure-resource": true + }, + "ProductPackage": { + "description": "Properties for a product package.", + "type": "object", + "properties": { + "properties": { + "description": "Properties of a product package.", + "$ref": "#/definitions/ProductPackageProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ] + }, + "ProductPackagesList": { + "description": "List of product packages.", + "properties": { + "value": { + "description": "List of product packages.", + "type": "array", + "items": { + "$ref": "#/definitions/ProductPackage" + } + }, + "nextLink": { + "description": "Continuation Token.", + "type": "string" + } + } + }, + "ProductPackageProperties": { + "type": "object", + "description": "Properties for Product package.", + "properties": { + "fileContainerId": { + "description": "File container resource identifier containing product manifest.", + "$ref": "#/definitions/FileContainerId" + }, + "isDeployable": { + "description": "Value indicating whether the package is applicable for deployment.", + "type": "boolean" + }, + "isUpdatable": { + "description": "Value indicating whether the package is applicable for update.", + "type": "boolean" + }, + "productDeploymentId": { + "description": "The identifier of product deployment; null if this version is not installed.", + "type": "string" + }, + "provisioningState": { + "description": "Provisioning state of the resource.", + "type": "string" + } + } + }, + "FileContainerId": { + "description": "File container resource identifier containing product manifest.", + "type": "string" + }, + "ProductProperties": { + "description": "Additional properties of the product", + "type": "object", + "properties": { + "version": { + "description": "The version of the product", + "type": "string" + } + } + }, + "ProductLink": { + "description": "Link to a product.", + "type": "object", + "properties": { + "displayName": { + "description": "Displayed name of product.", + "type": "string" + }, + "uri": { + "description": "URI to product.", + "type": "string" + } + } + }, + "ProductLinks": { + "description": "List of product links.", + "type": "array", + "items": { + "$ref": "#/definitions/ProductLink" + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "required": true, + "type": "string" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2018-07-01" + }, + "ProductIdParameter": { + "name": "productId", + "in": "path", + "description": "The product identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json new file mode 100644 index 000000000000..570826b0edce --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json @@ -0,0 +1,27 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "fileContainerId": "Microsoft.NullProvider.1.1", + "fileContainerParameters": { + "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", + "postCopyAction": "Unzip" + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/fileContainers", + "location": "global", + "properties": { + "postCopyAction": "Unzip", + "provisioningState": "Creating" + } + } + }, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json new file mode 100644 index 000000000000..ade8de53434c --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "fileContainerId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": {}, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json new file mode 100644 index 000000000000..c12b99661b22 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "fileContainerId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/fileContainers", + "location": "global", + "properties": { + "postCopyAction": "Unzip", + "uri": "https://deploymentrp.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/msdpfilecontainer-cb72641657134ed79ffeb632a58a671e/", + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json new file mode 100644 index 000000000000..8c80323e8199 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/List.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/fileContainers/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/fileContainers", + "location": "global", + "properties": { + "postCopyAction": "Unzip", + "uri": "https://deploymentrp.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/msdpfilecontainer-cb72641657134ed79ffeb632a58a671e/", + "provisioningState": "Succeeded" + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json new file mode 100644 index 000000000000..b2a9cd4c1179 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json @@ -0,0 +1,29 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "productId": "Microsoft.NullProvider.1.1", + "fileContainerParameter": { + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/productPackages/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/productPackages", + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1", + "isDeployable": true, + "isUpdatable": true, + "provisioningState": "Succeeded" + } + } + }, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json new file mode 100644 index 000000000000..bc55f3cbd5c4 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json @@ -0,0 +1,12 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "productId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": {}, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json new file mode 100644 index 000000000000..b2147dd289b9 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json @@ -0,0 +1,24 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01", + "productId": "Microsoft.NullProvider.1.1" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/productPackages/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/productPackages", + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1", + "isDeployable": true, + "isUpdatable": true, + "provisioningState": "Succeeded" + } + } + }, + "404": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json new file mode 100644 index 000000000000..c8e773cca19d --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/List.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", + "location": "global", + "api-version": "2018-07-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/be8b2e19-7f92-4644-b808-a18283aebb01/providers/Microsoft.Deployment.Admin/locations/global/productPackages/Microsoft.NullProvider.1.1", + "name": "global/Microsoft.NullProvider.1.1", + "type": "Microsoft.Deployment.Admin/locations/productPackages", + "properties": { + "fileContainerId": "Microsoft.NullProvider.1.1", + "isDeployable": true, + "isUpdatable": true, + "provisioningState": "Succeeded" + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json index 38876eaa1624..f6e996f0899f 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -104,7 +104,7 @@ "x-ms-parameter-location": "method" }, "OperationIdParameter": { - "description": "The operation identifier.", + "description": "Identifier of the action plan operation.", "name": "operationId", "in": "path", "required": true, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json new file mode 100644 index 000000000000..a936048e0ded --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -0,0 +1,102 @@ +{ + "swagger": "2.0", + "info": { + "version": "2019-01-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global": { + "get": { + "x-ms-examples": { + "Gets the location": { + "$ref": "./examples/Locations/Get.json" + } + }, + "description": "Gets the location", + "tags": [ + "Locations" + ], + "operationId": "Locations_Get", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/LocationsResourceEntity" + } + } + } + } + } + }, + "definitions": { + "LocationsResourceEntity": { + "description": "Get the location", + "properties": { + "properties": { + "description": "Location Properties", + "$ref": "#/definitions/LocationAdminProperties", + "x-ms-client-flatten": true + } + }, + "allOf": [ + { + "$ref": "Deployment.json#/definitions/Resource" + } + ] + }, + "LocationAdminProperties": { + "description": "Location Admin Properties", + "type": "object", + "properties": { + "subscriptionId": { + "description": "the subscription id", + "title": "subscriptionId", + "type": "string" + }, + "location": { + "description": "the location name", + "title": "location", + "type": "string" + } + } + } + }, + "parameters": {}, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json index e56c74b6dcb6..6eb2450873a7 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -48,9 +48,6 @@ "schema": { "$ref": "#/definitions/OperationResult" } - }, - "404": { - "description": "Not Found" } } } @@ -75,12 +72,12 @@ "description": "status of the Operation result.", "$ref": "#/definitions/Status" }, - "starttime": { + "startTime": { "description": "The deployment start time", "type": "string", "format": "date-time" }, - "endtime": { + "endTime": { "description": "The deployment end time", "type": "string", "format": "date-time" diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 2d066392edfe..c11bcda2d194 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -226,69 +226,6 @@ }, "x-ms-long-running-operation": true } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productDeployments/{productId}/unlock": { - "post": { - "x-ms-examples": { - "Unlocks the product subscription": { - "$ref": "./examples/ProductDeployment/Unlock.json" - } - }, - "description": "Unlocks the product subscription", - "tags": [ - "ProductDeployments" - ], - "operationId": "ProductDeployments_Unlock", - "parameters": [ - { - "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" - }, - { - "$ref": "ProductDeployment.json#/parameters/UnlockActionParameter" - }, - { - "$ref": "Deployment.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } - }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productDeployments/{productId}/lock": { - "post": { - "x-ms-examples": { - "locks the product subscription": { - "$ref": "./examples/ProductDeployment/Lock.json" - } - }, - "description": "locks the product subscription", - "tags": [ - "ProductDeployments" - ], - "operationId": "ProductDeployments_Lock", - "parameters": [ - { - "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" - }, - { - "$ref": "Deployment.json#/parameters/ApiVersionParameter" - } - ], - "responses": { - "200": { - "description": "OK" - } - } - } } }, "definitions": { @@ -492,16 +429,6 @@ "type": "string" } } - }, - "UnlockActionParameters": { - "description": "Parameters for bootstrap action", - "type": "object", - "properties": { - "duration": { - "description": "Duration in TimeSpan format(Define which ISO format)", - "type": "string" - } - } } }, "parameters": { @@ -523,16 +450,6 @@ }, "x-ms-parameter-location": "method" }, - "UnlockActionParameter": { - "description": "Represents bootstrap action parameter", - "name": "unlockActionParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/UnlockActionParameters" - }, - "x-ms-parameter-location": "method" - }, "DeployActionParameter": { "description": "Represents bootstrap action parameter", "name": "deployActionParameter", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index 0541ad79e244..dba8b346cde1 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -59,7 +59,7 @@ "get": { "x-ms-examples": { "Return product secrets list.": { - "$ref": "./examples/ProductSecret/Get.json" + "$ref": "./examples/ProductSecret/Get.Json" } }, "description": "Returns the specific product secret.", @@ -385,54 +385,54 @@ "x-ms-enum": { "modelAsString": true, "name": "SecretRotationStatus" - } - }, - "SecretValue": { - "description": "The secret value in a secure string format.", - "type": "string" - }, - "PfxFileName": { - "description": "The pfx certificate file location.", - "type": "string" - }, - "PfxPassword": { - "description": "The pfx certificate file password as a secure string.", - "type": "string" - }, - "SymmetricKey": { - "description": "The symmetric key as a secure string.", - "type": "string" - }, - "Password": { - "description": "The password as a secure string.", - "type": "string" - }, - "SecretParameters": { - "description": "Parameters required for creating/updating a product secret.", - "type": "object", - "properties": { - "secretValue": { - "description": "The secret value in a secure string format.", - "$ref": "#/definitions/SecretValue" - }, - "pfxFileName": { - "description": "The pfx certificate file location.", - "$ref": "#/definitions/PfxFileName" - }, - "pfxPassword": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/PfxPassword" - }, - "symmetricKey": { - "description": "The symmetric key.", - "$ref": "#/definitions/SymmetricKey" - }, - "password": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/Password" - } + } + }, + "SecretValue": { + "description": "The secret value in a secure string format.", + "type": "string" + }, + "PfxFileName": { + "description": "The pfx certificate file location.", + "type": "string" + }, + "PfxPassword": { + "description": "The pfx certificate file password as a secure string.", + "type": "string" + }, + "SymmetricKey": { + "description": "The symmetric key as a secure string.", + "type": "string" + }, + "Password": { + "description": "The password as a secure string.", + "type": "string" + }, + "SecretParameters": { + "description": "Parameters required for creating/updating a product secret.", + "type": "object", + "properties": { + "secretValue": { + "description": "The secret value in a secure string format.", + "$ref": "#/definitions/SecretValue" + }, + "pfxFileName": { + "description": "The pfx certificate file location.", + "$ref": "#/definitions/PfxFileName" + }, + "pfxPassword": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/PfxPassword" + }, + "symmetricKey": { + "description": "The symmetric key.", + "$ref": "#/definitions/SymmetricKey" + }, + "password": { + "description": "The pfx certificate file password.", + "$ref": "#/definitions/Password" } } + } }, "parameters": { "SecretNameParameter": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json index 6c54721d2f68..0aac2fceef65 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperationAttempt/Get.json @@ -1,24 +1,23 @@ { - "parameters": { - "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", - "location": "global", - "api-version": "2019-01-01", - "planId": "0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced", - "operationId": "UpgradeSFRuntimeInEventHubDataClusters" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/global/actionplans/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/operations/UpgradeSFRuntimeInEventHubDataClusters/attempts/1", - "name": "global/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/UpgradeSFRuntimeInEventHubDataClusters/1", - "type": "Microsoft.Deployment.Admin/locations/actionplans/operations/attempts", - "properties": { - "startTime": "2020-04-23T02:59:50.5512046Z", - "endTime": "2020-04-23T03:02:48.2542795Z", - "provisioningState": "Succeeded" - } - } - }, - "404": {} + "parameters": { + "subscriptionId": "966178ff-f8a1-4d43-be09-2cc47f0d3560", + "location": "global", + "api-version": "2019-01-01", + "planId": "0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced", + "operationId": "UpgradeSFRuntimeInEventHubDataClusters" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/966178ff-f8a1-4d43-be09-2cc47f0d3560/providers/Microsoft.Deployment.Admin/locations/global/actionplans/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/operations/UpgradeSFRuntimeInEventHubDataClusters/attempts/1", + "name": "global/0b5ddf5b-cb5a-4dcc-8c2c-d55f1c70eced/UpgradeSFRuntimeInEventHubDataClusters/1", + "type": "Microsoft.Deployment.Admin/locations/actionplans/operations/attempts", + "properties": { + "startTime": "2020-04-23T02:59:50.5512046Z", + "endTime": "2020-04-23T03:02:48.2542795Z", + "provisioningState": "Succeeded" + } + } } -} \ No newline at end of file + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json new file mode 100644 index 000000000000..461dea961619 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "location": "global", + "api-version": "2019-01-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/b42940a9-c92c-44c8-b745-7558ad4b08d9/providers/Microsoft.Deployment.Admin/locations/global", + "name": "global", + "type": "Microsoft.Deployment.Admin/locations", + "properties": { + "subscriptionId": "b42940a9-c92c-44c8-b745-7558ad4b08d9", + "location": "global" + } + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json index a448bffdbd44..dfc9780b5021 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/OperationResults/Get.json @@ -15,7 +15,6 @@ "endTime": "0001-01-01T00:00:00Z", "percentComplete": 0.0 } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json deleted file mode 100644 index 2f0b39fa1bb4..000000000000 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parameters": { - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "location": "global", - "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview" - }, - "responses": { - "200": {} - } -} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json deleted file mode 100644 index 648670de33b3..000000000000 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Unlock.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", - "location": "global", - "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview", - "unlockActionParameter": { - "duration": "P5D" - } - }, - "responses": { - "200": {} - } -} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index 9d25ff82023c..c4416debdd46 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -28,6 +28,6 @@ } } }, - "404": {} + "404":{} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index 8cc9e7399a8f..9293a3756871 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -6,9 +6,7 @@ "productId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "properties": { - "secretValue": "sslCert" - } + "secretValue": "sslCert" }, "newOffer": { "properties": { @@ -18,6 +16,7 @@ } }, "responses": { - "200": {} + "200": {}, + "404": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json index 09fc63e01e89..ceb402794239 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json @@ -6,9 +6,7 @@ "productId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "properties": { - "secretValue": "sslCert" - } + "secretValue": "sslCert" }, "secretValue": "sslCert", "newOffer": { diff --git a/specification/azsadmin/resource-manager/deployment/readme.md b/specification/azsadmin/resource-manager/deployment/readme.md index 3976fe43cc0f..5dff5c3a4ce0 100644 --- a/specification/azsadmin/resource-manager/deployment/readme.md +++ b/specification/azsadmin/resource-manager/deployment/readme.md @@ -41,7 +41,15 @@ input-file: - Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json ``` +### Tag: package-2018-07-01 +These settings apply only when `--tag=package-2018-07-01` is specified on the command line. + +``` yaml $(tag) == 'package-2018-07-01' +input-file: + - Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json + - Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +``` --- # Code Generation @@ -72,10 +80,16 @@ input-file: - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json + - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json + ``` If there are files that should not be in the `all-api-versions` set, From 4cb01d565681ecb3ca805ce276d7d0363b60b223 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Mon, 18 May 2020 20:15:38 -0700 Subject: [PATCH 43/44] updated the location parameter to global added 404 and default responses added locations endpoint - list operation removed 404 response for the 'ProductDeployment-remove operation' Adding 'productDeployments/executeRunner/action'' removed 404 responses added default error responses and deleted 404 responses for file containers removed older version in the read.md 'input-file' section changed details info in the "ExtendedErrorInfo" changed ExtendedErrorInfo object updating error definition changing error definition in 2018-07-01 version updated location responses changed the entity name Revert "changed the entity name" This reverts commit 2c7e079dadbf5298640af902cec7f42f8ff442d9. Revert "updated location responses" This reverts commit 78bca1da75dad66409bfa6a950ca58ba02580b88. updated locations Get response change for New-AzFileContainer command added Parameter for the New-AzsProductPackage changed productId to packageId updated operationId for Bootstrap changed operationId for deploy action changed paramters to object changed the operation Ids changed operationIds for the right command names execute runner changes fixed path parameter for secrets and remove command name changed the secret name changed secret parameters added changes to resolve conflicts changed version number changed the version number changed the tag name to fix conflicts --- .../preview/2018-07-01/Deployment.json | 236 ++++++++++++++++++ .../preview/2018-07-01/FileContainer.json | 83 +++--- .../preview/2018-07-01/ProductPackage.json | 158 +++++++----- .../examples/FileContainer/Create.json | 6 +- .../examples/FileContainer/Delete.json | 3 +- .../examples/FileContainer/Get.json | 3 +- .../2018-07-01/examples/Operations/List.json | 159 ++++++++++++ .../examples/ProductPackage/Create.json | 4 +- .../examples/ProductPackage/Delete.json | 5 +- .../examples/ProductPackage/Get.json | 5 +- .../preview/2019-01-01/ActionPlan.json | 13 +- .../2019-01-01/ActionPlanOperation.json | 13 +- .../ActionPlanOperationAttempt.json | 6 + .../preview/2019-01-01/Deployment.json | 38 ++- .../preview/2019-01-01/FileContainer.json | 24 +- .../preview/2019-01-01/Locations.json | 73 +++++- .../preview/2019-01-01/OperationResults.json | 6 + .../preview/2019-01-01/ProductDeployment.json | 110 +++++++- .../preview/2019-01-01/ProductPackage.json | 70 +++++- .../preview/2019-01-01/ProductSecret.json | 135 ++++------ .../2019-01-01/examples/ActionPlan/Get.json | 3 +- .../2019-01-01/examples/ActionPlan/List.json | 3 +- .../examples/ActionPlanOperations/Get.json | 3 +- .../examples/FileContainer/Delete.json | 3 +- .../examples/FileContainer/Get.json | 3 +- .../2019-01-01/examples/Locations/Get.json | 1 - .../2019-01-01/examples/Locations/List.json | 22 ++ .../examples/ProductDeployment/Deploy.json | 3 +- .../ProductDeployment/ExecuteRunner.json | 15 ++ .../examples/ProductDeployment/Get.json | 3 +- .../examples/ProductPackage/Create.json | 4 +- .../examples/ProductPackage/Delete.json | 5 +- .../examples/ProductPackage/Get.json | 5 +- .../examples/ProductSecret/Get.Json | 5 +- .../examples/ProductSecret/Import.json | 7 +- .../examples/ProductSecret/List.json | 4 +- .../examples/ProductSecret/Validate.json | 7 +- .../resource-manager/deployment/readme.md | 2 - 38 files changed, 953 insertions(+), 295 deletions(-) create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json create mode 100644 specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json new file mode 100644 index 000000000000..4d71f0cb71c7 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/Deployment.json @@ -0,0 +1,236 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-07-01", + "title": "DeploymentAdminClient", + "description": "Deployment Admin Client." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ], + "paths": { + "/providers/Microsoft.Deployment.Admin/operations": { + "get": { + "x-ms-examples": { + "Returns the list of supported REST operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Returns the list of supported REST operations.", + "tags": [ + "Deployment" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/OperationList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "Resource": { + "description": "Object model of azure resource manager base.", + "type": "object", + "properties": { + "id": { + "readOnly": true, + "description": "ID of the resource.", + "type": "string" + }, + "name": { + "readOnly": true, + "description": "Name of the resource.", + "type": "string" + }, + "type": { + "readOnly": true, + "description": "Type of Resource.", + "type": "string" + }, + "location": { + "description": "Location of the resource.", + "type": "string" + } + }, + "x-ms-azure-resource": true + }, + "ExtendedErrorInfo": { + "type": "object", + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "type": "object", + "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 + } + } + }, + "JTokenString": { + "description": "Error information", + "type": "object", + "properties": { + "value": { + "description": "Parameters as JToken string", + "type": "string" + } + } + }, + "Operation": { + "description": "Describes the supported REST operation.", + "properties": { + "name": { + "description": "The name of the operation being performed on this particular object. This name should match the name that appears in RBAC or the event service.", + "type": "string" + }, + "display": { + "description": "Contains the localized display information for this particular operation or action.", + "$ref": "#/definitions/Display" + }, + "origin": { + "description": "Origin for the operation. Eg. User, System", + "type": "string" + } + } + }, + "Display": { + "description": "Contains the localized display information for this particular operation or action.", + "properties": { + "provider": { + "description": "The localized, friendly version of the resource provider name. The provider name is expected to include the name of the publisher or company responsible. The provider name format should use title case and begin with \"Microsoft\" for first-party services. For example, the provider name may be\"Microsoft Monitoring Insights\" or \"Microsoft Compute.\"", + "type": "string" + }, + "resource": { + "description": "The localized, friendly version of the resource type related to this action or operation; the resource type should match the public documentation for the resource provider.", + "type": "string" + }, + "operation": { + "description": "The localized, friendly name for the operation. Use the name as it will displayed to the user.", + "type": "string" + }, + "description": { + "description": "The localized, friendly description for the operation. The description will be displayed to the user. It should be thorough and concise for used in both tooltips and detailed views.", + "type": "string" + } + } + }, + "OperationList": { + "description": "List of Operations", + "properties": { + "value": { + "description": "Array of operations", + "type": "array", + "items": { + "$ref": "#/definitions/Operation" + } + }, + "nextLink": { + "description": "URI to the next page of operations.", + "type": "string" + } + } + } + }, + "parameters": { + "SubscriptionIdParameter": { + "name": "subscriptionId", + "in": "path", + "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", + "required": true, + "type": "string" + }, + "ApiVersionParameter": { + "name": "api-version", + "in": "query", + "description": "Client API Version.", + "required": true, + "type": "string", + "default": "2018-07-01" + }, + "LocationParameter": { + "description": "Location of the resource.", + "name": "location", + "in": "path", + "required": true, + "type": "string", + "x-ms-parameter-location": "method", + "default": "2018-07-01" + }, + "ProductIdParameter": { + "name": "productId", + "in": "path", + "description": "The product identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "PackageIdParameter": { + "name": "packageId", + "in": "path", + "description": "The package identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "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/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json index d76594a53700..0fa18ee52515 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -30,10 +30,10 @@ "operationId": "FileContainers_List", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -63,13 +63,13 @@ "operationId": "FileContainers_Get", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/FileContainerIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -79,8 +79,11 @@ "$ref": "#/definitions/FileContainer" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } }, @@ -97,13 +100,13 @@ "operationId": "FileContainers_Create", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/FileContainerParameters" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { "$ref": "#/parameters/FileContainerIdParameter" @@ -142,53 +145,30 @@ "operationId": "FileContainers_Delete", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { "$ref": "#/parameters/FileContainerIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } } }, "definitions": { - "Resource": { - "description": "Object model of azure resource manager base.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "description": "ID of the resource.", - "type": "string" - }, - "name": { - "readOnly": true, - "description": "Name of the resource.", - "type": "string" - }, - "type": { - "readOnly": true, - "description": "Type of Resource.", - "type": "string" - }, - "location": { - "description": "Location of the resource.", - "type": "string" - } - }, - "x-ms-azure-resource": true - }, "FileContainer": { "type": "object", "description": "File container entity.", @@ -201,7 +181,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "Deployment.json#/definitions/Resource" } ] }, @@ -295,6 +275,16 @@ "FileContainerParameters": { "description": "Parameters for creating a new file container.", "type": "object", + "properties": { + "properties": { + "description": "Specifies the file container body", + "$ref": "#/definitions/FileContainerBody" + } + } + }, + "FileContainerBody": { + "description": "Body for creating a new file container.", + "type": "object", "properties": { "postCopyAction": { "description": "Specifies the file post copy action.", @@ -308,21 +298,6 @@ } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", - "required": true, - "type": "string" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "description": "Client API Version.", - "required": true, - "type": "string", - "default": "2018-07-01" - }, "FileContainerIdParameter": { "description": "The file container identifier.", "name": "fileContainerId", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index 95298fd6fbbc..b17e778c26b0 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -16,6 +16,36 @@ "application/json" ], "paths": { + "/providers/Microsoft.Deployment.Admin/operations": { + "get": { + "x-ms-examples": { + "Returns the list of supported REST operations.": { + "$ref": "./examples/Operations/List.json" + } + }, + "description": "Returns the list of supported REST operations.", + "tags": [ + "Operations" + ], + "operationId": "Operations_List", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "Deployment.json#/definitions/OperationList" + } + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages": { "get": { "x-ms-examples": { @@ -30,10 +60,10 @@ "operationId": "ProductPackages_List", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -42,6 +72,12 @@ "schema": { "$ref": "#/definitions/ProductPackagesList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -49,7 +85,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}": { "get": { "x-ms-examples": { "Return the product package details.": { @@ -63,13 +99,13 @@ "operationId": "ProductPackages_Get", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -79,8 +115,11 @@ "$ref": "#/definitions/ProductPackage" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } }, @@ -97,13 +136,16 @@ "operationId": "ProductPackages_Create", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { - "$ref": "#/parameters/ProductIdParameter" + "$ref": "#/parameters/ProductPackageParameters" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { @@ -115,6 +157,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -132,21 +180,24 @@ "operationId": "ProductPackages_Delete", "parameters": [ { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" + "$ref": "Deployment.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -154,32 +205,6 @@ } }, "definitions": { - "Resource": { - "description": "Object model of azure resource manager base.", - "type": "object", - "properties": { - "id": { - "readOnly": true, - "description": "ID of the resource.", - "type": "string" - }, - "name": { - "readOnly": true, - "description": "Name of the resource.", - "type": "string" - }, - "type": { - "readOnly": true, - "description": "Type of Resource.", - "type": "string" - }, - "location": { - "description": "Location of the resource.", - "type": "string" - } - }, - "x-ms-azure-resource": true - }, "ProductPackage": { "description": "Properties for a product package.", "type": "object", @@ -192,7 +217,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "Deployment.json#/definitions/Resource" } ] }, @@ -272,30 +297,37 @@ "items": { "$ref": "#/definitions/ProductLink" } + }, + "ProductPackageParameters": { + "description": "Parameters for creating a new product package.", + "type": "object", + "properties": { + "properties": { + "description": "Specifies the product package", + "$ref": "#/definitions/ProductPackageBody" + } + } + }, + "ProductPackageBody": { + "description": "Body for creating a new product package.", + "type": "object", + "properties": { + "fileContainerId": { + "description": "Specifies the file container.", + "$ref": "#/definitions/FileContainerId" + } + } } }, "parameters": { - "SubscriptionIdParameter": { - "name": "subscriptionId", - "in": "path", - "description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.", - "required": true, - "type": "string" - }, - "ApiVersionParameter": { - "name": "api-version", - "in": "query", - "description": "Client API Version.", - "required": true, - "type": "string", - "default": "2018-07-01" - }, - "ProductIdParameter": { - "name": "productId", - "in": "path", - "description": "The product identifier.", + "ProductPackageParameters": { + "description": "The parameters required to create a new product package.", + "name": "ProductPackageParameters", + "in": "body", "required": true, - "type": "string", + "schema": { + "$ref": "#/definitions/ProductPackageParameters" + }, "x-ms-parameter-location": "method" } }, diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json index 570826b0edce..43bbdc5c5942 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Create.json @@ -5,8 +5,10 @@ "api-version": "2018-07-01", "fileContainerId": "Microsoft.NullProvider.1.1", "fileContainerParameters": { - "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", - "postCopyAction": "Unzip" + "properties": { + "sourceUri": "https://deploymentproviderbvts.blob.redmond.ext-n22r1708.masd.stbtest.microsoft.com/temp/Microsoft.NullProvider.1.1.zip", + "postCopyAction": "Unzip" + } } }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json index ade8de53434c..ce950454bbe8 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json @@ -6,7 +6,6 @@ "fileContainerId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json index c12b99661b22..b10ce0aa7c22 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json new file mode 100644 index 000000000000..0f8927a3d630 --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/Operations/List.json @@ -0,0 +1,159 @@ +{ + "parameters": { + "api-version": "2018-07-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "name": "Microsoft.Deployment.Admin/locations/fileContainers/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "File Container", + "operation": "List/Get File Container(s)", + "description": "Returns the list of file containers or gets properties for the specified file container." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/fileContainers/write", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "File Container", + "operation": "Create/Update File Container", + "description": "Creates or updates a file container." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/fileContainers/delete", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "File Container", + "operation": "Delete File Container", + "description": "Deletes an existing file container." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/operationresults/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Operation Result", + "operation": "Poll Asynchronous Operation", + "description": "Polls the status of an asynchronous operation." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Deployment.Admin/Operations/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Operation", + "operation": "List Supported Operations", + "description": "Returns the list of supported operations." + }, + "origin": "user,system" + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "List/Get Product Deployment(s)", + "description": "Returns the list of product deployments or gets properties for the specified product deployment." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/bootstrap/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Execute Bootstrap Deployment Phase", + "description": "Executes 'bootstrap' deployment phase." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/deploy/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Execute Provision Deployment Phase", + "description": "Executes 'provision' deployment phase." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/remove/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Remove Installed Product", + "description": "Removes installed product." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/setexternalaccess/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Deployment", + "operation": "Set External Access", + "description": "Enables or disables operator's access to product subscription." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/secrets/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Secret", + "operation": "List/Get Secret(s)", + "description": "Returns the list of secrets or gets properties for the specified secret." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/secrets/import/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Secret", + "operation": "Import Secret Value", + "description": "Imports a new secret value." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productDeployments/secrets/validateImport/action", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Secret", + "operation": "Validate Import", + "description": "Validates input for the import action." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productPackages/read", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Package", + "operation": "List/Get Product Package(s)", + "description": "Returns the list of product packages or gets properties for the specified product package." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productPackages/write", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Package", + "operation": "Create/Update Product Package", + "description": "Creates or updates a product package." + } + }, + { + "name": "Microsoft.Deployment.Admin/locations/productPackages/delete", + "display": { + "provider": "Microsoft Deployment Provider", + "resource": "Product Package", + "operation": "Delete Product Package", + "description": "Deletes an existing product package." + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json index b2a9cd4c1179..0a762d6b6146 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Create.json @@ -3,8 +3,8 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2018-07-01", - "productId": "Microsoft.NullProvider.1.1", - "fileContainerParameter": { + "packageId": "Microsoft.NullProvider.1.1", + "ProductPackageParameters": { "properties": { "fileContainerId": "Microsoft.NullProvider.1.1" } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json index bc55f3cbd5c4..d19e65465a6c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json @@ -3,10 +3,9 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2018-07-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json index b2147dd289b9..7055b9e4b4a2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Get.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2018-07-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { "200": { @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json index f374728e2b99..fb687b4690f2 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlan.json @@ -42,6 +42,12 @@ "schema": { "$ref": "#/definitions/ActionPlanList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -79,8 +85,11 @@ "$ref": "#/definitions/ActionPlanResourceEntity" } }, - "404": { - "description": "NOT FOUND" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json index 574331ae41c9..f88251943ac5 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperation.json @@ -45,6 +45,12 @@ "schema": { "$ref": "#/definitions/ActionPlanOperationsList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -85,8 +91,11 @@ "$ref": "#/definitions/ActionPlanOperationResourceEntity" } }, - "404": { - "description": "NOT FOUND" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json index f6e996f0899f..3e588278ebbc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ActionPlanOperationAttempt.json @@ -51,6 +51,12 @@ "schema": { "$ref": "#/definitions/OperationAttemptResult" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json index 9dc085092803..3f662c28d526 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Deployment.json @@ -75,20 +75,36 @@ "x-ms-azure-resource": true }, "ExtendedErrorInfo": { - "description": "Error information", "type": "object", + "description": "Error response.", + "properties": { + "error": { + "$ref": "#/definitions/ErrorDefinition", + "description": "The error details." + } + } + }, + "ErrorDefinition": { + "type": "object", + "description": "Error definition.", "properties": { "code": { - "description": "Error Code", - "type": "string" + "description": "Service specific error code which serves as the substatus for the HTTP error code.", + "type": "string", + "readOnly": true }, "message": { - "description": "Error Message", - "type": "string" + "description": "Description of the error.", + "type": "string", + "readOnly": true }, "details": { - "description": "Error message details", - "$ref": "#/definitions/ExtendedErrorInfo" + "description": "Internal error details.", + "type": "array", + "items": { + "$ref": "#/definitions/ErrorDefinition" + }, + "readOnly": true } } }, @@ -189,6 +205,14 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "PackageIdParameter": { + "name": "packageId", + "in": "path", + "description": "The package identifier.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" } }, "securityDefinitions": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json index a8885fc7244d..5a5ea37e25c4 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json @@ -79,8 +79,11 @@ "$ref": "#/definitions/FileContainer" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } }, @@ -155,8 +158,11 @@ "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } @@ -269,6 +275,16 @@ "FileContainerParameters": { "description": "Parameters for creating a new file container.", "type": "object", + "properties": { + "properties": { + "description": "Specifies the file container body", + "$ref": "#/definitions/FileContainerBody" + } + } + }, + "FileContainerBody": { + "description": "Body for creating a new file container.", + "type": "object", "properties": { "postCopyAction": { "description": "Specifies the file post copy action.", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json index a936048e0ded..039a230e26ef 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/Locations.json @@ -42,19 +42,85 @@ "schema": { "$ref": "#/definitions/LocationsResourceEntity" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations": { + "get": { + "x-ms-examples": { + "Gets the list of locations": { + "$ref": "./examples/Locations/List.json" + } + }, + "description": "Gets the list of locations", + "tags": [ + "Locations" + ], + "operationId": "Locations_List", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/LocationList" + } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" } } } }, "definitions": { + "LocationList": { + "description": "List of locations", + "properties": { + "value": { + "description": "Array of locations.", + "type": "array", + "items": { + "$ref": "#/definitions/LocationsResourceEntity" + } + }, + "nextLink": { + "type": "string", + "description": "Continuation token" + } + } + }, "LocationsResourceEntity": { - "description": "Get the location", + "type": "object", + "description": "Location Resource Entity", "properties": { "properties": { "description": "Location Properties", "$ref": "#/definitions/LocationAdminProperties", "x-ms-client-flatten": true + }, + "eTag": { + "description": "Entity tag of the resource", + "type": "string" } }, "allOf": [ @@ -67,11 +133,6 @@ "description": "Location Admin Properties", "type": "object", "properties": { - "subscriptionId": { - "description": "the subscription id", - "title": "subscriptionId", - "type": "string" - }, "location": { "description": "the location name", "title": "location", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json index 6eb2450873a7..1e8f1dffb547 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json @@ -48,6 +48,12 @@ "schema": { "$ref": "#/definitions/OperationResult" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index c11bcda2d194..89d89df51336 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -42,6 +42,12 @@ "schema": { "$ref": "#/definitions/ProductDeploymentsList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -79,8 +85,11 @@ "$ref": "#/definitions/ProductDeploymentResourceEntity" } }, - "404": { - "description": "NOT FOUND" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } } @@ -96,7 +105,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_BootStrap", + "operationId": "BootstrapAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -117,6 +126,12 @@ }, "202": { "description": "ACCEPTED" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -133,7 +148,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_Deploy", + "operationId": "DeployAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -154,6 +169,12 @@ }, "202": { "description": "ACCEPTED" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -170,7 +191,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_Remove", + "operationId": "RemoveAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -188,6 +209,12 @@ }, "202": { "description": "ACCEPTED" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -204,7 +231,7 @@ "tags": [ "ProductDeployments" ], - "operationId": "ProductDeployments_RotateSecrets", + "operationId": "RotateSecretsAction_Product", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" @@ -222,6 +249,55 @@ }, "202": { "description": "ACCEPTED" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } + } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productDeployments/{productId}/executeRunner": { + "post": { + "x-ms-examples": { + "Invokes rotate secrets action on the product deployment": { + "$ref": "./examples/ProductDeployment/ExecuteRunner.json" + } + }, + "description": "Invokes execute runner action on the product deployment", + "tags": [ + "ProductDeployments" + ], + "operationId": "ExecuteRunnerAction_Product", + "parameters": [ + { + "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ProductIdParameter" + }, + { + "$ref": "Deployment.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "#/parameters/ExecuteRunnerActionParameter" + } + ], + "responses": { + "200": { + "description": "OK" + }, + "202": { + "description": "ACCEPTED" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -416,7 +492,7 @@ }, "parameters": { "description": "Deployment parameters, value in JToken", - "type": "string" + "type": "object" } } }, @@ -429,6 +505,16 @@ "type": "string" } } + }, + "ExecuteRunnerActionParameters": { + "description": "Parameters for execute runner action", + "type": "object", + "properties": { + "parameters": { + "description": "Execute Runner parameters, value in JToken", + "type": "object" + } + } } }, "parameters": { @@ -459,6 +545,16 @@ "$ref": "#/definitions/DeployActionParameters" }, "x-ms-parameter-location": "method" + }, + "ExecuteRunnerActionParameter": { + "description": "Represents execute runner action parameter", + "name": "executeRunnerActionParameter", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ExecuteRunnerActionParameters" + }, + "x-ms-parameter-location": "method" } }, "securityDefinitions": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json index 150376191118..9a17438d2b4e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json @@ -42,6 +42,12 @@ "schema": { "$ref": "#/definitions/ProductPackagesList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-pageable": { @@ -49,7 +55,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{productId}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}": { "get": { "x-ms-examples": { "Return the product package details.": { @@ -66,7 +72,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" @@ -79,8 +85,11 @@ "$ref": "#/definitions/ProductPackage" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } } }, @@ -100,7 +109,10 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" + }, + { + "$ref": "#/parameters/ProductPackageParameters" }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" @@ -115,6 +127,12 @@ }, "202": { "description": "Accepted" + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -135,7 +153,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" @@ -145,8 +163,11 @@ "200": { "description": "OK" }, - "404": { - "description": "Not found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true @@ -246,9 +267,40 @@ "items": { "$ref": "#/definitions/ProductLink" } + }, + "ProductPackageParameters": { + "description": "Parameters for creating a new product package.", + "type": "object", + "properties": { + "properties": { + "description": "Specifies the product package", + "$ref": "#/definitions/ProductPackageBody" + } + } + }, + "ProductPackageBody": { + "description": "Body for creating a new product package.", + "type": "object", + "properties": { + "fileContainerId": { + "description": "Specifies the file container.", + "$ref": "#/definitions/FileContainerId" + } + } + } + }, + "parameters": { + "ProductPackageParameters": { + "description": "The parameters required to create a new product package.", + "name": "ProductPackageParameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ProductPackageParameters" + }, + "x-ms-parameter-location": "method" } }, - "parameters": {}, "securityDefinitions": { "azure_auth": { "type": "oauth2", diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json index dba8b346cde1..948a731ec7fc 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json @@ -10,7 +10,7 @@ "https" ], "paths": { - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -26,14 +26,11 @@ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, - { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, { "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" } ], "responses": { @@ -42,6 +39,12 @@ "schema": { "$ref": "#/definitions/ProductSecretsList" } + }, + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "produces": [ @@ -55,7 +58,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets/{secretName}": { "get": { "x-ms-examples": { "Return product secrets list.": { @@ -75,10 +78,7 @@ "$ref": "Deployment.json#/parameters/ApiVersionParameter" }, { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -91,8 +91,11 @@ "$ref": "#/definitions/ProductSecret" } }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "produces": [ @@ -103,7 +106,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/import": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets/{secretName}/import": { "post": { "x-ms-examples": { "Imports a product secret.": { @@ -114,16 +117,13 @@ "tags": [ "ProductSecrets" ], - "operationId": "ProductSecrets_Import", + "operationId": "ProductSecrets_Set", "parameters": [ { "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -139,8 +139,11 @@ "200": { "description": "Accepted" }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true, @@ -152,7 +155,7 @@ ] } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/{location}/productPackages/{productId}/secrets/{secretName}/validate": { + "/subscriptions/{subscriptionId}/providers/Microsoft.Deployment.Admin/locations/global/productPackages/{packageId}/secrets/{secretName}/validate": { "post": { "x-ms-examples": { "Validates a product secret.": { @@ -169,10 +172,7 @@ "$ref": "Deployment.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "Deployment.json#/parameters/LocationParameter" - }, - { - "$ref": "Deployment.json#/parameters/ProductIdParameter" + "$ref": "Deployment.json#/parameters/PackageIdParameter" }, { "$ref": "#/parameters/SecretNameParameter" @@ -188,8 +188,11 @@ "200": { "description": "Accepted" }, - "404": { - "description": "Not Found" + "default": { + "description": "Default Response.", + "schema": { + "$ref": "Deployment.json#/definitions/ExtendedErrorInfo" + } } }, "x-ms-long-running-operation": true, @@ -387,23 +390,19 @@ "name": "SecretRotationStatus" } }, - "SecretValue": { + "value": { "description": "The secret value in a secure string format.", "type": "string" }, - "PfxFileName": { - "description": "The pfx certificate file location.", - "type": "string" - }, - "PfxPassword": { - "description": "The pfx certificate file password as a secure string.", + "data": { + "description": "The converted Base64 String from a certificate pfx file.", "type": "string" }, - "SymmetricKey": { + "key": { "description": "The symmetric key as a secure string.", "type": "string" }, - "Password": { + "password": { "description": "The password as a secure string.", "type": "string" }, @@ -411,25 +410,21 @@ "description": "Parameters required for creating/updating a product secret.", "type": "object", "properties": { - "secretValue": { + "value": { "description": "The secret value in a secure string format.", - "$ref": "#/definitions/SecretValue" + "$ref": "#/definitions/value" }, - "pfxFileName": { - "description": "The pfx certificate file location.", - "$ref": "#/definitions/PfxFileName" + "data": { + "description": "The pfx certificate converted Base64 data.", + "$ref": "#/definitions/data" }, - "pfxPassword": { + "password": { "description": "The pfx certificate file password.", - "$ref": "#/definitions/PfxPassword" + "$ref": "#/definitions/password" }, - "symmetricKey": { + "key": { "description": "The symmetric key.", - "$ref": "#/definitions/SymmetricKey" - }, - "password": { - "description": "The pfx certificate file password.", - "$ref": "#/definitions/Password" + "$ref": "#/definitions/key" } } } @@ -459,47 +454,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/SecretValue" - }, - "x-ms-parameter-location": "method" - }, - "PfxFileNameParameter": { - "description": "The pfx certificate file location.", - "name": "pfxFileName", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/PfxFileName" - }, - "x-ms-parameter-location": "method" - }, - "PfxPasswordParameter": { - "description": "The pfx certificate file password.", - "name": "pfxPasswordParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/PfxPassword" - }, - "x-ms-parameter-location": "method" - }, - "SymmetricKeyParameter": { - "description": "The symmetric key.", - "name": "SymmetricKeyParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/SymmetricKey" - }, - "x-ms-parameter-location": "method" - }, - "PasswordParameter": { - "description": "The password.", - "name": "PasswordParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Password" + "$ref": "#/definitions/value" }, "x-ms-parameter-location": "method" } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json index bd293cc207e7..9eb46e88e746 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/Get.json @@ -22,7 +22,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json index 9dcd1b396f30..7762b7c897ac 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlan/List.json @@ -25,8 +25,7 @@ } } ] - }, - "404": {} + } } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json index 916645557aa5..b2f8a694300c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ActionPlanOperations/Get.json @@ -78,7 +78,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json index 7ee403600e6d..e9bafdcf68fb 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json @@ -6,7 +6,6 @@ "fileContainerId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json index 1825d47eb2a0..937784a74cbb 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Get.json @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json index 461dea961619..b097755df967 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/Get.json @@ -11,7 +11,6 @@ "name": "global", "type": "Microsoft.Deployment.Admin/locations", "properties": { - "subscriptionId": "b42940a9-c92c-44c8-b745-7558ad4b08d9", "location": "global" } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json new file mode 100644 index 000000000000..1c67797c584c --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/Locations/List.json @@ -0,0 +1,22 @@ +{ + "parameters": { + "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", + "api-version": "2019-01-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/20ff7fc3-e762-44dd-bd96-b71116dcdc23/providers/Microsoft.Deployment.Admin/locations/1", + "name": "1", + "type": "Microsoft.Deployment.Admin/locations/1", + "properties": { + "location": "global" + } + } + ] + } + } + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json index 47466509160e..2ce6071df747 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Deploy.json @@ -5,7 +5,8 @@ "api-version": "2019-01-01", "productId": "Microsoft.IotHubPreview", "deployActionParameter": { - "version": "1.0.2" + "version": "1.0.2", + "parameters": {} } }, "responses": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json new file mode 100644 index 000000000000..e2594cdc0f4a --- /dev/null +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/ExecuteRunner.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "7715e512-3adf-48e8-baeb-6d3fcc3de665", + "location": "global", + "api-version": "2019-01-01", + "productId": "Microsoft.NullProvider", + "executeRunnerActionParameter": { + "parameters": {} + } + }, + "responses": { + "200": {}, + "202": {} + } +} diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json index 260d2b3f837e..c338e71fa21d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Get.json @@ -17,7 +17,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json index b3439f9c6e71..bf9573250475 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Create.json @@ -3,8 +3,8 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider.1.1", - "fileContainerParameter": { + "packageId": "Microsoft.NullProvider.1.1", + "ProductPackageParameters": { "properties": { "fileContainerId": "Microsoft.NullProvider.1.1" } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json index 106199cd1975..0e1cfe43407e 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json @@ -3,10 +3,9 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json index 593f444612a6..bc5abce11e66 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Get.json @@ -3,7 +3,7 @@ "subscriptionId": "be8b2e19-7f92-4644-b808-a18283aebb01", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.NullProvider.1.1" + "packageId": "Microsoft.NullProvider.1.1" }, "responses": { "200": { @@ -18,7 +18,6 @@ "provisioningState": "Succeeded" } } - }, - "404": {} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json index c4416debdd46..16b0913aeec5 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Get.Json @@ -3,7 +3,7 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "sslCert" }, "responses": { @@ -27,7 +27,6 @@ "provisioningState": "Succeeded" } } - }, - "404":{} + } } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json index 9293a3756871..faf14789152a 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Import.json @@ -3,10 +3,10 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "secretValue": "sslCert" + "value": "sslCert" }, "newOffer": { "properties": { @@ -16,7 +16,6 @@ } }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json index cc35a2b5b53a..8ef03a210b70 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/List.json @@ -3,8 +3,8 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", - "secretValue": "sslCert" + "packageId": "Microsoft.IotHubPreview.1.0.2", + "value": "sslCert" }, "responses": { "200": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json index ceb402794239..5c6252cd8143 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductSecret/Validate.json @@ -3,10 +3,10 @@ "subscriptionId": "20ff7fc3-e762-44dd-bd96-b71116dcdc23", "location": "global", "api-version": "2019-01-01", - "productId": "Microsoft.IotHubPreview.1.0.2", + "packageId": "Microsoft.IotHubPreview.1.0.2", "secretName": "secretName", "secretParameters": { - "secretValue": "sslCert" + "value": "sslCert" }, "secretValue": "sslCert", "newOffer": { @@ -17,7 +17,6 @@ } }, "responses": { - "200": {}, - "404": {} + "200": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/readme.md b/specification/azsadmin/resource-manager/deployment/readme.md index 5dff5c3a4ce0..1f31ebeadde9 100644 --- a/specification/azsadmin/resource-manager/deployment/readme.md +++ b/specification/azsadmin/resource-manager/deployment/readme.md @@ -87,8 +87,6 @@ input-file: - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/ProductSecret.json - $(this-folder)/Microsoft.Deployment.Admin/preview/2019-01-01/OperationResults.json - - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json - - $(this-folder)/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json ``` From 90f8c46ae45e1aafc40c5bccb706f2da23ea6143 Mon Sep 17 00:00:00 2001 From: Keerthana Reddy Gangumalla Date: Wed, 22 Jul 2020 18:03:23 -0700 Subject: [PATCH 44/44] added 204 responses for delete operation --- .../preview/2018-07-01/FileContainer.json | 3 +++ .../preview/2018-07-01/ProductPackage.json | 3 +++ .../preview/2018-07-01/examples/FileContainer/Delete.json | 3 ++- .../preview/2018-07-01/examples/ProductPackage/Delete.json | 3 ++- .../preview/2019-01-01/FileContainer.json | 3 +++ .../preview/2019-01-01/ProductDeployment.json | 3 +++ .../preview/2019-01-01/ProductPackage.json | 3 +++ .../preview/2019-01-01/examples/FileContainer/Delete.json | 3 ++- .../preview/2019-01-01/examples/ProductDeployment/Remove.json | 3 ++- .../preview/2019-01-01/examples/ProductPackage/Delete.json | 3 ++- 10 files changed, 25 insertions(+), 5 deletions(-) diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json index 0fa18ee52515..deb9b2f4ff18 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/FileContainer.json @@ -158,6 +158,9 @@ "200": { "description": "OK" }, + "204": { + "description": "No Content" + }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json index b17e778c26b0..1434a2709d3c 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/ProductPackage.json @@ -193,6 +193,9 @@ "200": { "description": "OK" }, + "204": { + "description": "No Content" + }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json index ce950454bbe8..fb79b908e537 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/FileContainer/Delete.json @@ -6,6 +6,7 @@ "fileContainerId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json index d19e65465a6c..76aaf0a95a96 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2018-07-01/examples/ProductPackage/Delete.json @@ -6,6 +6,7 @@ "packageId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json index 5a5ea37e25c4..5b823a4c7110 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/FileContainer.json @@ -158,6 +158,9 @@ "200": { "description": "OK" }, + "204": { + "description": "No Content" + }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json index 89d89df51336..2709fd8be308 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductDeployment.json @@ -210,6 +210,9 @@ "202": { "description": "ACCEPTED" }, + "204": { + "description": "No Content" + }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json index 9a17438d2b4e..56f7a259a89d 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/ProductPackage.json @@ -163,6 +163,9 @@ "200": { "description": "OK" }, + "204": { + "description": "No Content" + }, "default": { "description": "Default Response.", "schema": { diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json index e9bafdcf68fb..56aa015592ba 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/FileContainer/Delete.json @@ -6,6 +6,7 @@ "fileContainerId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {} + "200": {}, + "204": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json index 05fdceedfbb6..cef5ba4f6b10 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductDeployment/Remove.json @@ -7,6 +7,7 @@ }, "responses": { "200": {}, - "202": {} + "202": {}, + "204": {} } } diff --git a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json index 0e1cfe43407e..ab64764c8d46 100644 --- a/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json +++ b/specification/azsadmin/resource-manager/deployment/Microsoft.Deployment.Admin/preview/2019-01-01/examples/ProductPackage/Delete.json @@ -6,6 +6,7 @@ "packageId": "Microsoft.NullProvider.1.1" }, "responses": { - "200": {} + "200": {}, + "204": {} } }