Fix multiple S360 correctness issues related to CDN (#17)

* Fix multiple S360 corretness issues related to CDN * Fix privateEndpointStatus location issue Co-authored-by: Bo Zhang <bzhan@microsoft.com>
jorinmejia · Nov 4, 2021 · 2f1a9cb · 2f1a9cb
1 parent ab7341d
commit 2f1a9cb
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 24 deletions.
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
@@ -4478,6 +4478,14 @@
             "name": "EnabledState",
             "modelAsString": true
           }
+        },
+        "originResponseTimeoutSeconds": {
+          "description": "Send and receive timeout on forwarding request to the origin. When timeout is reached, the request fails and returns.",
+          "type": "integer",
+          "format": "int32",
+          "minimum": 16,
+          "maximum": 240,
+          "exclusiveMinimum": false
         }
       }
     },
@@ -4620,7 +4628,19 @@
         {
           "$ref": "#/definitions/SecretParameters"
         }
-      ]
+      ],
+      "properties": {
+        "subject": {
+          "description": "Subject name in the certificate.",
+          "type": "string",
+          "readOnly": true
+        },
+        "expirationDate": {
+          "description": "Certificate expiration date.",
+          "type": "string",
+          "readOnly": true
+        }
+      }
     },
     "CustomerCertificateParameters": {
       "description": "Customer Certificate used for https",
@@ -4647,6 +4667,34 @@
         "useLatestVersion": {
           "description": "Whether to use the latest version for the certificate",
           "type": "boolean"
+        },
+        "subject": {
+          "description": "Subject name in the certificate.",
+          "type": "string",
+          "readOnly": true
+        },
+        "expirationDate": {
+          "description": "Certificate expiration date.",
+          "type": "string",
+          "readOnly": true
+        },
+        "certificateAuthority": {
+          "description": "Certificate issuing authority.",
+          "type": "string",
+          "readOnly": true
+        },
+        "subjectAlternativeNames": {
+          "description": "The list of SANs.",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "readOnly": true
+          }
+        },
+        "thumbprint": {
+          "description": "Certificate thumbprint.",
+          "type": "string",
+          "readOnly": true
         }
       }
     },
@@ -4925,7 +4973,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"
@@ -5348,7 +5396,8 @@
                 "enum": [
                   "count",
                   "bytes",
-                  "bitsPerSecond"
+                  "bitsPerSecond",
+                  "milliSeconds"
                 ]
               },
               "groups": {

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
@@ -2478,12 +2478,17 @@
           "description": "Provisioning status of the profile.",
           "type": "string"
         },
-        "frontdoorId": {
+        "frontDoorId": {
           "readOnly": true,
           "type": "string",
           "description": "The Id of the frontdoor."
         },
-		"originResponseTimeoutSeconds": {
+        "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",
           "format": "int32",
@@ -3136,6 +3141,13 @@
           "description": "Describes if this is negate condition or not",
           "type": "boolean"
         },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
+        },
         "matchValues": {
           "description": "The match value for the condition of the delivery rule",
           "type": "array",
@@ -3451,6 +3463,13 @@
           "description": "Describes if this is negate condition or not",
           "type": "boolean"
         },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
+        },
         "matchValues": {
           "description": "The match value for the condition of the delivery rule",
           "type": "array",
@@ -3658,6 +3677,13 @@
           "items": {
             "type": "string"
           }
+        },
+        "transforms": {
+          "description": "List of transforms",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/transform"
+          }
         }
       }
     },
@@ -4433,6 +4459,12 @@
         "privateLinkApprovalMessage": {
           "description": "A custom message to be included in the approval request to connect to the Private Link.",
           "type": "string"
+        },
+        "privateEndpointStatus": {
+          "description": "The approval status for the connection to the Private Link",
+          "$ref": "#/definitions/PrivateEndpointStatus",
+          "type": "string",
+          "readOnly": true
         }
       },
       "x-ms-azure-resource": true
@@ -4668,19 +4700,9 @@
         },
         "privateEndpointStatus": {
           "description": "The approval status for the connection to the Private Link",
+          "$ref": "#/definitions/PrivateEndpointStatus",
           "type": "string",
-          "readOnly": true,
-          "enum": [
-            "Pending",
-            "Approved",
-            "Rejected",
-            "Disconnected",
-            "Timeout"
-          ],
-          "x-ms-enum": {
-            "name": "PrivateEndpointStatus",
-            "modelAsString": true
-          }
+          "readOnly": true
         }
       }
     },
@@ -5686,6 +5708,21 @@
         "modelAsString": false
       }
     },
+    "PrivateEndpointStatus": {
+      "description": "The approval status for the connection to the Private Link",
+      "type": "string",
+      "enum": [
+        "Pending",
+        "Approved",
+        "Rejected",
+        "Disconnected",
+        "Timeout"
+      ],
+      "x-ms-enum": {
+        "name": "PrivateEndpointStatus",
+        "modelAsString": true
+      }
+    },
     "Sku": {
       "description": "The pricing tier (defines a CDN provider, feature list and rate) of the CDN profile.",
       "properties": {

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"
@@ -64,7 +64,7 @@
             "probeProtocol": "Http",
             "probeIntervalInSeconds": 10
           },
-          "responseBasedAfdOriginErrorDetectionSettings": null,
+          "responseBasedAFDOriginErrorDetectionSettings": null,
           "trafficRestorationTimeToHealedOrNewEndpointsInMinutes": 5,
           "provisioningState": "Succeeded",
           "deploymentStatus": "NotStarted"