Skip to content

Commit

Permalink
1. Make PUT and PATCH against App resource supports async. (#7594)
Browse files Browse the repository at this point in the history
2. Remove "Processing" enum from DeploymentResourceProperties's status property.
3. Rename "Processing" enum to "Updating" for DeploymentResourceProperties's provisioningState.
  • Loading branch information
bowen5 authored and ArcturusZhang committed Oct 24, 2019
1 parent 1fd7099 commit 191aa6f
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,23 @@
"$ref": "#/definitions/AppResource"
}
},
"201": {
"description": "Created. The response describes the new App and contains a Location header to query the operation result.",
"schema": {
"$ref": "#/definitions/AppResource"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "azure-async-operation"
},
"x-ms-examples": {
"Apps_CreateOrUpdate": {
"$ref": "./examples/Apps_CreateOrUpdate.json"
Expand Down Expand Up @@ -577,13 +587,23 @@
"$ref": "#/definitions/AppResource"
}
},
"202": {
"description": "Accepted. The response indicates the exiting App is now updating and contains a Location header to query the operation result.",
"schema": {
"$ref": "#/definitions/AppResource"
}
},
"default": {
"description": "Error response describing why the operation failed.",
"schema": {
"$ref": "#/definitions/CloudError"
}
}
},
"x-ms-long-running-operation": true,
"x-ms-long-running-operation-options": {
"final-state-via": "azure-async-operation"
},
"x-ms-examples": {
"Apps_Update": {
"$ref": "./examples/Apps_Update.json"
Expand Down Expand Up @@ -2053,7 +2073,9 @@
"description": "Provisioning state of the App",
"enum": [
"Succeeded",
"Failed"
"Failed",
"Creating",
"Updating"
],
"type": "string",
"readOnly": true,
Expand Down Expand Up @@ -2300,15 +2322,11 @@
"type": "string",
"readOnly": true
},
"deploymentSettings": {
"$ref": "#/definitions/DeploymentSettings",
"description": "Deployment settings of the Deployment"
},
"provisioningState": {
"description": "Provisioning state of the Deployment",
"enum": [
"Creating",
"Processing",
"Updating",
"Succeeded",
"Failed"
],
Expand All @@ -2319,14 +2337,17 @@
"modelAsString": true
}
},
"deploymentSettings": {
"$ref": "#/definitions/DeploymentSettings",
"description": "Deployment settings of the Deployment"
},
"status": {
"description": "Status of the Deployment",
"enum": [
"Unknown",
"Stopped",
"Running",
"Failed",
"Processing",
"Allocating",
"Upgrading",
"Compiling"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,28 @@
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
},
"201": {
"body": {
"properties": {
"public": true,
"url": "myapp.myservice.azureapps.io",
"provisioningState": "Creating",
"activeDeploymentName": "mydeployment1",
"temporaryDisk": {
"sizeInGB": 2,
"mountPath": "mytemporarydisk"
},
"persistentDisk": {
"sizeInGB": 2,
"usedInGB": 1,
"mountPath": "mypersistentdisk"
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,28 @@
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
},
"202": {
"body": {
"properties": {
"public": true,
"url": "myapp.myservice.azureapps.io",
"provisioningState": "Updating",
"activeDeploymentName": "mydeployment1",
"temporaryDisk": {
"sizeInGB": 2,
"mountPath": "mytemporarydisk"
},
"persistentDisk": {
"sizeInGB": 2,
"usedInGB": 1,
"mountPath": "mypersistentdisk"
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Updating",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -50,8 +51,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Processing",
"status": "Processing",
"status": "Compiling",
"active": false,
"instances": [
{
Expand All @@ -76,6 +76,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -86,7 +87,6 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -28,7 +29,6 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -29,7 +30,6 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -29,7 +30,6 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -40,7 +41,6 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand All @@ -66,6 +66,7 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Updating",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -76,7 +77,6 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Processing",
"status": "Running",
"active": false,
"instances": [
Expand Down

0 comments on commit 191aa6f

Please sign in to comment.