Skip to content

Commit 008e2fb

Browse files
committed
Fixed mv errors
1 parent 1af5526 commit 008e2fb

File tree

4 files changed

+8
-73
lines changed

4 files changed

+8
-73
lines changed

generator/processors/Microsoft.Authorization.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { SchemaPostProcessor } from '../models';
22

33
export const postProcessor: SchemaPostProcessor = (_namespace: string, _apiVersion: string, schema: any) => {
44
const allowedValues = schema.definitions?.ParameterDefinitionsValue?.properties?.allowedValues;
5-
if (allowedValues) {
5+
if (allowedValues && allowedValues.oneOf) {
66
const allowedValuesItems = allowedValues.oneOf[0]?.items
77
removeObjectType(allowedValuesItems);
88
}
@@ -12,6 +12,7 @@ export const postProcessor: SchemaPostProcessor = (_namespace: string, _apiVersi
1212

1313
const assignmentParameter = schema.definitions?.PolicyAssignmentProperties?.properties?.parameters;
1414
removeObjectType(assignmentParameter);
15+
removeDataplaneParameterRestriction(assignmentParameter);
1516

1617
const definitionParameter = schema.definitions?.PolicyDefinitionProperties?.properties?.parameters;
1718
removeObjectType(definitionParameter);
@@ -21,6 +22,7 @@ export const postProcessor: SchemaPostProcessor = (_namespace: string, _apiVersi
2122

2223
const setDefinitionParameter = schema.definitions?.PolicySetDefinitionProperties?.properties?.parameters;
2324
removeObjectType(setDefinitionParameter);
25+
removeDataplaneParameterRestriction(setDefinitionParameter);
2426
}
2527

2628
function removeObjectType(property: any) {
@@ -30,3 +32,8 @@ function removeObjectType(property: any) {
3032
}
3133
}
3234

35+
function removeDataplaneParameterRestriction(property: any) {
36+
if (property?.oneOf && property.oneOf[0]?.additionalProperties && property.oneOf[0]['type'] === 'object') {
37+
delete property['oneOf'];
38+
}
39+
}

schemas/2019-09-01/Microsoft.Authorization.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -392,18 +392,6 @@
392392
"description": "The policy's excluded scopes."
393393
},
394394
"parameters": {
395-
"oneOf": [
396-
{
397-
"type": "object",
398-
"additionalProperties": {
399-
"$ref": "#/definitions/ParameterValuesValue"
400-
},
401-
"properties": {}
402-
},
403-
{
404-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
405-
}
406-
],
407395
"description": "The parameter values for the policy rule. The keys are the parameter names."
408396
},
409397
"policyDefinitionId": {
@@ -569,18 +557,6 @@
569557
"description": "The policy set definition metadata. Metadata is an open ended object and is typically a collection of key value pairs."
570558
},
571559
"parameters": {
572-
"oneOf": [
573-
{
574-
"type": "object",
575-
"additionalProperties": {
576-
"$ref": "#/definitions/ParameterDefinitionsValue"
577-
},
578-
"properties": {}
579-
},
580-
{
581-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
582-
}
583-
],
584560
"description": "The parameter definitions for parameters used in the policy. The keys are the parameter names."
585561
},
586562
"policyDefinitionGroups": {

schemas/2020-03-01/Microsoft.Authorization.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -392,18 +392,6 @@
392392
"description": "The policy's excluded scopes."
393393
},
394394
"parameters": {
395-
"oneOf": [
396-
{
397-
"type": "object",
398-
"additionalProperties": {
399-
"$ref": "#/definitions/ParameterValuesValue"
400-
},
401-
"properties": {}
402-
},
403-
{
404-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
405-
}
406-
],
407395
"description": "The parameter values for the policy rule. The keys are the parameter names."
408396
},
409397
"policyDefinitionId": {
@@ -569,18 +557,6 @@
569557
"description": "The policy set definition metadata. Metadata is an open ended object and is typically a collection of key value pairs."
570558
},
571559
"parameters": {
572-
"oneOf": [
573-
{
574-
"type": "object",
575-
"additionalProperties": {
576-
"$ref": "#/definitions/ParameterDefinitionsValue"
577-
},
578-
"properties": {}
579-
},
580-
{
581-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
582-
}
583-
],
584560
"description": "The parameter definitions for parameters used in the policy. The keys are the parameter names."
585561
},
586562
"policyDefinitionGroups": {

schemas/2020-09-01/Microsoft.Authorization.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -427,18 +427,6 @@
427427
"description": "The policy's excluded scopes."
428428
},
429429
"parameters": {
430-
"oneOf": [
431-
{
432-
"type": "object",
433-
"additionalProperties": {
434-
"$ref": "#/definitions/ParameterValuesValue"
435-
},
436-
"properties": {}
437-
},
438-
{
439-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
440-
}
441-
],
442430
"description": "The parameter values for the policy rule. The keys are the parameter names."
443431
},
444432
"policyDefinitionId": {
@@ -601,18 +589,6 @@
601589
"description": "The policy set definition metadata. Metadata is an open ended object and is typically a collection of key value pairs."
602590
},
603591
"parameters": {
604-
"oneOf": [
605-
{
606-
"type": "object",
607-
"additionalProperties": {
608-
"$ref": "#/definitions/ParameterDefinitionsValue"
609-
},
610-
"properties": {}
611-
},
612-
{
613-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
614-
}
615-
],
616592
"description": "The parameter definitions for parameters used in the policy. The keys are the parameter names."
617593
},
618594
"policyDefinitionGroups": {

0 commit comments

Comments
 (0)