Merge pull request #2568 from Azure/jcotillo/fix_msft_insights_ref

jorgecotillo · web-flow · commit 987c71958e70 · 2022-09-09T11:29:12.000-07:00
[Microsoft.Insights] Fix cyclic reference
diff --git a/generator/processors/Microsoft.SecurityInsights.ts b/generator/processors/Microsoft.SecurityInsights.ts
@@ -6,4 +6,5 @@ import { replaceCyclicRef } from './helpers';
 export const postProcessor: SchemaPostProcessor = async (namespace, apiVersion, schema) => {
   replaceCyclicRef(schema.definitions?.MetadataDependencies?.properties?.criteria?.oneOf[0]?.items);
   replaceCyclicRef(schema.definitions?.AutomationRuleCondition?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.AutomationRuleCondition?.oneOf[2]);
 }
diff --git a/schemas/2022-05-01-preview/Microsoft.SecurityInsights.json b/schemas/2022-05-01-preview/Microsoft.SecurityInsights.json
@@ -1548,7 +1548,7 @@
           "$ref": "#/definitions/PropertyChangedConditionProperties"
         },
         {
-          "$ref": "#/definitions/PropertyConditionProperties"
+          "type": "object"
         }
       ],
       "properties": {},
diff --git a/schemas/2022-06-01-preview/Microsoft.SecurityInsights.json b/schemas/2022-06-01-preview/Microsoft.SecurityInsights.json
@@ -1548,7 +1548,7 @@
           "$ref": "#/definitions/PropertyChangedConditionProperties"
         },
         {
-          "$ref": "#/definitions/PropertyConditionProperties"
+          "type": "object"
         }
       ],
       "properties": {},
diff --git a/schemas/2022-07-01-preview/Microsoft.SecurityInsights.json b/schemas/2022-07-01-preview/Microsoft.SecurityInsights.json
@@ -1549,7 +1549,7 @@
           "$ref": "#/definitions/PropertyChangedConditionProperties"
         },
         {
-          "$ref": "#/definitions/PropertyConditionProperties"
+          "type": "object"
         }
       ],
       "properties": {},
diff --git a/schemas/2022-08-01-preview/Microsoft.SecurityInsights.json b/schemas/2022-08-01-preview/Microsoft.SecurityInsights.json
@@ -1588,7 +1588,7 @@
           "$ref": "#/definitions/PropertyChangedConditionProperties"
         },
         {
-          "$ref": "#/definitions/PropertyConditionProperties"
+          "type": "object"
         }
       ],
       "properties": {},
diff --git a/schemas/2022-09-01-preview/Microsoft.SecurityInsights.json b/schemas/2022-09-01-preview/Microsoft.SecurityInsights.json
@@ -1620,7 +1620,7 @@
           "$ref": "#/definitions/PropertyArrayChangedConditionProperties"
         },
         {
-          "$ref": "#/definitions/PropertyArrayConditionProperties"
+          "type": "object"
         },
         {
           "$ref": "#/definitions/PropertyChangedConditionProperties"

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,5 @@ import { replaceCyclicRef } from './helpers';`
`6`	`6`	`export const postProcessor: SchemaPostProcessor = async (namespace, apiVersion, schema) => {`
`7`	`7`	`replaceCyclicRef(schema.definitions?.MetadataDependencies?.properties?.criteria?.oneOf[0]?.items);`
`8`	`8`	`replaceCyclicRef(schema.definitions?.AutomationRuleCondition?.oneOf[0]);`
	`9`	`+ replaceCyclicRef(schema.definitions?.AutomationRuleCondition?.oneOf[2]);`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1548,7 +1548,7 @@`
`1548`	`1548`	`"$ref": "#/definitions/PropertyChangedConditionProperties"`
`1549`	`1549`	`},`
`1550`	`1550`	`{`
`1551`		`- "$ref": "#/definitions/PropertyConditionProperties"`
	`1551`	`+ "type": "object"`
`1552`	`1552`	`}`
`1553`	`1553`	`],`
`1554`	`1554`	`"properties": {},`
Original file line number	Diff line number	Diff line change
`@@ -1549,7 +1549,7 @@`
`1549`	`1549`	`"$ref": "#/definitions/PropertyChangedConditionProperties"`
`1550`	`1550`	`},`
`1551`	`1551`	`{`
`1552`		`- "$ref": "#/definitions/PropertyConditionProperties"`
	`1552`	`+ "type": "object"`
`1553`	`1553`	`}`
`1554`	`1554`	`],`
`1555`	`1555`	`"properties": {},`
Original file line number	Diff line number	Diff line change
`@@ -1588,7 +1588,7 @@`
`1588`	`1588`	`"$ref": "#/definitions/PropertyChangedConditionProperties"`
`1589`	`1589`	`},`
`1590`	`1590`	`{`
`1591`		`- "$ref": "#/definitions/PropertyConditionProperties"`
	`1591`	`+ "type": "object"`
`1592`	`1592`	`}`
`1593`	`1593`	`],`
`1594`	`1594`	`"properties": {},`
Original file line number	Diff line number	Diff line change
`@@ -1620,7 +1620,7 @@`
`1620`	`1620`	`"$ref": "#/definitions/PropertyArrayChangedConditionProperties"`
`1621`	`1621`	`},`
`1622`	`1622`	`{`
`1623`		`- "$ref": "#/definitions/PropertyArrayConditionProperties"`
	`1623`	`+ "type": "object"`
`1624`	`1624`	`},`
`1625`	`1625`	`{`
`1626`	`1626`	`"$ref": "#/definitions/PropertyChangedConditionProperties"`