diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json index 59d901ecd262..f0ef93e4574b 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/preview/2021-04-01-preview/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json @@ -6,19 +6,38 @@ "subscriptionId": "subid", "parameters": { "properties": { + "additionalLocations": [ + { + "location": "Australia East", + "sku": { + "name": "Premium", + "capacity": 3 + }, + "zones": [ + "1", + "2", + "3" + ], + "virtualNetworkConfiguration": { + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimaeavnet/subnets/default" + }, + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apim-australia-east-publicip" + } + ], "virtualNetworkConfiguration": { - "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimService1v2/subnets/default" + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-apim-japaneast/subnets/apim2" }, - "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apimService1ip", - "virtualNetworkType": "External" + "virtualNetworkType": "External", + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/publicip-apim-japan-east" }, "sku": { "name": "Premium", - "capacity": 2 + "capacity": 3 }, "zones": [ "1", - "2" + "2", + "3" ] } }, @@ -34,17 +53,17 @@ "name": "apimService1", "type": "Microsoft.ApiManagement/service", "tags": {}, - "location": "West Europe", - "etag": "AAAAAABlaZ0=", + "location": "Japan East", + "etag": "AAAAAAAWBIU=", "properties": { - "publisherEmail": "foobar@contoso.com", - "publisherName": "Microsoft", + "publisherEmail": "contoso@microsoft.com", + "publisherName": "apimPublisher", "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com", "provisioningState": "Succeeded", "targetProvisioningState": "", - "createdAtUtc": "2016-04-12T00:20:15.6018952Z", + "createdAtUtc": "2021-04-08T23:41:35.6447381Z", "gatewayUrl": "https://apimService1.azure-api.net", - "gatewayRegionalUrl": "https://apimService1-westeurope-01.regional.azure-api.net", + "gatewayRegionalUrl": "https://apimService1-japaneast-01.regional.azure-api.net", "portalUrl": "https://apimService1.portal.azure-api.net", "developerPortalUrl": "https://apimService1.developer.azure-api.net", "managementApiUrl": "https://apimService1.management.azure-api.net", @@ -59,51 +78,84 @@ }, { "type": "Proxy", - "hostName": "proxy.msitesting.net", - "keyVaultId": "https://demo-msi-keyvault.vault.azure.net/secrets/msicertificate", + "hostName": "mycustomdomain.int-azure-api.net", "negotiateClientCertificate": false, "certificate": { - "expiry": "2020-12-18T11:11:47+00:00", - "thumbprint": "9833D531D7A4XXXX766F2A85908BD3692E0BD3F", - "subject": "CN=*.msitesting.net" + "expiry": "2022-06-09T23:59:59+00:00", + "thumbprint": "2994B5FFB8F76B3C687D324A8DEE0432C1ED18CD", + "subject": "CN=mycustomdomain.int-azure-api.net" }, "defaultSslBinding": true, - "certificateSource": "Custom" + "certificateSource": "Managed" } ], "publicIPAddresses": [ - "13.94.XXX.188" + "20.78.XXX.217" + ], + "additionalLocations": [ + { + "location": "Australia East", + "sku": { + "name": "Premium", + "capacity": 3 + }, + "zones": [ + "1", + "2", + "3" + ], + "publicIPAddresses": [ + "20.XXX.1.35" + ], + "virtualNetworkConfiguration": { + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimaeavnet/subnets/default" + }, + "gatewayRegionalUrl": "https://apimService1-australiaeast-01.regional.azure-api.net", + "disableGateway": false, + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apim-australia-east-publicip", + "platformVersion": "stv2" + } ], "virtualNetworkConfiguration": { - "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimService1v2/subnets/default" + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-apim-japaneast/subnets/apim2" }, - "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apimService1ip", - "virtualNetworkType": "External", "customProperties": { - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False" + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false" }, - "disableGateway": false + "virtualNetworkType": "Internal", + "disableGateway": false, + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/publicip-apim-japan-east", + "publicNetworkAccess": "Enabled", + "platformVersion": "stv2" }, "sku": { "name": "Premium", - "capacity": 2 - }, - "identity": { - "type": "SystemAssigned", - "principalId": "ca1d33f7-XXXX-42ec-b3e9-XXXX", - "tenantId": "72f988bf-XXXX-41af-91ab-2d7cd011db47" + "capacity": 3 }, "zones": [ "1", - "2" - ] + "2", + "3" + ], + "systemData": { + "lastModifiedBy": "contoso@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-21T20:04:21.6108974Z" + } } } } diff --git a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2021-08-01/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2021-08-01/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json index aa4656f77d73..d25feedacf55 100644 --- a/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2021-08-01/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json +++ b/specification/apimanagement/resource-manager/Microsoft.ApiManagement/stable/2021-08-01/examples/ApiManagementUpdateServiceToNewVnetAndAZs.json @@ -6,19 +6,38 @@ "subscriptionId": "subid", "parameters": { "properties": { + "additionalLocations": [ + { + "location": "Australia East", + "sku": { + "name": "Premium", + "capacity": 3 + }, + "zones": [ + "1", + "2", + "3" + ], + "virtualNetworkConfiguration": { + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimaeavnet/subnets/default" + }, + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apim-australia-east-publicip" + } + ], "virtualNetworkConfiguration": { - "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimService1v2/subnets/default" + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-apim-japaneast/subnets/apim2" }, - "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apimService1ip", - "virtualNetworkType": "External" + "virtualNetworkType": "External", + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/publicip-apim-japan-east" }, "sku": { "name": "Premium", - "capacity": 2 + "capacity": 3 }, "zones": [ "1", - "2" + "2", + "3" ] } }, @@ -33,18 +52,17 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ApiManagement/service/apimService1", "name": "apimService1", "type": "Microsoft.ApiManagement/service", - "tags": {}, - "location": "West Europe", - "etag": "AAAAAABlaZ0=", + "location": "Japan East", + "etag": "AAAAAAAWBIU=", "properties": { - "publisherEmail": "foobar@contoso.com", - "publisherName": "Microsoft", + "publisherEmail": "contoso@microsoft.com", + "publisherName": "apimPublisher", "notificationSenderEmail": "apimgmt-noreply@mail.windowsazure.com", "provisioningState": "Succeeded", "targetProvisioningState": "", - "createdAtUtc": "2016-04-12T00:20:15.6018952Z", + "createdAtUtc": "2021-04-08T23:41:35.6447381Z", "gatewayUrl": "https://apimService1.azure-api.net", - "gatewayRegionalUrl": "https://apimService1-westeurope-01.regional.azure-api.net", + "gatewayRegionalUrl": "https://apimService1-japaneast-01.regional.azure-api.net", "portalUrl": "https://apimService1.portal.azure-api.net", "developerPortalUrl": "https://apimService1.developer.azure-api.net", "managementApiUrl": "https://apimService1.management.azure-api.net", @@ -59,51 +77,84 @@ }, { "type": "Proxy", - "hostName": "proxy.msitesting.net", - "keyVaultId": "https://demo-msi-keyvault.vault.azure.net/secrets/msicertificate", + "hostName": "mycustomdomain.int-azure-api.net", "negotiateClientCertificate": false, "certificate": { - "expiry": "2020-12-18T11:11:47+00:00", - "thumbprint": "9833D531D7A4XXXX766F2A85908BD3692E0BD3F", - "subject": "CN=*.msitesting.net" + "expiry": "2022-06-09T23:59:59+00:00", + "thumbprint": "2994B5FFB8F76B3C687D324A8DEE0432C1ED18CD", + "subject": "CN=mycustomdomain.int-azure-api.net" }, "defaultSslBinding": true, - "certificateSource": "Custom" + "certificateSource": "Managed" } ], "publicIPAddresses": [ - "13.94.XXX.188" + "20.78.248.217" + ], + "additionalLocations": [ + { + "location": "Australia East", + "sku": { + "name": "Premium", + "capacity": 3 + }, + "zones": [ + "1", + "2", + "3" + ], + "publicIPAddresses": [ + "20.213.1.35" + ], + "virtualNetworkConfiguration": { + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimaeavnet/subnets/default" + }, + "gatewayRegionalUrl": "https://apimService1-australiaeast-01.regional.azure-api.net", + "disableGateway": false, + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apim-australia-east-publicip", + "platformVersion": "stv2" + } ], "virtualNetworkConfiguration": { - "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/apimService1v2/subnets/default" + "subnetResourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet-apim-japaneast/subnets/apim2" }, - "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/apimService1ip", - "virtualNetworkType": "External", "customProperties": { - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "False", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "True", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "False", - "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "False" + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30": "false", + "Microsoft.WindowsAzure.ApiManagement.Gateway.Protocols.Server.Http2": "false" }, - "disableGateway": false + "virtualNetworkType": "Internal", + "disableGateway": false, + "publicIpAddressId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/publicip-apim-japan-east", + "publicNetworkAccess": "Enabled", + "platformVersion": "stv2" }, "sku": { "name": "Premium", - "capacity": 2 - }, - "identity": { - "type": "SystemAssigned", - "principalId": "ca1d33f7-XXXX-42ec-b3e9-XXXX", - "tenantId": "72f988bf-XXXX-41af-91ab-2d7cd011db47" + "capacity": 3 }, "zones": [ "1", - "2" - ] + "2", + "3" + ], + "systemData": { + "lastModifiedBy": "contoso@microsoft.com", + "lastModifiedByType": "User", + "lastModifiedAt": "2022-01-21T20:04:21.6108974Z" + } } } }