Skip to content

Commit 3e0680d

Browse files
Remove cyclic references from securityinsights schema
1 parent b3e79f9 commit 3e0680d

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

generator/autogenlist.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { postProcessor as machineLearningPostProcessor } from './processors/Micr
55
import { postProcessor as machineLearningServicesPostProcessor } from './processors/Microsoft.MachineLearningServices';
66
import { postProcessor as storageProcessor } from './processors/Microsoft.Storage';
77
import { postProcessor as policyProcessor } from './processors/Microsoft.Authorization';
8+
import { postProcessor as securityInsightsPostProcessor } from './processors/Microsoft.SecurityInsights';
89
import { lowerCaseEquals } from './utils';
910

1011
// Run "npm run list-basepaths" to discover all the valid readme files to add to this list
@@ -598,6 +599,7 @@ const autoGenList: AutoGenConfig[] = [
598599
{
599600
basePath: 'securityinsights/resource-manager',
600601
namespace: 'Microsoft.SecurityInsights',
602+
postProcessor: securityInsightsPostProcessor,
601603
},
602604
{
603605
basePath: 'storageimportexport/resource-manager',
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { SchemaPostProcessor } from '../models';
2+
import { replaceCyclicRef } from './helpers';
23

34
export const postProcessor: SchemaPostProcessor = (namespace: string, apiVersion: string, schema: any) => {
4-
const cyclicRef = schema.definitions?.ModeValueInfo?.properties?.parameters?.oneOf[0]?.items;
5-
if (cyclicRef && cyclicRef['$ref']) {
6-
delete cyclicRef['$ref'];
7-
cyclicRef['type'] = 'object';
8-
}
5+
replaceCyclicRef(schema.definitions?.ModeValueInfo?.properties?.parameters?.oneOf[0]?.items);
96
}
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import { SchemaPostProcessor } from '../models';
2+
import { replaceCyclicRef } from './helpers';
23

34
export const postProcessor: SchemaPostProcessor = (namespace: string, apiVersion: string, schema: any) => {
4-
const cyclicRef = schema.definitions?.LabelClass?.properties?.subclasses?.oneOf[0]?.additionalProperties;
5-
if (cyclicRef && cyclicRef['$ref']) {
6-
delete cyclicRef['$ref'];
7-
cyclicRef['type'] = 'object';
8-
}
5+
replaceCyclicRef(schema.definitions?.LabelClass?.properties?.subclasses?.oneOf[0]?.additionalProperties);
96
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { SchemaPostProcessor } from '../models';
2+
import { replaceCyclicRef } from './helpers';
3+
4+
export const postProcessor: SchemaPostProcessor = (namespace: string, apiVersion: string, schema: any) => {
5+
replaceCyclicRef(schema.definitions?.MetadataDependencies?.properties?.criteria?.oneOf[0]?.items);
6+
}

generator/processors/helpers.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export const replaceCyclicRef = (cyclicRef: any) => {
2+
if (cyclicRef && cyclicRef['$ref']) {
3+
delete cyclicRef['$ref'];
4+
cyclicRef['type'] = 'object';
5+
}
6+
}

schemas/2014-04-01-preview/deploymentTemplate.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5964,9 +5964,6 @@
59645964
{
59655965
"$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.DomainRegistration.json#/resourceDefinitions/domains_domainOwnershipIdentifiers"
59665966
},
5967-
{
5968-
"$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.DomainRegistration.json#/resourceDefinitions/domains"
5969-
},
59705967
{
59715968
"$ref": "https://schema.management.azure.com/schemas/2018-02-01/Microsoft.DomainRegistration.json#/resourceDefinitions/domains"
59725969
},

schemas/2015-01-01/deploymentTemplate.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6374,9 +6374,6 @@
63746374
{
63756375
"$ref": "https://schema.management.azure.com/schemas/2015-04-01/Microsoft.DomainRegistration.json#/resourceDefinitions/domains_domainOwnershipIdentifiers"
63766376
},
6377-
{
6378-
"$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.DomainRegistration.json#/resourceDefinitions/domains"
6379-
},
63806377
{
63816378
"$ref": "https://schema.management.azure.com/schemas/2018-02-01/Microsoft.DomainRegistration.json#/resourceDefinitions/domains"
63826379
},

schemas/2021-03-01-preview/Microsoft.SecurityInsights.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2385,7 +2385,7 @@
23852385
{
23862386
"type": "array",
23872387
"items": {
2388-
"$ref": "#/definitions/MetadataDependencies"
2388+
"type": "object"
23892389
}
23902390
},
23912391
{

0 commit comments

Comments
 (0)