Skip to content

Commit bf511e5

Browse files
authored
Merge pull request #2445 from serhangursoy-microsoft/main
Onboarding MSI for daily autogen
2 parents 70027f9 + 756fe7d commit bf511e5

File tree

10 files changed

+412
-49
lines changed

10 files changed

+412
-49
lines changed

generator/autogenlist.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ const disabledProviders: AutoGenConfig[] = [
5959
namespace: 'Microsoft.ManagedServices',
6060
disabledForAutogen: true,
6161
},
62-
{
63-
basePath: 'msi/resource-manager',
64-
namespace: 'Microsoft.ManagedIdentity',
65-
disabledForAutogen: true,
66-
},
6762
{
6863
basePath: 'network/resource-manager',
6964
namespace: 'Microsoft.Network',

schemas/2015-08-31-preview/Microsoft.ManagedIdentity.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77
"userAssignedIdentities": {
88
"type": "object",
99
"properties": {
10-
"name": {
11-
"type": "string",
12-
"description": "The name of the identity resource."
13-
},
14-
"type": {
15-
"type": "string",
16-
"enum": [
17-
"Microsoft.ManagedIdentity/userAssignedIdentities"
18-
]
19-
},
2010
"apiVersion": {
2111
"type": "string",
2212
"enum": [
@@ -25,30 +15,42 @@
2515
},
2616
"location": {
2717
"type": "string",
28-
"description": "The Azure region where the identity lives."
18+
"description": "The geo-location where the resource lives"
19+
},
20+
"name": {
21+
"type": "string",
22+
"description": "The name of the identity resource."
2923
},
3024
"tags": {
3125
"oneOf": [
3226
{
3327
"type": "object",
3428
"additionalProperties": {
3529
"type": "string"
36-
}
30+
},
31+
"properties": {}
3732
},
3833
{
3934
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4035
}
4136
],
42-
"description": "Resource tags"
37+
"description": "Resource tags."
38+
},
39+
"type": {
40+
"type": "string",
41+
"enum": [
42+
"Microsoft.ManagedIdentity/userAssignedIdentities"
43+
]
4344
}
4445
},
4546
"required": [
46-
"name",
47-
"type",
4847
"apiVersion",
49-
"location"
48+
"location",
49+
"name",
50+
"type"
5051
],
5152
"description": "Microsoft.ManagedIdentity/userAssignedIdentities"
5253
}
53-
}
54-
}
54+
},
55+
"definitions": {}
56+
}

schemas/2018-11-30/Microsoft.ManagedIdentity.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@
77
"userAssignedIdentities": {
88
"type": "object",
99
"properties": {
10-
"name": {
11-
"type": "string",
12-
"description": "The name of the identity resource."
13-
},
14-
"type": {
15-
"type": "string",
16-
"enum": [
17-
"Microsoft.ManagedIdentity/userAssignedIdentities"
18-
]
19-
},
2010
"apiVersion": {
2111
"type": "string",
2212
"enum": [
@@ -25,30 +15,42 @@
2515
},
2616
"location": {
2717
"type": "string",
28-
"description": "The Azure region where the identity lives."
18+
"description": "The geo-location where the resource lives"
19+
},
20+
"name": {
21+
"type": "string",
22+
"description": "The name of the identity resource."
2923
},
3024
"tags": {
3125
"oneOf": [
3226
{
3327
"type": "object",
3428
"additionalProperties": {
3529
"type": "string"
36-
}
30+
},
31+
"properties": {}
3732
},
3833
{
3934
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4035
}
4136
],
42-
"description": "Resource tags"
37+
"description": "Resource tags."
38+
},
39+
"type": {
40+
"type": "string",
41+
"enum": [
42+
"Microsoft.ManagedIdentity/userAssignedIdentities"
43+
]
4344
}
4445
},
4546
"required": [
46-
"name",
47-
"type",
4847
"apiVersion",
49-
"location"
48+
"location",
49+
"name",
50+
"type"
5051
],
5152
"description": "Microsoft.ManagedIdentity/userAssignedIdentities"
5253
}
53-
}
54-
}
54+
},
55+
"definitions": {}
56+
}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2021-09-30-preview/Microsoft.ManagedIdentity.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.ManagedIdentity",
5+
"description": "Microsoft ManagedIdentity Resource Types",
6+
"resourceDefinitions": {
7+
"userAssignedIdentities": {
8+
"type": "object",
9+
"properties": {
10+
"apiVersion": {
11+
"type": "string",
12+
"enum": [
13+
"2021-09-30-preview"
14+
]
15+
},
16+
"location": {
17+
"type": "string",
18+
"description": "The geo-location where the resource lives"
19+
},
20+
"name": {
21+
"type": "string",
22+
"description": "The name of the identity resource."
23+
},
24+
"tags": {
25+
"oneOf": [
26+
{
27+
"type": "object",
28+
"additionalProperties": {
29+
"type": "string"
30+
},
31+
"properties": {}
32+
},
33+
{
34+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
35+
}
36+
],
37+
"description": "Resource tags."
38+
},
39+
"type": {
40+
"type": "string",
41+
"enum": [
42+
"Microsoft.ManagedIdentity/userAssignedIdentities"
43+
]
44+
}
45+
},
46+
"required": [
47+
"apiVersion",
48+
"location",
49+
"name",
50+
"type"
51+
],
52+
"description": "Microsoft.ManagedIdentity/userAssignedIdentities"
53+
}
54+
},
55+
"definitions": {}
56+
}
Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2022-01-31-preview/Microsoft.ManagedIdentity.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.ManagedIdentity",
5+
"description": "Microsoft ManagedIdentity Resource Types",
6+
"resourceDefinitions": {
7+
"userAssignedIdentities": {
8+
"type": "object",
9+
"properties": {
10+
"apiVersion": {
11+
"type": "string",
12+
"enum": [
13+
"2022-01-31-preview"
14+
]
15+
},
16+
"location": {
17+
"type": "string",
18+
"description": "The geo-location where the resource lives"
19+
},
20+
"name": {
21+
"type": "string",
22+
"description": "The name of the identity resource."
23+
},
24+
"resources": {
25+
"type": "array",
26+
"items": {
27+
"oneOf": [
28+
{
29+
"$ref": "#/definitions/userAssignedIdentities_federatedIdentityCredentials_childResource"
30+
}
31+
]
32+
}
33+
},
34+
"tags": {
35+
"oneOf": [
36+
{
37+
"type": "object",
38+
"additionalProperties": {
39+
"type": "string"
40+
},
41+
"properties": {}
42+
},
43+
{
44+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
45+
}
46+
],
47+
"description": "Resource tags."
48+
},
49+
"type": {
50+
"type": "string",
51+
"enum": [
52+
"Microsoft.ManagedIdentity/userAssignedIdentities"
53+
]
54+
}
55+
},
56+
"required": [
57+
"apiVersion",
58+
"location",
59+
"name",
60+
"type"
61+
],
62+
"description": "Microsoft.ManagedIdentity/userAssignedIdentities"
63+
},
64+
"userAssignedIdentities_federatedIdentityCredentials": {
65+
"type": "object",
66+
"properties": {
67+
"apiVersion": {
68+
"type": "string",
69+
"enum": [
70+
"2022-01-31-preview"
71+
]
72+
},
73+
"name": {
74+
"type": "string",
75+
"description": "The name of the federated identity credential resource."
76+
},
77+
"properties": {
78+
"oneOf": [
79+
{
80+
"$ref": "#/definitions/FederatedIdentityCredentialProperties"
81+
},
82+
{
83+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
84+
}
85+
],
86+
"description": "The properties associated with a federated identity credential."
87+
},
88+
"type": {
89+
"type": "string",
90+
"enum": [
91+
"Microsoft.ManagedIdentity/userAssignedIdentities/federatedIdentityCredentials"
92+
]
93+
}
94+
},
95+
"required": [
96+
"apiVersion",
97+
"name",
98+
"properties",
99+
"type"
100+
],
101+
"description": "Microsoft.ManagedIdentity/userAssignedIdentities/federatedIdentityCredentials"
102+
}
103+
},
104+
"definitions": {
105+
"FederatedIdentityCredentialProperties": {
106+
"type": "object",
107+
"properties": {
108+
"audiences": {
109+
"oneOf": [
110+
{
111+
"type": "array",
112+
"items": {
113+
"type": "string"
114+
}
115+
},
116+
{
117+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
118+
}
119+
],
120+
"description": "The list of audiences that can appear in the issued token."
121+
},
122+
"issuer": {
123+
"type": "string",
124+
"format": "uri",
125+
"description": "The URL of the issuer to be trusted."
126+
},
127+
"subject": {
128+
"type": "string",
129+
"description": "The identifier of the external identity."
130+
}
131+
},
132+
"required": [
133+
"audiences",
134+
"issuer",
135+
"subject"
136+
],
137+
"description": "The properties associated with a federated identity credential."
138+
},
139+
"userAssignedIdentities_federatedIdentityCredentials_childResource": {
140+
"type": "object",
141+
"properties": {
142+
"apiVersion": {
143+
"type": "string",
144+
"enum": [
145+
"2022-01-31-preview"
146+
]
147+
},
148+
"name": {
149+
"type": "string",
150+
"description": "The name of the federated identity credential resource."
151+
},
152+
"properties": {
153+
"oneOf": [
154+
{
155+
"$ref": "#/definitions/FederatedIdentityCredentialProperties"
156+
},
157+
{
158+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
159+
}
160+
],
161+
"description": "The properties associated with a federated identity credential."
162+
},
163+
"type": {
164+
"type": "string",
165+
"enum": [
166+
"federatedIdentityCredentials"
167+
]
168+
}
169+
},
170+
"required": [
171+
"apiVersion",
172+
"name",
173+
"properties",
174+
"type"
175+
],
176+
"description": "Microsoft.ManagedIdentity/userAssignedIdentities/federatedIdentityCredentials"
177+
}
178+
}
179+
}

0 commit comments

Comments
 (0)