Merge pull request #9 from ChenglongLiu/chenglong/fixbug2

Fix OBJECT_ADDITIONAL_PROPERTIES
ChenglongLiu · Jan 13, 2022 · 681eb8a · 681eb8a
2 parents 51493ec + de566e6
commit 681eb8a
Show file tree

Hide file tree

Showing 20 changed files with 80 additions and 28 deletions.
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/afdx.json
@@ -4906,7 +4906,7 @@
           "maximum": 50,
           "minimum": 0
         },
-        "responseBasedAfdOriginErrorDetectionSettings": {
+        "responseBasedAFDOriginErrorDetectionSettings": {
           "description": "The JSON object that contains the properties to determine origin health using real requests/responses. This property is currently not supported.",
           "type": "object",
           "$ref": "./cdn.json#/definitions/ResponseBasedOriginErrorDetectionParameters"

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Create.json
@@ -40,7 +40,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"
@@ -64,7 +64,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"
@@ -88,7 +88,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"

diff --git a/...on/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Get.json b/...on/cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Get.json
@@ -24,7 +24,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"

diff --git a/...ource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_ListByProfile.json b/...ource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_ListByProfile.json
@@ -25,7 +25,7 @@
                 "probeProtocol": "Http",
                 "probeIntervalInSeconds": 10
               },
-              "responseBasedAfdOriginErrorDetectionSettings": null,
+              "responseBasedAFDOriginErrorDetectionSettings": null,
               "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
               "provisioningState": "Succeeded",
               "deploymentStatus": "NotStarted"

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Update.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2020-09-01/examples/AFDOriginGroups_Update.json
@@ -40,7 +40,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"
@@ -64,7 +64,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json
@@ -4944,7 +4944,7 @@
           "maximum": 50,
           "minimum": 0
         },
-        "responseBasedAfdOriginErrorDetectionSettings": {
+        "responseBasedAFDOriginErrorDetectionSettings": {
           "description": "The JSON object that contains the properties to determine origin health using real requests/responses. This property is currently not supported.",
           "type": "object",
           "$ref": "./cdn.json#/definitions/ResponseBasedOriginErrorDetectionParameters"

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/cdn.json
@@ -2458,6 +2458,11 @@
           "description": "The pricing tier (defines Azure Front Door Standard or Premium or a CDN provider, feature list and rate) of the profile.",
           "$ref": "#/definitions/Sku"
         },
+        "kind": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Kind of the profile. Used by portal to differentiate traditional CDN profile and new AFD profile."
+        },
         "properties": {
           "x-ms-client-flatten": true,
           "$ref": "#/definitions/ProfileProperties"
@@ -2499,11 +2504,6 @@
           "type": "string",
           "description": "The Id of the frontdoor."
         },
-        "kind": {
-          "readOnly": true,
-          "type": "string",
-          "description": "Kind of the profile. Used by portal to differentiate traditional CDN profile and new AFD profile."
-        },
         "originResponseTimeoutSeconds": {
           "description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns.",
           "type": "integer",
@@ -3960,6 +3960,13 @@
               "Desktop"
             ]
           }
+        },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
         }
       }
     },
@@ -3999,6 +4006,13 @@
           "items": {
             "type": "string"
           }
+        },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
         }
       }
     },
@@ -4046,6 +4060,13 @@
           "items": {
             "type": "string"
           }
+        },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
         }
       }
     },
@@ -4093,6 +4114,13 @@
           "items": {
             "type": "string"
           }
+        },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
         }
       }
     },
@@ -4185,6 +4213,13 @@
           "items": {
             "$ref": "#/definitions/SslProtocol"
           }
+        },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
         }
       }
     },

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Create.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Create.json
@@ -40,7 +40,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"
@@ -64,7 +64,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"
@@ -88,7 +88,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"

diff --git a/...on/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Get.json b/...on/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Get.json
@@ -24,7 +24,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"

diff --git a/...ource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_ListByProfile.json b/...ource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_ListByProfile.json
@@ -25,7 +25,7 @@
                 "probeProtocol": "Http",
                 "probeIntervalInSeconds": 10
               },
-              "responseBasedAfdOriginErrorDetectionSettings": null,
+              "responseBasedAFDOriginErrorDetectionSettings": null,
               "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
               "provisioningState": "Succeeded",
               "deploymentStatus": "NotStarted"

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Update.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/AFDOriginGroups_Update.json
@@ -40,7 +40,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"
@@ -67,7 +67,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"

diff --git a/...cation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json b/...cation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Create.json
@@ -22,6 +22,7 @@
         "sku": {
           "name": "Premium_AzureFrontDoor"
         },
+        "kind": "frontdoor",
         "properties": {
           "provisioningState": "Creating",
           "resourceState": "Creating"
@@ -38,6 +39,7 @@
         "sku": {
           "name": "Premium_AzureFrontDoor"
         },
+        "kind": "frontdoor",
         "properties": {
           "provisioningState": "Creating",
           "resourceState": "Creating"
@@ -54,6 +56,7 @@
         "sku": {
           "name": "Premium_AzureFrontDoor"
         },
+        "kind": "frontdoor",
         "properties": {
           "provisioningState": "Creating",
           "resourceState": "Creating"

diff --git a/...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json b/...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Get.json
@@ -16,6 +16,7 @@
         "sku": {
           "name": "Premium_AzureFrontDoor"
         },
+        "kind": "frontdoor",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceState": "Active"

diff --git a/...fication/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json b/...fication/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_List.json
@@ -16,6 +16,7 @@
             "sku": {
               "name": "Premium_AzureFrontDoor"
             },
+            "kind": "frontdoor",
             "properties": {
               "provisioningState": "Succeeded",
               "resourceState": "Active"
@@ -30,6 +31,7 @@
             "sku": {
               "name": "Premium_AzureFrontDoor"
             },
+            "kind": "frontdoor",
             "properties": {
               "provisioningState": "Succeeded",
               "resourceState": "Active"

diff --git a/...source-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json b/...source-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_ListByResourceGroup.json
@@ -17,6 +17,7 @@
             "sku": {
               "name": "Premium_AzureFrontDoor"
             },
+            "kind": "frontdoor",
             "properties": {
               "provisioningState": "Succeeded",
               "resourceState": "Active"
@@ -31,6 +32,7 @@
             "sku": {
               "name": "Premium_AzureFrontDoor"
             },
+            "kind": "frontdoor",
             "properties": {
               "provisioningState": "Succeeded",
               "resourceState": "Active"

diff --git a/...cation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json b/...cation/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Profiles_Update.json
@@ -23,6 +23,7 @@
         "sku": {
           "name": "Premium_AzureFrontDoor"
         },
+        "kind": "frontdoor",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceState": "Active"
@@ -44,6 +45,7 @@
         "sku": {
           "name": "Premium_AzureFrontDoor"
         },
+        "kind": "frontdoor",
         "properties": {
           "provisioningState": "Succeeded",
           "resourceState": "Active"

diff --git a/...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json b/...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Create.json
@@ -53,7 +53,8 @@
                 "matchValues": [
                   "GET"
                 ],
-                "negateCondition": false
+                "negateCondition": false,
+                "transforms": []
               }
             }
           ],
@@ -87,7 +88,8 @@
                 "matchValues": [
                   "GET"
                 ],
-                "negateCondition": false
+                "negateCondition": false,
+                "transforms": []
               }
             }
           ],
@@ -121,7 +123,8 @@
                 "matchValues": [
                   "GET"
                 ],
-                "negateCondition": false
+                "negateCondition": false,
+                "transforms": []
               }
             }
           ],

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Get.json
@@ -24,7 +24,8 @@
                 "matchValues": [
                   "GET"
                 ],
-                "negateCondition": false
+                "negateCondition": false,
+                "transforms": []
               }
             }
           ],

diff --git a/...on/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json b/...on/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_ListByRuleSet.json
@@ -25,7 +25,8 @@
                     "matchValues": [
                       "GET"
                     ],
-                    "negateCondition": false
+                    "negateCondition": false,
+                    "transforms": []
                   }
                 }
               ],

diff --git a/...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json b/...ification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Rules_Update.json
@@ -40,7 +40,8 @@
                 "matchValues": [
                   "GET"
                 ],
-                "negateCondition": false
+                "negateCondition": false,
+                "transforms": []
               }
             }
           ],
@@ -77,7 +78,8 @@
                 "matchValues": [
                   "GET"
                 ],
-                "negateCondition": false
+                "negateCondition": false,
+                "transforms": []
               }
             }
           ],