Skip to content

Commit e4904c6

Browse files
authored
Diyakobo/add location field (Azure#13370)
* all Tamir changes * fix 1 * fix 2
1 parent e6731e9 commit e4904c6

File tree

3 files changed

+104
-0
lines changed
  • specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta

3 files changed

+104
-0
lines changed
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"parameters": {
3+
"api-version": "2018-03-01-beta",
4+
"operationId": "5f35cb4c-8065-45b3-9116-5ba335462e95"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"id": "/providers/Microsoft.SaaS/saasresources/115c3523-1fae-757f-af86-7b27cfd29805",
10+
"name": "diyakobo-transfer",
11+
"type": "Microsoft.SaaS/saasresources",
12+
"properties": {
13+
"status": "Subscribed",
14+
"saasResourceName": "diyakobo-transfer",
15+
"publisherId": "microsoft-hcb",
16+
"skuId": "free",
17+
"offerId": "microsofthealthcarebot",
18+
"quantity": null,
19+
"termId": null,
20+
"paymentChannelType": null,
21+
"paymentChannelMetadata": {
22+
"azureSubscriptionId": "155af98a-3205-47e7-883b-a2ab9db9f88d",
23+
"resourceId": "b25dba9a-1bd7-4600-9447-3d27d11a6477"
24+
},
25+
"publisherTestEnvironment": null,
26+
"term": {
27+
"termUnit": "P1M",
28+
"startDate": "2020-11-12T00:00:00Z",
29+
"endDate": "2020-12-11T00:00:00Z"
30+
},
31+
"autoRenew": null,
32+
"isFreeTrial": false,
33+
"created": "2020-10-12T05:08:40.9235607Z",
34+
"lastModified": "2020-11-12T21:25:40.2736665Z"
35+
},
36+
"tags": {}
37+
}
38+
},
39+
"202": {}
40+
}
41+
}

specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/examples/saasSubscriptionLevel/SaasPut.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"resourceName": "MyContosoSubscription",
66
"api-version": "2018-03-01-beta",
77
"parameters": {
8+
"location": "global",
9+
"name": "MyContosoSubscription",
810
"properties": {
911
"publisherId": "microsoft-contoso",
1012
"offerId": "contosoOffer",

specification/saas/resource-manager/Microsoft.SaaS/preview/2018-03-01-beta/saas.json

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -958,6 +958,63 @@
958958
"final-state-via": "location"
959959
}
960960
}
961+
},
962+
"/providers/Microsoft.SaaS/operationResults/{operationId}": {
963+
"get": {
964+
"tags": [
965+
"SaaSOperations"
966+
],
967+
"operationId": "SaaSOperation_Get",
968+
"description": "Gets information about the specified operation progress.",
969+
"produces": [
970+
"application/json"
971+
],
972+
"parameters": [
973+
{
974+
"$ref": "#/parameters/OperationIdParameter"
975+
},
976+
{
977+
"$ref": "#/parameters/ApiVersionParameter"
978+
}
979+
],
980+
"responses": {
981+
"200": {
982+
"description": "Operation ended successfully. The request returns the updated SaaS resource.",
983+
"schema": {
984+
"$ref": "#/definitions/SaasResource"
985+
}
986+
},
987+
"202": {
988+
"description": "Accepted and the operation will complete asynchronously.",
989+
"headers": {
990+
"Location": {
991+
"description": "The URL to check the status of the asynchronous operation.",
992+
"type": "string"
993+
},
994+
"Retry-After": {
995+
"description": "The amount of delay to use while the status of the operation is checked. The value is expressed in seconds.",
996+
"format": "int32",
997+
"type": "integer"
998+
}
999+
}
1000+
},
1001+
"default": {
1002+
"description": "A response indicating an error.",
1003+
"schema": {
1004+
"$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse"
1005+
}
1006+
}
1007+
},
1008+
"x-ms-examples": {
1009+
"Get operation status": {
1010+
"$ref": "./examples/OperationResults/Get.json"
1011+
}
1012+
},
1013+
"x-ms-long-running-operation": true,
1014+
"x-ms-long-running-operation-options": {
1015+
"final-state-via": "location"
1016+
}
1017+
}
9611018
}
9621019
},
9631020
"definitions": {
@@ -1091,6 +1148,10 @@
10911148
"description": "the resource tags.",
10921149
"$ref": "#/definitions/Tags"
10931150
},
1151+
"location": {
1152+
"type": "string",
1153+
"description": "Resource location. Only value allowed for SaaS is 'global'"
1154+
},
10941155
"properties": {
10951156
"$ref": "#/definitions/SaasCreationProperties",
10961157
"description": "Properties of the SaaS resource that are relevant for creation."

0 commit comments

Comments
 (0)