CodeGen from PR 13951 in Azure/azure-rest-api-specs

SDKAuto · SDKAuto · commit 690c46911bdf · 2021-04-15T07:27:58.000Z
Merge b8fa252e6520f4dc59fe90f15cd26f45f78e74d5 into 7a2cc29033fe4027ef421267f1684efbd0d40a93
diff --git a/schemas/2015-05-01/Microsoft.Insights.Application.json b/schemas/2015-05-01/Microsoft.Insights.Application.json
@@ -154,6 +154,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -494,6 +511,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -1112,6 +1146,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -1437,6 +1488,23 @@
           ],
           "description": "Enum indicating if this item definition is owned by a specific user or is shared between all users with access to the Application Insights component."
         },
+        "Type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "query",
+                "function",
+                "folder",
+                "recent"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Enum indicating the type of the Analytics item."
+        },
         "type": {
           "type": "string",
           "enum": [
diff --git a/schemas/2020-10-05-preview/Microsoft.Insights.Application.json b/schemas/2020-10-05-preview/Microsoft.Insights.Application.json
@@ -118,17 +118,6 @@
           ],
           "description": "An XML configuration specification for a WebTest."
         },
-        "ContentValidation": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/WebTestPropertiesContentValidation"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The collection of content validation properties"
-        },
         "Description": {
           "type": "string",
           "description": "User defined description for this WebTest."
@@ -144,17 +133,6 @@
           ],
           "description": "Is the test actively being monitored."
         },
-        "ExpectedHttpStatusCode": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Validate that the WebTest returns the http status code provided."
-        },
         "Frequency": {
           "oneOf": [
             {
@@ -167,17 +145,6 @@
           ],
           "description": "Interval in seconds between test runs for this WebTest. Default value is 300."
         },
-        "IgnoreHttpsStatusCode": {
-          "oneOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "When set, validation will ignore the status code."
-        },
         "Kind": {
           "oneOf": [
             {
@@ -235,43 +202,32 @@
           ],
           "description": "Allow for retries should this WebTest fail."
         },
-        "SSLCertRemainingLifetimeCheck": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "A number of days to check still remain before the the existing SSL cert expires."
+        "SyntheticMonitorId": {
+          "type": "string",
+          "description": "Unique ID of this WebTest. This is typically the same value as the Name field."
         },
-        "SSLCheck": {
+        "Timeout": {
           "oneOf": [
             {
-              "type": "boolean"
+              "type": "integer",
+              "default": "30"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Checks to see if the SSL cert is still valid."
-        },
-        "SyntheticMonitorId": {
-          "type": "string",
-          "description": "Unique ID of this WebTest. This is typically the same value as the Name field."
+          "description": "Seconds until this WebTest will timeout and fail. Default value is 30."
         },
-        "Timeout": {
+        "ValidationRules": {
           "oneOf": [
             {
-              "type": "integer",
-              "default": "30"
+              "$ref": "#/definitions/WebTestPropertiesValidationRules"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Seconds until this WebTest will timeout and fail. Default value is 30."
+          "description": "The collection of validation rule properties"
         }
       },
       "required": [
@@ -292,14 +248,10 @@
       },
       "description": "An XML configuration specification for a WebTest."
     },
-    "WebTestPropertiesContentValidation": {
+    "WebTestPropertiesRequest": {
       "type": "object",
       "properties": {
-        "ContentMatch": {
-          "type": "string",
-          "description": "Content to look for in the return of the WebTest."
-        },
-        "IgnoreCase": {
+        "FollowRedirects": {
           "oneOf": [
             {
               "type": "boolean"
@@ -308,9 +260,27 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "When set, this value makes the ContentMatch validation case insensitive."
+          "description": "Follow redirects for this web test."
         },
-        "PassIfTextFound": {
+        "Headers": {
+          "oneOf": [
+            {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/HeaderField"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "List of headers and their values to add to the WebTest call."
+        },
+        "HttpVerb": {
+          "type": "string",
+          "description": "Http verb to use for this web test."
+        },
+        "ParseDependentRequests": {
           "oneOf": [
             {
               "type": "boolean"
@@ -319,15 +289,45 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "When true, validation will pass if there is a match for the ContentMatch string.  If false, validation will fail if there is a match"
+          "description": "Parse Dependent request for this WebTest."
+        },
+        "RequestBody": {
+          "type": "string",
+          "description": "Base64 encoded string body to send with this web test."
+        },
+        "RequestUrl": {
+          "type": "string",
+          "description": "Url location to test."
         }
       },
-      "description": "The collection of content validation properties"
+      "description": "The collection of request properties"
     },
-    "WebTestPropertiesRequest": {
+    "WebTestPropertiesValidationRules": {
       "type": "object",
       "properties": {
-        "FollowRedirects": {
+        "ContentValidation": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/WebTestPropertiesValidationRulesContentValidation"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The collection of content validation properties"
+        },
+        "ExpectedHttpStatusCode": {
+          "oneOf": [
+            {
+              "type": "integer"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Validate that the WebTest returns the http status code provided."
+        },
+        "IgnoreHttpsStatusCode": {
           "oneOf": [
             {
               "type": "boolean"
@@ -336,27 +336,41 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Follow redirects for this web test."
+          "description": "When set, validation will ignore the status code."
         },
-        "Headers": {
+        "SSLCertRemainingLifetimeCheck": {
           "oneOf": [
             {
-              "type": "array",
-              "items": {
-                "$ref": "#/definitions/HeaderField"
-              }
+              "type": "integer"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "List of headers and their values to add to the WebTest call."
+          "description": "A number of days to check still remain before the the existing SSL cert expires.  Value must be positive and the SSLCheck must be set to true."
         },
-        "HttpVerb": {
+        "SSLCheck": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Checks to see if the SSL cert is still valid."
+        }
+      },
+      "description": "The collection of validation rule properties"
+    },
+    "WebTestPropertiesValidationRulesContentValidation": {
+      "type": "object",
+      "properties": {
+        "ContentMatch": {
           "type": "string",
-          "description": "Http verb to use for this web test."
+          "description": "Content to look for in the return of the WebTest.  Must not be null or empty."
         },
-        "ParseDependentRequests": {
+        "IgnoreCase": {
           "oneOf": [
             {
               "type": "boolean"
@@ -365,18 +379,21 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Parse Dependent request for this WebTest."
-        },
-        "RequestBody": {
-          "type": "string",
-          "description": "Base64 encoded string body to send with this web test."
+          "description": "When set, this value makes the ContentMatch validation case insensitive."
         },
-        "RequestUrl": {
-          "type": "string",
-          "description": "Url location to test."
+        "PassIfTextFound": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "When true, validation will pass if there is a match for the ContentMatch string.  If false, validation will fail if there is a match"
         }
       },
-      "description": "The collection of request properties"
+      "description": "The collection of content validation properties"
     }
   }
 }
diff --git a/schemas/2020-10-20/Microsoft.Insights.Application.json b/schemas/2020-10-20/Microsoft.Insights.Application.json
