Skip to content

Azure Spring Cloud: Add location to Apps #8851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akning-ms merged 5 commits into from
Apr 2, 2020
Merged

Azure Spring Cloud: Add location to Apps #8851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e356f4b
Azure Spring Cloud: Add location to Apps
Mar 27, 2020
ca9d0e6
make location read-only for Apps
Mar 31, 2020
337e38d
Merge remote-tracking branch 'azure/master' into hkn/spring-app-location
Mar 31, 2020
26d8131
revert: make location read-only for Apps
Mar 31, 2020
9d0c0de
put location in PUT/PATCH request examples
Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...atform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2043,6 +2043,10 @@
"$ref": "#/definitions/AppResourceProperties",
"description": "Properties of the App resource",
"x-ms-client-flatten": false
},
"location": {
Copy link
Member

@majastrz majastrz Mar 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

location [](start = 9, length = 8)

Please mark as read-only if it's inherited from parent resource.

Copy link
Author

@xgugeng xgugeng Mar 31, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

location is needed in user request (PUT/PATCH). I just found making it read-only removes this property from http request in the SDK generated. It might not be a read-only case in this scenario?

Copy link
Author

@xgugeng xgugeng Apr 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If user puts a location different from parent resource deliberately, a 404 error will be returned due to the uniqueness of parent resource cross all regions

Copy link
Member

@majastrz majastrz Apr 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your create and update examples don't have location in request body. If it's required then it should be marked required in the swagger and in those examples.

The experience around this is kind of weird. We know what the only valid location is and we're going to make the user put it in the request anyway, but if they get it wrong we will reject the request. Why do we make them specify the location at all?

In reply to: 401348345 [](ancestors = 401348345)

Copy link
Author

@xgugeng xgugeng Apr 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the create and update examples. Actually the location is required only when enabling/disabling MSI via PUT/PATCH, so ARM can figure out which regional MSI RP it should call. Otherwise, it's optional.

"description": "The GEO location of the application, always the same with its parent resource",
"type": "string"
}
}
},
Expand Down Expand Up @@ -2322,6 +2326,10 @@
"type": "string",
"readOnly": true
},
"deploymentSettings": {
"$ref": "#/definitions/DeploymentSettings",
"description": "Deployment settings of the Deployment"
},
"provisioningState": {
"description": "Provisioning state of the Deployment",
"enum": [
Expand All @@ -2337,10 +2345,6 @@
"modelAsString": true
}
},
"deploymentSettings": {
"$ref": "#/definitions/DeploymentSettings",
"description": "Deployment settings of the Deployment"
},
"status": {
"description": "Status of the Deployment",
"enum": [
Expand Down
5 changes: 4 additions & 1 deletion ...anager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Apps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"sizeInGB": 2,
"mountPath": "mypersistentdisk"
}
}
},
"location": "eastus"
},
"api-version": "2019-05-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
Expand All @@ -39,6 +40,7 @@
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"location": "eastus",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
Expand All @@ -61,6 +63,7 @@
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"location": "eastus",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
Expand Down
1 change: 1 addition & 0 deletions .../resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Apps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"location": "eastus",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
Expand Down
1 change: 1 addition & 0 deletions ...resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Apps_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"location": "eastus",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
Expand Down
5 changes: 4 additions & 1 deletion ...source-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Apps_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"sizeInGB": 2,
"mountPath": "mypersistentdisk"
}
}
},
"location": "eastus"
},
"api-version": "2019-05-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
Expand All @@ -39,6 +40,7 @@
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"location": "eastus",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
Expand All @@ -61,6 +63,7 @@
}
},
"type": "Microsoft.AppPlatform/Spring/apps",
"location": "eastus",
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice/apps/myapp",
"name": "myapp"
}
Expand Down
4 changes: 2 additions & 2 deletions ...Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Updating",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -50,6 +49,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Updating",
"status": "Compiling",
"active": false,
"instances": [
Expand All @@ -75,7 +75,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -86,6 +85,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
2 changes: 1 addition & 1 deletion ...ce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -29,6 +28,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
2 changes: 1 addition & 1 deletion ...e-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -30,6 +29,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
2 changes: 1 addition & 1 deletion ...ppPlatform/preview/2019-05-01-preview/examples/Deployments_ListClusterAllDeployments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -30,6 +29,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand Down
4 changes: 2 additions & 2 deletions ...manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Deployments_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Succeeded",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -40,6 +39,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Succeeded",
"status": "Running",
"active": false,
"instances": [
Expand All @@ -65,7 +65,6 @@
"artifactSelector": "sub-module-1"
},
"appName": "myapp",
"provisioningState": "Updating",
"deploymentSettings": {
"cpu": 1,
"memoryInGB": 3,
Expand All @@ -76,6 +75,7 @@
},
"runtimeVersion": "Java_8"
},
"provisioningState": "Updating",
"status": "Running",
"active": false,
"instances": [
Expand Down