From 496d55d8616e9f4172d3753459045b001762d39f Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Thu, 25 Jun 2020 01:32:53 -0700 Subject: [PATCH] Add missing private link fields for CDN version 2020-04-15 (#9858) * Add missing private link fields for CDN version 2020-04-15. * Fix examples for CDN endpoint get, list, and update in 2020-04-15 * Fix CDN Endpoints_Update example. --- .../Microsoft.Cdn/stable/2020-04-15/cdn.json | 16 +++++++++++++++ .../2020-04-15/examples/Endpoints_Create.json | 20 +++++++++++++++---- .../2020-04-15/examples/Endpoints_Get.json | 5 ++++- .../examples/Endpoints_ListByProfile.json | 5 ++++- .../2020-04-15/examples/Endpoints_Update.json | 10 ++++++++-- 5 files changed, 48 insertions(+), 8 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 index 72cf5b68f35b..5d621303e558 100644 --- 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 @@ -4227,6 +4227,22 @@ "enabled": { "description": "Origin is enabled for load balancing or not. By default, origin is always enabled.", "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" + }, + "privateLinkApprovalMessage": { + "description": "A custom message to be included in the approval request to connect to the Private Link.", + "type": "string" } }, "x-ms-azure-resource": true diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Create.json index 81fce9324123..90f9f58d5ccc 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Create.json @@ -86,7 +86,10 @@ "originHostHeader": "www.someDomain1.net", "priority": 1, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } }, { @@ -162,7 +165,10 @@ "originHostHeader": "www.someDomain1.net", "priority": 1, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } }, { @@ -298,7 +304,10 @@ "originHostHeader": "www.someDomain1.net", "priority": 1, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } }, { @@ -434,7 +443,10 @@ "originHostHeader": "www.someDomain1.net", "priority": 1, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } }, { diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Get.json index 039687fc7b8d..07ce9e40f462 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Get.json @@ -33,7 +33,10 @@ "originHostHeader": "www.someDomain2.net", "priority": 2, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } } ], diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_ListByProfile.json index f5cb3c0f6fe2..1dddea533433 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_ListByProfile.json @@ -34,7 +34,10 @@ "originHostHeader": "www.someDomain2.net", "priority": 2, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } } ], diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Update.json index bad861f930d3..2f2e1d04ca5c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2020-04-15/examples/Endpoints_Update.json @@ -40,7 +40,10 @@ "originHostHeader": "www.someDomain2.net", "priority": 2, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } } ], @@ -101,7 +104,10 @@ "originHostHeader": "www.someDomain2.net", "priority": 2, "weight": 50, - "enabled": true + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" } } ],