From 8b4a2f16906b7a0ba4a3424acc53a91724dd2ab5 Mon Sep 17 00:00:00 2001 From: Yuwei Zhou Date: Thu, 27 Aug 2020 13:06:50 +0800 Subject: [PATCH 1/2] add missing properties to 2019-05-01-preview --- .../2019-05-01-preview/appplatform.json | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json index 46ffa1bd76f4..998b907c9024 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json @@ -1587,6 +1587,12 @@ "$ref": "#/definitions/DeploymentResource" } }, + "202": { + "description": "Accepted. The response describes the create or update Deployment request is accepted.", + "schema": { + "$ref": "#/definitions/DeploymentResource" + } + }, "200": { "description": "Success. The response describes the updated Deployment.", "schema": { @@ -2725,7 +2731,8 @@ "Succeeded", "Failed", "Creating", - "Updating" + "Updating", + "Deleting" ], "type": "string", "readOnly": true, @@ -3141,6 +3148,10 @@ "$ref": "#/definitions/DeploymentResourceProperties", "description": "Properties of the Deployment resource", "x-ms-client-flatten": false + }, + "sku": { + "$ref": "#/definitions/Sku", + "description": "Sku of the Deployment resource" } } }, @@ -3167,7 +3178,8 @@ "Creating", "Updating", "Succeeded", - "Failed" + "Failed", + "Deleting" ], "type": "string", "readOnly": true, @@ -3559,6 +3571,10 @@ "displayName": { "description": "Localized friendly display name of the dimension", "type": "string" + }, + "toBeExportedForShoebox": { + "description": "Whether this dimension should be included for the Shoebox export scenario", + "type": "boolean" } } }, From b992797823b5e7b088079ec7a3704a1e755719dd Mon Sep 17 00:00:00 2001 From: Yuwei Zhou Date: Thu, 27 Aug 2020 14:27:52 +0800 Subject: [PATCH 2/2] update examples --- .../examples/Deployments_CreateOrUpdate.json | 56 +++++++++++++++++++ .../examples/Deployments_Get.json | 5 ++ .../examples/Deployments_List.json | 5 ++ ...Deployments_ListClusterAllDeployments.json | 5 ++ .../examples/Deployments_Update.json | 10 ++++ 5 files changed, 81 insertions(+) diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json index 0204c12e6e2b..fbb4c23ea0d0 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json @@ -19,6 +19,11 @@ "runtimeVersion": "Java_8" }, "instances": null + }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 } }, "api-version": "2019-05-01-preview", @@ -60,6 +65,52 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, + "type": "Microsoft.AppPlatform/Spring/apps/deployments", + "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", + "name": "mydeployment" + } + }, + "202": { + "body": { + "properties": { + "source": { + "type": "Source", + "relativePath": "resources/a172cedcae47474b615c54d510a5d84a8dea3032e958587430b413538be3f333-2019082605-e3095339-1723-44b7-8b5e-31b1003978bc", + "version": "1.0", + "artifactSelector": "sub-module-1" + }, + "appName": "myapp", + "deploymentSettings": { + "cpu": 1, + "memoryInGB": 3, + "jvmOptions": "-Xms1G -Xmx3G", + "instanceCount": 1, + "environmentVariables": { + "env": "test" + }, + "runtimeVersion": "Java_8" + }, + "provisioningState": "Creating", + "status": "Starting", + "active": false, + "instances": [ + { + "name": "instance1", + "status": "Starting", + "discoveryStatus": "pending" + } + ] + }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment" @@ -96,6 +147,11 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment" diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json index e574a0dea582..446a36e4ec73 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json @@ -39,6 +39,11 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment" diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json index 221113ccf649..2ef8f2b176cb 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json @@ -40,6 +40,11 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment" diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json index 221113ccf649..2ef8f2b176cb 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json @@ -40,6 +40,11 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment" diff --git a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json index 4a778752688a..041255426fee 100644 --- a/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json +++ b/specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json @@ -50,6 +50,11 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment" @@ -86,6 +91,11 @@ } ] }, + "sku": { + "name": "S0", + "tier": "Standard", + "capacity": 1 + }, "type": "Microsoft.AppPlatform/Spring/apps/deployments", "id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp/deployments/mydeployment", "name": "mydeployment"