Skip to content

Commit b78e560

Browse files
jorgecotillojorgecotillo
authored
Merge pull request #2529 from Azure/jcotillo/enable_msft_authorization_schema_gen
[Microsoft.Authorization] Re-enable for schema autogen
2 parents e4c7671 + eb0720c commit b78e560

File tree

3 files changed

+77
-36
lines changed

3 files changed

+77
-36
lines changed

‎generator/autogenlist.ts

Lines changed: 73 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,6 @@ const disabledProviders: AutoGenConfig[] = [
8888
basePath: 'videoanalyzer/resource-manager',
8989
namespace: 'Microsoft.Media',
9090
disabledForAutogen: true,
91-
},
92-
// Disabled because the swagger spec contains duplicate API paths and results in schema generation failures, see here for more info: https://github.com/Azure/azure-resource-manager-schemas/issues/2462
93-
{
94-
basePath: 'authorization/resource-manager',
95-
namespace: 'Microsoft.Authorization',
96-
disabledForAutogen: true,
9791
}
9892
];
9993

@@ -104,6 +98,53 @@ const autoGenList: AutoGenConfig[] = [
10498
basePath: 'addons/resource-manager',
10599
namespace: 'Microsoft.Addons',
106100
},
101+
{
102+
basePath: 'authorization/resource-manager',
103+
namespace: 'Microsoft.Authorization',
104+
resourceConfig: [
105+
{
106+
type: 'roleAssignments',
107+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
108+
},
109+
{
110+
type: 'roleDefinitions',
111+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
112+
},
113+
{
114+
type: 'roleAssignmentScheduleRequests',
115+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
116+
},
117+
{
118+
type: 'roleEligibilityScheduleRequests',
119+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
120+
},
121+
{
122+
type: 'roleManagementPolicyAssignments',
123+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
124+
},
125+
{
126+
type: 'roleAssignmentApprovals/stages',
127+
scopes: ScopeType.Tenant
128+
},
129+
{
130+
type: 'accessReviewHistoryDefinitions',
131+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
132+
},
133+
{
134+
type: 'accessReviewScheduleDefinitions',
135+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
136+
},
137+
{
138+
type: 'accessReviewScheduleDefinitions/instances',
139+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
140+
},
141+
{
142+
type: 'accessReviewScheduleSettings',
143+
scopes: ScopeType.Extension | ScopeType.ManagementGroup | ScopeType.ResourceGroup | ScopeType.Subscription | ScopeType.Tenant
144+
},
145+
],
146+
suffix: 'Authz'
147+
},
107148
{
108149
basePath: 'adhybridhealthservice/resource-manager',
109150
namespace: 'Microsoft.ADHybridHealthService',
@@ -174,19 +215,19 @@ const autoGenList: AutoGenConfig[] = [
174215
resourceConfig: [
175216
{
176217
type: 'blueprintAssignments',
177-
scopes: ScopeType.Subcription | ScopeType.ManagementGroup,
218+
scopes: ScopeType.Subscription | ScopeType.ManagementGroup,
178219
},
179220
{
180221
type: 'blueprints',
181-
scopes: ScopeType.Subcription | ScopeType.ManagementGroup,
222+
scopes: ScopeType.Subscription | ScopeType.ManagementGroup,
182223
},
183224
{
184225
type: 'blueprints/artifacts',
185-
scopes: ScopeType.Subcription | ScopeType.ManagementGroup,
226+
scopes: ScopeType.Subscription | ScopeType.ManagementGroup,
186227
},
187228
{
188229
type: 'blueprints/versions',
189-
scopes: ScopeType.Subcription | ScopeType.ManagementGroup,
230+
scopes: ScopeType.Subscription | ScopeType.ManagementGroup,
190231
},
191232
]
192233
},
@@ -246,7 +287,7 @@ const autoGenList: AutoGenConfig[] = [
246287
resourceConfig: [
247288
{
248289
type: 'budgets',
249-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
290+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
250291
},
251292
],
252293
},
@@ -256,15 +297,15 @@ const autoGenList: AutoGenConfig[] = [
256297
resourceConfig: [
257298
{
258299
type: 'exports',
259-
scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup,
300+
scopes: ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup,
260301
},
261302
{
262303
type: 'budgets',
263-
scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
304+
scopes: ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
264305
},
265306
{
266307
type: 'views',
267-
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
308+
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
268309
},
269310
],
270311
postProcessor: costManagementPostProcessor,
@@ -456,7 +497,7 @@ const autoGenList: AutoGenConfig[] = [
456497
resourceConfig: [
457498
{
458499
type: 'eventSubscriptions',
459-
scopes: ScopeType.Extension | ScopeType.Subcription | ScopeType.ResourceGroup,
500+
scopes: ScopeType.Extension | ScopeType.Subscription | ScopeType.ResourceGroup,
460501
},
461502
],
462503
},
@@ -502,7 +543,7 @@ const autoGenList: AutoGenConfig[] = [
502543
resourceConfig: [
503544
{
504545
type: 'scopeAssignments',
505-
scopes: ScopeType.Subcription,
546+
scopes: ScopeType.Subscription,
506547
},
507548
],
508549
},
@@ -558,11 +599,11 @@ const autoGenList: AutoGenConfig[] = [
558599
resourceConfig: [
559600
{
560601
type: 'remediations',
561-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.ManagementGroup,
602+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.ManagementGroup,
562603
},
563604
{
564605
type: 'attestations',
565-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup,
606+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup,
566607
}
567608
]
568609
},
@@ -615,11 +656,11 @@ const autoGenList: AutoGenConfig[] = [
615656
resourceConfig: [
616657
{
617658
type: 'deployments',
618-
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup,
659+
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup,
619660
},
620661
{
621662
type: 'tags',
622-
scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
663+
scopes: ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
623664
},
624665
],
625666
postProcessor: resourcesPostProcessor,
@@ -630,27 +671,27 @@ const autoGenList: AutoGenConfig[] = [
630671
resourceConfig: [
631672
{
632673
type: 'policyDefinitions',
633-
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subcription,
674+
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subscription,
634675
},
635676
{
636677
type: 'policySetDefinitions',
637-
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subcription,
678+
scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subscription,
638679
},
639680
{
640681
type: 'policyAssignments',
641-
scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
682+
scopes: ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
642683
},
643684
{
644685
type: 'policyExemptions',
645-
scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
686+
scopes: ScopeType.ManagementGroup | ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
646687
},
647688
{
648689
type: 'policyPricings',
649-
scopes: ScopeType.ManagementGroup | ScopeType.Subcription,
690+
scopes: ScopeType.ManagementGroup | ScopeType.Subscription,
650691
},
651692
{
652693
type: 'locks',
653-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
694+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
654695
},
655696
],
656697
suffix: 'Resources',
@@ -743,19 +784,19 @@ const autoGenList: AutoGenConfig[] = [
743784
resourceConfig: [
744785
{
745786
type: 'advancedThreatProtectionSettings',
746-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
787+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
747788
},
748789
{
749790
type: 'assessments',
750-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
791+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
751792
},
752793
{
753794
type: 'deviceSecurityGroups',
754-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
795+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
755796
},
756797
{
757798
type: 'iotSensors',
758-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
799+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
759800
},
760801
{
761802
type: 'informationProtectionPolicies',
@@ -767,7 +808,7 @@ const autoGenList: AutoGenConfig[] = [
767808
},
768809
{
769810
type: 'iotSites',
770-
scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
811+
scopes: ScopeType.Subscription | ScopeType.ResourceGroup | ScopeType.Extension,
771812
},
772813
]
773814
},
@@ -949,7 +990,7 @@ const autoGenList: AutoGenConfig[] = [
949990
resourceConfig: [
950991
{
951992
type: 'diagnosticSettings',
952-
scopes: ScopeType.Subcription | ScopeType.Extension,
993+
scopes: ScopeType.Subscription | ScopeType.Extension,
953994
},
954995
{
955996
type: 'guestDiagnosticSettingsAssociation',

‎generator/generate.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ interface RootSchemaConfiguration {
3030

3131
const RootSchemaConfigs: Map<ScopeType, RootSchemaConfiguration> = new Map([
3232
[ScopeType.Tenant, constants.tenantRootSchema],
33-
[ScopeType.Subcription, constants.subscriptionRootSchema],
33+
[ScopeType.Subscription, constants.subscriptionRootSchema],
3434
[ScopeType.ResourceGroup, constants.resourceGroupRootSchema],
3535
[ScopeType.ManagementGroup, constants.managementGroupRootSchema]
3636
]);
@@ -190,7 +190,7 @@ async function generateSchemaConfig(outputFile: string, namespace: string, apiVe
190190
const knownReferences = [
191191
...getSchemaRefs(output, ScopeType.Tenant, 'tenant_resourceDefinitions'),
192192
...getSchemaRefs(output, ScopeType.ManagementGroup, 'managementGroup_resourceDefinitions'),
193-
...getSchemaRefs(output, ScopeType.Subcription, 'subscription_resourceDefinitions'),
193+
...getSchemaRefs(output, ScopeType.Subscription, 'subscription_resourceDefinitions'),
194194
...getSchemaRefs(output, ScopeType.ResourceGroup, 'resourceDefinitions'),
195195
...getSchemaRefs(output, ScopeType.Extension, 'extension_resourceDefinitions'),
196196
];
@@ -226,7 +226,7 @@ async function generateSchemaConfig(outputFile: string, namespace: string, apiVe
226226
}
227227
}
228228

229-
const subscriptionSchemaRefs = references.filter(x => x.scope & ScopeType.Subcription);
229+
const subscriptionSchemaRefs = references.filter(x => x.scope & ScopeType.Subscription);
230230
if (subscriptionSchemaRefs.length > 0) {
231231
console.log('Resource Types (Subscription Scope):');
232232
for (const schemaRef of subscriptionSchemaRefs) {

‎generator/models.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export enum ScopeType {
44
None = 0,
55
Unknown = 1 << 0,
66
Tenant = 1 << 1,
7-
Subcription = 1 << 2,
7+
Subscription = 1 << 2,
88
ResourceGroup = 1 << 3,
99
ManagementGroup = 1 << 4,
1010
Extension = 1 << 5,

0 commit comments

Comments
 (0)