diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json index 4be8167f677c..e5578818b9d3 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/CommonDefinitions.json @@ -293,6 +293,53 @@ } } }, + "CustomDomainConfiguration": { + "type": "object", + "description": "Configuration properties for apps environment custom domain", + "properties": { + "customDomainVerificationId": { + "description": "Id used to verify domain name ownership", + "type": "string", + "readOnly": true + }, + "dnsSuffix": { + "type": "string", + "description": "Dns suffix for the environment domain", + "x-ms-mutability": [ + "create", + "read" + ] + }, + "certificateValue": { + "format": "byte", + "description": "PFX or PEM blob", + "type": "string", + "x-ms-secret": true + }, + "certificatePassword": { + "format": "byte", + "description": "Certificate password", + "type": "string", + "x-ms-secret": true + }, + "expirationDate": { + "format": "date-time", + "description": "Certificate expiration date.", + "type": "string", + "readOnly": true + }, + "thumbprint": { + "description": "Certificate thumbprint.", + "type": "string", + "readOnly": true + }, + "subjectName": { + "description": "Subject name of the certificate.", + "type": "string", + "readOnly": true + } + } + }, "DefaultErrorResponse": { "description": "App Service error response.", "type": "object", diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironments.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironments.json index 73b7637e59e2..dd884d8b8518 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironments.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ConnectedEnvironments.json @@ -408,6 +408,10 @@ "type": "string", "description": "Application Insights connection string used by Dapr to export Service to Service communication telemetry", "x-ms-secret": true + }, + "customDomainConfiguration": { + "$ref": "./CommonDefinitions.json#/definitions/CustomDomainConfiguration", + "description": "Custom domain configuration for the environment" } }, "x-ms-client-flatten": true diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json index df064119970c..8b547d44b67d 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/ManagedEnvironments.json @@ -794,53 +794,6 @@ } } }, - "CustomDomainConfiguration": { - "type": "object", - "description": "Configuration properties for apps environment custom domain", - "properties": { - "customDomainVerificationId": { - "description": "Id used to verify domain name ownership", - "type": "string", - "readOnly": true - }, - "dnsSuffix": { - "type": "string", - "description": "Dns suffix for the environment domain", - "x-ms-mutability": [ - "create", - "read" - ] - }, - "certificateValue": { - "format": "byte", - "description": "PFX or PEM blob", - "type": "string", - "x-ms-secret": true - }, - "certificatePassword": { - "format": "byte", - "description": "Certificate password", - "type": "string", - "x-ms-secret": true - }, - "expirationDate": { - "format": "date-time", - "description": "Certificate expiration date.", - "type": "string", - "readOnly": true - }, - "thumbprint": { - "description": "Certificate thumbprint.", - "type": "string", - "readOnly": true - }, - "subjectName": { - "description": "Subject name of the certificate.", - "type": "string", - "readOnly": true - } - } - }, "ManagedEnvironment": { "description": "An environment for hosting container apps", "type": "object", @@ -921,7 +874,7 @@ ] }, "customDomainConfiguration": { - "$ref": "#/definitions/CustomDomainConfiguration", + "$ref": "./CommonDefinitions.json#/definitions/CustomDomainConfiguration", "description": "Custom domain configuration for the environment" }, "eventStreamEndpoint": { diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_CreateOrUpdate.json index 75364d7af1e8..665953cbf672 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_CreateOrUpdate.json @@ -14,7 +14,12 @@ "location": "East US", "properties": { "staticIp": "1.2.3.4", - "daprAIConnectionString": "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://northcentralus-0.in.applicationinsights.azure.com/" + "daprAIConnectionString": "InstrumentationKey=00000000-0000-0000-0000-000000000000;IngestionEndpoint=https://northcentralus-0.in.applicationinsights.azure.com/", + "customDomainConfiguration": { + "dnsSuffix": "www.my-name.com", + "certificateValue": "PFX-or-PEM-blob", + "certificatePassword": "private key password" + } } } }, @@ -34,7 +39,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "testenv.k4apps.io", - "staticIp": "1.2.3.4" + "staticIp": "1.2.3.4", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name.com", + "subjectName": "CN=www.my-name.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } } }, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Get.json index fb792f8e3102..c29fa2fb291e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Get.json @@ -27,7 +27,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "examplekenv.k4apps.io", - "staticIp": "20.42.33.145" + "staticIp": "20.42.33.145", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name.com", + "subjectName": "CN=www.my-name.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } } } diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListByResourceGroup.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListByResourceGroup.json index b9e4aa8202f6..dad1d416fc5e 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListByResourceGroup.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListByResourceGroup.json @@ -22,7 +22,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "sample1.k4apps.io", - "staticIp": "20.42.33.145" + "staticIp": "20.42.33.145", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name.com", + "subjectName": "CN=www.my-name.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } }, { @@ -39,7 +46,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "sample2.k4apps.io", - "staticIp": "52.142.21.61" + "staticIp": "52.142.21.61", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name2.com", + "subjectName": "CN=www.my-name2.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListBySubscription.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListBySubscription.json index cea755f1aa23..eb2e79675936 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListBySubscription.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_ListBySubscription.json @@ -17,7 +17,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "sample1.k4apps.io", - "staticIp": "20.42.33.145" + "staticIp": "20.42.33.145", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name.com", + "subjectName": "CN=www.my-name.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } }, { @@ -30,7 +37,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "sample2.k4apps.io", - "staticIp": "52.142.21.61" + "staticIp": "52.142.21.61", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name2.com", + "subjectName": "CN=www.my-name2.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } } ] diff --git a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Patch.json b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Patch.json index f894173a2738..9a04c25daa8d 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Patch.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2022-06-01-preview/examples/ConnectedEnvironments_Patch.json @@ -27,7 +27,14 @@ "provisioningState": "Succeeded", "deploymentErrors": null, "defaultDomain": "testenv.k4apps.io", - "staticIp": "20.42.33.145" + "staticIp": "20.42.33.145", + "customDomainConfiguration": { + "customDomainVerificationId": "custom domain verification id", + "dnsSuffix": "www.my-name.com", + "subjectName": "CN=www.my-name.com", + "expirationDate": "2022-11-06T04:00:00Z", + "thumbprint": "CERTIFICATE_THUMBPRINT" + } } } }