Skip to content

Commit d14303b

Browse files
nickgmicrosoftEdwin Gomez CuellarEdwin Gomez Cuellarmsyyc
authored andcommitted
GA of 2019-01-01-preview and 2020-05-01-preview versions as one version: 2021-04-01 (Azure#16948)
* Adds base for updating Microsoft.AzureActiveDirectory from version preview/2019-01-01-preview to version 2021-04-01 * Updates readme * Updates API version in new specs and examples * combining two existing preview versions into one GA version * touching up readme files * removing changes to existing files * copying over guestusages entries into new version * addressing lint errors * fixing additionalProperties * fixing errors with example for guestusages * fixing formatting issues * using alternative form of additionalProperties * fixing long running error tags for get * adding flattening and correct folder path for go * addressing systemData and operation api response schema issues * fixing missing comma * fixing reference to v2/types' * fixing reference to v2/types' * fixing reference to v2/types' * removing operation properties * Update specification/cpim/resource-manager/readme.md Removing track1 Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com> * azureadexternalidentities name for python * removing async operation * adding 200 for delete operation and removing reference to nickgomez97 * making go version compatible with track2 * adding flag for track2 for go * renaming service folder name * fixing name miss for azureadexternalidentities from externalidentities in go file * removing csharp file, not needed for now * adding back csharp file and fixing GeneratedProtocol to Generated * reverting folder name change - introduces too many errors * modelAsString=true for enums * sligth change to trigger checks again Co-authored-by: Edwin Gomez Cuellar <edwingomezcuellar@DESKTOP-26P66H4.corp.microsoft.com> Co-authored-by: Edwin Gomez Cuellar <edwingomezcuellar@Edwins-MacBook-Pro.local> Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
1 parent 7739ad5 commit d14303b

23 files changed

+1717
-20
lines changed

specification/cpim/resource-manager/Microsoft.AzureActiveDirectory/preview/2019-01-01-preview/examples/getTenant.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"tenantId": "00000000-0000-0000-0000-000000000000"
2222
},
2323
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/b2cDirectories/contoso.onmicrosoft.com",
24-
"name": "nickgomez97.onmicrosoft.com",
24+
"name": "contoso.onmicrosoft.com",
2525
"location": "United States",
2626
"tags": null
2727
}

specification/cpim/resource-manager/Microsoft.AzureActiveDirectory/preview/2019-01-01-preview/examples/listTenantsByResourceGroup.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"tenantId": "00000000-0000-0000-0000-000000000000"
2323
},
2424
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/b2cDirectories/contoso.onmicrosoft.com",
25-
"name": "nickgomez97.onmicrosoft.com",
25+
"name": "contoso.onmicrosoft.com",
2626
"location": "United States",
2727
"tags": null
2828
}

specification/cpim/resource-manager/Microsoft.AzureActiveDirectory/preview/2019-01-01-preview/examples/listTenantsBySubscription.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"tenantId": "00000000-0000-0000-0000-000000000000"
2222
},
2323
"id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/b2cDirectories/contoso.onmicrosoft.com",
24-
"name": "nickgomez97.onmicrosoft.com",
24+
"name": "contoso.onmicrosoft.com",
2525
"location": "United States",
2626
"tags": null
2727
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "c80fb759-c965-4c6a-9110-9b2b2d038882",
4+
"resourceGroupName": "contosoResourceGroup",
5+
"api-version": "2021-04-01",
6+
"resourceName": "contoso.onmicrosoft.com",
7+
"resource": {
8+
"location": "United States",
9+
"name": "contoso.onmicrosoft.com",
10+
"properties": {
11+
"tenantId": "c963dd1a-9174-4c23-8bae-733d7f955492"
12+
}
13+
}
14+
},
15+
"responses": {
16+
"200": {
17+
"body": {
18+
"id": "/subscriptions/c80fb759-c965-4c6a-9110-9b2b2d038882/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/guestUsages/contoso.onmicrosoft.com",
19+
"name": "contoso.onmicrosoft.com",
20+
"location": "United States",
21+
"tags": {},
22+
"type": "Microsoft.AzureActiveDirectory/GuestUsages",
23+
"properties": {
24+
"tenantId": "c963dd1a-9174-4c23-8bae-733d7f955492"
25+
}
26+
}
27+
}
28+
}
29+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "c80fb759-c965-4c6a-9110-9b2b2d038882",
4+
"resourceGroupName": "contosoResourceGroup",
5+
"api-version": "2021-04-01",
6+
"resourceName": "contoso.onmicrosoft.com"
7+
},
8+
"responses": {
9+
"200": {},
10+
"204": {}
11+
}
12+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "c80fb759-c965-4c6a-9110-9b2b2d038882",
4+
"resourceGroupName": "contosoResourceGroup",
5+
"api-version": "2021-04-01",
6+
"resourceName": "contoso.onmicrosoft.com"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/c80fb759-c965-4c6a-9110-9b2b2d038882/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/guestUsages/contoso.onmicrosoft.com",
12+
"name": "contoso.onmicrosoft.com",
13+
"location": "United States",
14+
"tags": {},
15+
"type": "Microsoft.AzureActiveDirectory/GuestUsages",
16+
"properties": {
17+
"tenantId": "c963dd1a-9174-4c23-8bae-733d7f955492"
18+
}
19+
}
20+
}
21+
}
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "c80fb759-c965-4c6a-9110-9b2b2d038882",
4+
"resourceGroupName": "contosoResourceGroup",
5+
"api-version": "2021-04-01"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"id": "/subscriptions/c80fb759-c965-4c6a-9110-9b2b2d038882/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/guestUsages/contoso.onmicrosoft.com",
13+
"name": "contoso.onmicrosoft.com",
14+
"location": "United States",
15+
"tags": {},
16+
"type": "Microsoft.AzureActiveDirectory/GuestUsages",
17+
"properties": {
18+
"tenantId": "c963dd1a-9174-4c23-8bae-733d7f955492"
19+
}
20+
}
21+
]
22+
}
23+
}
24+
}
25+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "c80fb759-c965-4c6a-9110-9b2b2d038882",
4+
"api-version": "2021-04-01"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"value": [
10+
{
11+
"id": "/subscriptions/c80fb759-c965-4c6a-9110-9b2b2d038882/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/guestUsages/contoso.onmicrosoft.com",
12+
"name": "contoso.onmicrosoft.com",
13+
"location": "United States",
14+
"tags": {},
15+
"type": "Microsoft.AzureActiveDirectory/GuestUsages",
16+
"properties": {
17+
"tenantId": "c963dd1a-9174-4c23-8bae-733d7f955492"
18+
}
19+
}
20+
]
21+
}
22+
}
23+
}
24+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "c80fb759-c965-4c6a-9110-9b2b2d038882",
4+
"resourceGroupName": "contosoResourceGroup",
5+
"api-version": "2021-04-01",
6+
"resourceName": "contoso.onmicrosoft.com",
7+
"resource": {
8+
"tags": {
9+
"additionalProperty1": "additionalValue1"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"200": {
15+
"body": {
16+
"id": "/subscriptions/c80fb759-c965-4c6a-9110-9b2b2d038882/resourceGroups/contosoResourceGroup/providers/Microsoft.AzureActiveDirectory/guestUsages/contoso.onmicrosoft.com",
17+
"name": "contoso.onmicrosoft.com",
18+
"location": "United States",
19+
"tags": {
20+
"additionalProperty1": "additionalValue1"
21+
},
22+
"type": "Microsoft.AzureActiveDirectory/GuestUsages",
23+
"properties": {
24+
"tenantId": "c963dd1a-9174-4c23-8bae-733d7f955492"
25+
}
26+
}
27+
}
28+
}
29+
}
Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"parameters": {
3+
"resourceGroupName": "cpimClient",
4+
"api-version": "2021-04-01",
5+
"subscriptionId": "subid"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"name": "Microsoft.AzureActiveDirectory/b2cDirectories/write",
13+
"display": {
14+
"provider": "Microsoft Azure Active Directory",
15+
"resource": "B2C Directory",
16+
"operation": "Create or update B2C Dictory resource",
17+
"description": "Create or update B2C Dictory resource"
18+
},
19+
"origin": "user,system"
20+
},
21+
{
22+
"name": "Microsoft.AzureActiveDirectory/b2cDirectories/read",
23+
"display": {
24+
"provider": "Microsoft Azure Active Directory",
25+
"resource": "B2C Directory",
26+
"operation": "View B2C Directory resource",
27+
"description": "View B2C Directory resource"
28+
},
29+
"origin": "user,system"
30+
},
31+
{
32+
"name": "Microsoft.AzureActiveDirectory/b2cDirectories/delete",
33+
"display": {
34+
"provider": "Microsoft Azure Active Directory",
35+
"resource": "B2C Directory",
36+
"operation": "Delete B2C Directory resource",
37+
"description": "Delete B2C Directory resource"
38+
},
39+
"origin": "user,system"
40+
},
41+
{
42+
"name": "Microsoft.AzureActiveDirectory/operations/read",
43+
"display": {
44+
"provider": "Microsoft Azure Active Directory",
45+
"resource": "B2C Directory",
46+
"operation": "Read all API operations",
47+
"description": "Read all API operations available for Microsoft.AzureActiveDirectory resource provider"
48+
},
49+
"origin": "user,system"
50+
},
51+
{
52+
"name": "Microsoft.AzureActiveDirectory/register/action",
53+
"display": {
54+
"provider": "Microsoft Azure Active Directory",
55+
"resource": "B2C Directory",
56+
"operation": "Register Microsoft.AzureActiveDirectory resource provider",
57+
"description": "Register subscription for Microsoft.AzureActiveDirectory resource provider"
58+
},
59+
"origin": "user,system"
60+
},
61+
{
62+
"name": "Microsoft.AzureActiveDirectory/b2ctenants/read",
63+
"display": {
64+
"provider": "Microsoft Azure Active Directory",
65+
"resource": "B2C Tenants",
66+
"operation": "List all B2C tenants of the user",
67+
"description": "Lists all B2C tenants where the user is a member"
68+
},
69+
"origin": "user,system"
70+
},
71+
{
72+
"name": "Microsoft.AzureActiveDirectory/guestUsages/write",
73+
"display": {
74+
"provider": "Microsoft Azure Active Directory",
75+
"resource": "Guest Usages",
76+
"operation": "Create or update Guest Usages resource",
77+
"description": "Create or update Guest Usages resource"
78+
},
79+
"origin": "user,system"
80+
},
81+
{
82+
"name": "Microsoft.AzureActiveDirectory/guestUsages/read",
83+
"display": {
84+
"provider": "Microsoft Azure Active Directory",
85+
"resource": "Guest Usages",
86+
"operation": "View Guest Usages resource",
87+
"description": "View Guest Usages resource"
88+
},
89+
"origin": "user,system"
90+
},
91+
{
92+
"name": "Microsoft.AzureActiveDirectory/guestUsages/delete",
93+
"display": {
94+
"provider": "Microsoft Azure Active Directory",
95+
"resource": "Guest Usages",
96+
"operation": "Delete Guest Usages resource",
97+
"description": "Delete Guest Usages resource"
98+
},
99+
"origin": "user,system"
100+
}
101+
]
102+
}
103+
}
104+
}
105+
}

0 commit comments

Comments
 (0)