From cc107fbe594e548a687c5cae22b57a558d87cc88 Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Tue, 16 Jun 2020 13:50:11 -0700 Subject: [PATCH 1/3] Add missing private link fields for CDN version 2020-04-15. --- .../Microsoft.Cdn/stable/2020-04-15/cdn.json | 16 +++++++++++++++ .../2020-04-15/examples/Endpoints_Create.json | 20 +++++++++++++++---- 2 files changed, 32 insertions(+), 4 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" } }, { From 7a6fa178c0b4274bfa2c54790c618773c0f2dcf4 Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Mon, 22 Jun 2020 16:22:27 -0700 Subject: [PATCH 2/3] Fix examples for CDN endpoint get, list, and update in 2020-04-15 --- .../2020-04-15/examples/Endpoints_Get.json | 5 ++- .../examples/Endpoints_ListByProfile.json | 5 ++- .../2020-04-15/examples/Endpoints_Update.json | 38 ++----------------- 3 files changed, 12 insertions(+), 36 deletions(-) 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..0788d26aeacb 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 @@ -22,7 +22,6 @@ }, "location": "WestCentralUs", "properties": { - "hostName": "endpoint1.azureedge.net", "originHostHeader": null, "provisioningState": "Creating", "resourceState": "Creating", @@ -30,38 +29,6 @@ "isHttpsAllowed": true, "queryStringCachingBehavior": "IgnoreQueryString", "originPath": null, - "origins": [ - { - "name": "www-bing-com", - "properties": { - "hostName": "www.bing.com", - "httpPort": 80, - "httpsPort": 443, - "originHostHeader": "www.someDomain2.net", - "priority": 2, - "weight": 50, - "enabled": true - } - } - ], - "originGroups": [ - { - "name": "originGroup1", - "properties": { - "healthProbeSettings": { - "probePath": "/health.aspx", - "probeRequestType": "GET", - "probeProtocol": "Http", - "probeIntervalInSeconds": 120 - }, - "origins": [ - { - "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-bing-com" - } - ] - } - } - ], "defaultOriginGroup": { "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/originGroups/originGroup1" }, @@ -101,7 +68,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" } } ], From 721f9b85bac7b4ecb27ee1e9d92d26433e7bc906 Mon Sep 17 00:00:00 2001 From: Landon Smith Date: Tue, 23 Jun 2020 11:43:40 -0700 Subject: [PATCH 3/3] Fix CDN Endpoints_Update example. --- .../2020-04-15/examples/Endpoints_Update.json | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) 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 0788d26aeacb..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 @@ -22,6 +22,7 @@ }, "location": "WestCentralUs", "properties": { + "hostName": "endpoint1.azureedge.net", "originHostHeader": null, "provisioningState": "Creating", "resourceState": "Creating", @@ -29,6 +30,41 @@ "isHttpsAllowed": true, "queryStringCachingBehavior": "IgnoreQueryString", "originPath": null, + "origins": [ + { + "name": "www-bing-com", + "properties": { + "hostName": "www.bing.com", + "httpPort": 80, + "httpsPort": 443, + "originHostHeader": "www.someDomain2.net", + "priority": 2, + "weight": 50, + "enabled": true, + "privateLinkResourceId": "/subscriptions/subid/resourcegroups/rg1/providers/Microsoft.Network/privateLinkServices/pls1", + "privateLinkLocation": "eastus", + "privateLinkApprovalMessage": "Please approve the connection request for this Private Link" + } + } + ], + "originGroups": [ + { + "name": "originGroup1", + "properties": { + "healthProbeSettings": { + "probePath": "/health.aspx", + "probeRequestType": "GET", + "probeProtocol": "Http", + "probeIntervalInSeconds": 120 + }, + "origins": [ + { + "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/origins/www-bing-com" + } + ] + } + } + ], "defaultOriginGroup": { "id": "/subscriptions/subid/resourceGroups/RG/providers/Microsoft.Cdn/profiles/profile1/endpoints/endpoint1/originGroups/originGroup1" },