Skip to content
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

Jump to bottom

[Resources] Import APIs for subscriptions.json file #12964

Merged
merged 18 commits into from
Mar 31, 2021
Merged

[Resources] Import APIs for subscriptions.json file #12964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2268b5d
copy from 2020-01-01/subscriptions.json
Tiano2017 Feb 11, 2021
7a716b3
add changes for extended location
Tiano2017 Feb 11, 2021
d5257b3
Add examples copied from 2020-01-01
Tiano2017 Feb 11, 2021
7ddebe9
add example for getting locations with extended locations
Tiano2017 Feb 11, 2021
aad3b42
add reference to example file
Tiano2017 Feb 11, 2021
f8bbf9c
Add extended location to resource definition.
Tiano2017 Mar 2, 2021
eb12d7b
resolve comments
Tiano2017 Mar 2, 2021
96539f1
update readme.md for subscriptions
Tiano2017 Mar 3, 2021
7b5c787
update error responses in subscriptions spec
Tiano2017 Mar 9, 2021
fad5c73
revert changes in common types
Tiano2017 Mar 11, 2021
9f7124f
remove changes in 2020-10-01. add 2021-01-01.
Tiano2017 Mar 18, 2021
460b538
copy subscriptions.json
Tiano2017 Mar 18, 2021
a827852
add changes for extended locations in 2021-01-01
Tiano2017 Mar 18, 2021
0cae8c1
update version to 2021-01-01
Tiano2017 Mar 22, 2021
074ab8a
revert unwanted changes
Tiano2017 Mar 22, 2021
fd1da7c
Fix readme
Tiano2017 Mar 22, 2021
734ea55
add x-ms-mutability to extendedLocation property
Tiano2017 Mar 25, 2021
752ea02
Merge remote-tracking branch 'origin/master' into tiano-extlocations
Tiano2017 Mar 31, 2021
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
20 changes: 20 additions & 0 deletions ...es/resource-manager/Microsoft.Resources/stable/2021-01-01/examples/CheckResourceName.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"body": [
{
"Name": "isxbox",
"Type": "ResourceProviderTestHost/TestResourceType"
}
],
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"name": "isxbox",
"type": "ResourceProviderTestHost/TestResourceType",
"status": "Allowed"
}
}
}
}
54 changes: 54 additions & 0 deletions ...sources/resource-manager/Microsoft.Resources/stable/2021-01-01/examples/GetLocations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": [
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus",
"name": "eastus",
"type": "Region",
"displayName": "East US",
"regionalDisplayName": "(US) East US",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-79.8164",
"latitude": "37.3719",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "westus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/westus"
}
]
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus2",
"name": "eastus2",
"type": "Region",
"displayName": "East US 2",
"regionalDisplayName": "(US) East US 2",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-78.3889",
"latitude": "36.6681",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "centralus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/centralus"
}
]
}
}
]
}
}
}
83 changes: 83 additions & 0 deletions ...ger/Microsoft.Resources/stable/2021-01-01/examples/GetLocationsWithExtendedLocations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"parameters": {
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"api-version": "2021-01-01",
"includeExtendedLocations": "true"
},
"responses": {
"200": {
"body": [
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus",
"name": "eastus",
"type": "Region",
"displayName": "East US",
"regionalDisplayName": "(US) East US",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-79.8164",
"latitude": "37.3719",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "westus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/westus"
}
]
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus2",
"name": "eastus2",
"type": "Region",
"displayName": "East US 2",
"regionalDisplayName": "(US) East US 2",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-78.3889",
"latitude": "36.6681",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "centralus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/centralus"
}
]
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/westus/edgeZones/microsoftlosangeles1",
"name": "microsoftlosangeles1",
"type": "EdgeZone",
"displayName": "Microsoft Los Angeles 1",
"regionalDisplayName": "Microsoft Los Angeles 1",
"metadata": {
"regionType": "Physical",
"regionCategory": "Extended",
"longitude": "-118.235374",
"latitude": "34.058414",
"homeLocation": "westus"
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus2euap/edgeZones/microsoftrrdclab1",
"name": "microsoftrrdclab1",
"type": "EdgeZone",
"displayName": "Microsoft RRDC Lab 1",
"regionalDisplayName": "Microsoft RRDC Lab 1",
"metadata": {
"regionType": "Physical",
"regionCategory": "Extended",
"longitude": "-122.03197",
"latitude": "47.69106",
"homeLocation": "eastus2euap"
}
}
]
}
}
}
32 changes: 32 additions & 0 deletions ...rces/resource-manager/Microsoft.Resources/stable/2021-01-01/examples/GetSubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parameters": {
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"tenantId": "31c75423-32d6-4322-88b7-c478bdde4858",
"displayName": "Example Subscription",
"state": "Enabled",
"subscriptionPolicies": {
"locationPlacementId": "Internal_2014-09-01",
"quotaId": "Internal_2014-09-01",
"spendingLimit": "Off"
},
"authorizationSource": "Bypassed",
"managedByTenants": [
{
"tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
}
],
"tags": {
"tagKey1": "tagValue1",
"tagKey2": "tagValue2"
}
}
}
}
}
61 changes: 61 additions & 0 deletions ...ces/resource-manager/Microsoft.Resources/stable/2021-01-01/examples/GetSubscriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"parameters": {
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"tenantId": "31c75423-32d6-4322-88b7-c478bdde4858",
"displayName": "Example Subscription",
"state": "Enabled",
"subscriptionPolicies": {
"locationPlacementId": "Internal_2014-09-01",
"quotaId": "Internal_2014-09-01",
"spendingLimit": "Off"
},
"authorizationSource": "RoleBased",
"managedByTenants": [
{
"tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
}
],
"tags": {
"tagKey1": "tagValue1",
"tagKey2": "tagValue2"
}
},
{
"id": "/subscriptions/72ac930a-f34e-42d8-b06d-dc2a9e12ed71",
"subscriptionId": "72ac930a-f34e-42d8-b06d-dc2a9e12ed71",
"tenantId": "2a0ff0de-96b2-4859-bb7c-a430d07a3e0c",
"displayName": "Example Subscription2",
"state": "Enabled",
"subscriptionPolicies": {
"locationPlacementId": "Internal_2014-09-01",
"quotaId": "Internal_2014-09-01",
"spendingLimit": "Off"
},
"authorizationSource": "RoleBased",
"managedByTenants": [
{
"tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
},
{
"tenantId": "f7fb6af2-321d-47c8-9c0f-b0239eaad39a"
}
],
"tags": {
"tagKey1": "tagValue1",
"tagKey2": "tagValue2"
}
}
],
"nextLink": "..."
}
}
}
}
53 changes: 53 additions & 0 deletions ...resources/resource-manager/Microsoft.Resources/stable/2021-01-01/examples/GetTenants.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"parameters": {
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/tenants/a70a1586-9c4a-4373-b907-1d310660dbd1",
"tenantId": "a70a1586-9c4a-4373-b907-1d310660dbd1",
"countryCode": "US",
"displayName": "Test_Test_aad50",
"domains": [
"aad50.ccsctp.net"
],
"tenantCategory": "ManagedBy",
"defaultDomain": "aad50.ccsctp.net",
"tenantType": "AAD"
},
{
"id": "/tenants/83abe5cd-bcc3-441a-bd86-e6a75360cecc",
"tenantId": "83abe5cd-bcc3-441a-bd86-e6a75360cecc",
"countryCode": "US",
"displayName": "Contoso Corp.",
"domains": [
"auxteststagemanual.ccsctp.net"
],
"tenantCategory": "Home",
"defaultDomain": "auxteststagemanual.ccsctp.net",
"tenantType": "AAD"
},
{
"id": "/tenants/daea2e9b-847b-4c93-850d-2aa6f2d7af33",
"tenantId": "daea2e9b-847b-4c93-850d-2aa6f2d7af33",
"countryCode": "US",
"displayName": "TEST_TEST_RDV",
"domains": [
"rdvmohoro.ccsctp.net",
"rdvmohoro.mail.ccsctp.net",
"rdvmohoro.com"
],
"tenantCategory": "ProjectedBy",
"defaultDomain": "rdvmohoro.ccsctp.net",
"tenantType": "AAD",
"tenantBrandingLogoUrl": "logo1.logo.rdvmohoro.com"
}
],
"nextLink": "..."
}
}
}
}
28 changes: 28 additions & 0 deletions ...ification/resources/resource-manager/Microsoft.Resources/stable/2021-01-01/resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5381,6 +5381,26 @@
],
"description": "Resource information."
},
"ExtendedLocation": {
"properties": {
"type": {
"type": "string",
"enum": [
"EdgeZone"
],
"x-ms-enum": {
"name": "ExtendedLocationType",
"modelAsString": true
},
"description": "The extended location type."
},
"name": {
"type": "string",
"description": "The extended location name."
}
},
"description": "Resource extended location."
},
"GenericResourceExpanded": {
"properties": {
"createdTime": {
Expand Down Expand Up @@ -5954,6 +5974,14 @@
"type": "string",
"description": "Resource location"
},
"extendedLocation": {
"$ref": "#/definitions/ExtendedLocation",
"x-ms-mutability": [
"read",
"create"
],
"description": "Resource extended location."
markcowl marked this conversation as resolved.
Show resolved Hide resolved
},
"tags": {
"type": "object",
"additionalProperties": {
Expand Down
Loading