Add Origin private link fields to CDN 2020-04-15.

Azure · Apr 27, 2020 · b698cbc · b698cbc
1 parent c71ba0b
commit b698cbc
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 13 deletions.
diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/cdn.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/cdn.json
@@ -4459,6 +4459,26 @@
           "readOnly": true,
           "description": "Provisioning status of the origin.",
           "type": "string"
+        },
+        "privateEndpointStatus": {
+          "description": "The Approval status for the connection to the Private Link",
+          "type": "string",
+          "readOnly": true,
+          "enum": [
+            "Pending",
+            "Approved",
+            "Rejected",
+            "Disconnected",
+            "Timeout"
+          ],
+          "x-ms-enum": {
+            "name": "PrivateEndpointStatus",
+            "modelAsString": false
+          }
+        },
+        "privateLinkApprovalMessage": {
+          "description": "A custom message to be included in the approval request to connect to the Private Link",
+          "type": "string"
         }
       }
     },
@@ -4522,6 +4542,18 @@
         "enabled": {
           "description": "Origin is enabled for load balancing or not",
           "type": "boolean"
+        },
+        "privateLinkAlias": {
+          "description": "The Alias of the Private Link resource. Populating this optional field indicates that this origin is 'Private'",
+          "type": "string"
+        },
+        "privateLinkResourceId": {
+          "description": "The Resource Id of the Private Link resource. Populating this optional field indicates that this backend is 'Private'",
+          "type": "string"
+        },
+        "privateLinkLocation": {
+          "description": "The location of the Private Link resource. Required only if 'privateLinkResourceId' is populated",
+          "type": "string"
         }
       }
     },

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Create.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Create.json
@@ -18,7 +18,9 @@
         "originHostHeader": "www.someDomain.net",
         "priority": 1,
         "weight": 50,
-        "enabled": true
+        "enabled": true,
+        "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
+        "privateLinkLocation": "eastus"
       }
     }
   },
@@ -41,7 +43,11 @@
           "originHostHeader": "www.someDomain.net",
           "priority": 1,
           "weight": 50,
-          "enabled": true
+          "enabled": true,
+          "privateEndpointStatus": "Pending",
+          "privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
+          "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
+          "privateLinkLocation": "eastus"
         }
       }
     },
@@ -63,7 +69,11 @@
           "originHostHeader": "www.someDomain.net",
           "priority": 1,
           "weight": 50,
-          "enabled": true
+          "enabled": true,
+          "privateEndpointStatus": "Pending",
+          "privateLinkApprovalMessage": "",
+          "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
+          "privateLinkLocation": "eastus"
         }
       }
     },
@@ -85,7 +95,11 @@
           "originHostHeader": "www.someDomain.net",
           "priority": 1,
           "weight": 50,
-          "enabled": true
+          "enabled": true,
+          "privateEndpointStatus": "Pending",
+          "privateLinkApprovalMessage": "",
+          "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1",
+          "privateLinkLocation": "eastus"
         }
       }
     }

diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Get.json
@@ -26,7 +26,10 @@
           "originHostHeader": "www.someDomain.net",
           "priority": 1,
           "weight": 50,
-          "enabled": true
+          "enabled": true,
+          "privateEndpointStatus": "Pending",
+          "privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
+          "privateLinkAlias": "APPSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice"
         }
       }
     }

diff --git a/...cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_ListByEndpoint.json b/...cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_ListByEndpoint.json
@@ -27,7 +27,10 @@
               "originHostHeader": "www.someDomain.net",
               "priority": 1,
               "weight": 50,
-              "enabled": true
+              "enabled": true,
+              "privateEndpointStatus": "Pending",
+              "privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
+              "privateLinkAlias": "APPSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice"
             }
           }
         ]

diff --git a/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Update.json b/...ication/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Origins_Update.json
@@ -16,7 +16,8 @@
         "originHostHeader": "www.someDomain2.net",
         "priority": 1,
         "weight": 50,
-        "enabled": true
+        "enabled": true,
+        "privateLinkAlias": "APPSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice"
       }
     }
   },
@@ -39,7 +40,10 @@
           "originHostHeader": "www.someDomain2.net",
           "priority": 1,
           "weight": 50,
-          "enabled": true
+          "enabled": true,
+          "privateEndpointStatus": "Pending",
+          "privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
+          "privateLinkAlias": "APPSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice"
         }
       }
     },
@@ -61,7 +65,10 @@
           "originHostHeader": "www.someDomain2.net",
           "priority": 1,
           "weight": 50,
-          "enabled": true
+          "enabled": true,
+          "privateEndpointStatus": "Pending",
+          "privateLinkApprovalMessage": "Please approve the connection request for this Private Link",
+          "privateLinkAlias": "APPSERVER.d84e61f0-0870-4d24-9746-7438fa0019d1.westus2.azure.privatelinkservice"
         }
       }
     }

diff --git a/specification/cdn/resource-manager/readme.go.md b/specification/cdn/resource-manager/readme.go.md
@@ -13,6 +13,7 @@ go:
 
 ``` yaml $(go) && $(multiapi)
 batch:
+  - tag: package-2020-04
   - tag: package-2019-06
   - tag: package-2019-04
   - tag: package-2017-10
@@ -22,13 +23,13 @@ batch:
   - tag: package-2015-06
 ```
 
-### Tag: package-2019-06 and go
+### Tag: package-2020-04 and go
 
-These settings apply only when `--tag=package-2019-06 --go` is specified on the command line.
+These settings apply only when `--tag=package-2020-04 --go` is specified on the command line.
 Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.
 
-``` yaml $(tag) == 'package-2019-06' && $(go)
-output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-06-15-preview/$(namespace)
+``` yaml $(tag) == 'package-2020-04' && $(go)
+output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-04-15/$(namespace)
 ```
 
 ### Tag: package-2019-04 and go

diff --git a/specification/cdn/resource-manager/readme.md b/specification/cdn/resource-manager/readme.md
@@ -31,6 +31,16 @@ openapi-type: arm
 tag: package-2019-06
 ```
 
+### Tag: package-2020-04
+
+These settings apply only when `--tag=package-2020-04` is specified on the command line.
+
+``` yaml $(tag) == 'package-2020-04'
+input-file:
+- Microsoft.Cdn/stable/2020-04-15/cdn.json
+- Microsoft.Cdn/stable/2020-04-15/cdnwebapplicationfirewall.json
+```
+
 ### Tag: package-2019-12
 
 These settings apply only when `--tag=package-2019-12` is specified on the command line.

diff --git a/specification/cdn/resource-manager/readme.ruby.md b/specification/cdn/resource-manager/readme.ruby.md
@@ -21,6 +21,16 @@ batch:
   - tag: package-2015-06
 ```
 
+### Tag: package-2020-04 and ruby
+
+These settings apply only when `--tag=package-2020-04 --ruby` is specified on the command line.
+Please also specify `--ruby-sdks-folder=<path to the root directory of your azure-sdk-for-ruby clone>`.
+
+``` yaml $(tag) == 'package-2020-04' && $(ruby)
+namespace: "Azure::CDN::Mgmt::V2020_04_15"
+output-folder: $(ruby-sdks-folder)/management/azure_mgmt_cdn/lib
+```
+
 ### Tag: package-2019-06 and ruby
 
 These settings apply only when `--tag=package-2019-06 --ruby` is specified on the command line.