From 76caff4d9e22ae2969bd4e53e46e2890c3b5a4de Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Thu, 3 Jun 2021 16:02:33 -0700 Subject: [PATCH 1/9] Correct input and output types of checkHostNameAvailability API --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index b4349d0bf0d2..21d26f27167f 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -112,7 +112,7 @@ "description": "Custom domain to be validated.", "required": true, "schema": { - "$ref": "./cdn.json#/definitions/ValidateCustomDomainInput" + "$ref": "./cdn.json#/definitions/CheckNameAvailabilityInput" } }, { @@ -126,7 +126,7 @@ "200": { "description": "OK. The request has succeeded.", "schema": { - "$ref": "./cdn.json#/definitions/ValidateCustomDomainOutput" + "$ref": "./cdn.json#/definitions/CheckNameAvailabilityOutput" } }, "default": { From a3c14973abb83b4040fcda601b8be38c8f699a68 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Thu, 3 Jun 2021 17:10:17 -0700 Subject: [PATCH 2/9] Set CA and SAN to readonly --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 21d26f27167f..a3741785255b 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -4638,7 +4638,8 @@ }, "certificateAuthority": { "description": "Certificate issuing authority.", - "type": "string" + "type": "string", + "readOnly": true }, "useLatestVersion": { "description": "Whether to use the latest version for the certificate", @@ -4647,6 +4648,7 @@ "subjectAlternativeNames": { "description": "The list of SANs.", "type": "array", + "readOnly": true, "items": { "type": "string" } From 88587285eeec3f33049cccff42ce5f54fd24cbe5 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Tue, 8 Jun 2021 15:06:33 -0700 Subject: [PATCH 3/9] Update ValidateSecretInput to include SecretVersion --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index a3741785255b..6d002ed7da3c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -4089,6 +4089,10 @@ "name": "ValidateSecretType", "modelAsString": true } + }, + "secretVersion": { + "description": "Secret version, if customer is using a specific version", + "type": "string" } } }, From 0bce9ef6e9529ad863c0dfa579edf50e78c59147 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Wed, 9 Jun 2021 16:09:36 -0700 Subject: [PATCH 4/9] Nit fix grammar --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 6d002ed7da3c..62fd2d8ae188 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -4091,7 +4091,7 @@ } }, "secretVersion": { - "description": "Secret version, if customer is using a specific version", + "description": "Secret version, if customer is using a specific version.", "type": "string" } } From c46f2411c7379c09467923170da5528238d40b5b Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Mon, 21 Jun 2021 16:25:34 -0700 Subject: [PATCH 5/9] Remove redundant fields and mark certificate properties readonly --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 62fd2d8ae188..654ed9df9e74 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -4009,15 +4009,13 @@ "properties": { "subject": { "description": "Subject name in the certificate.", - "type": "string" + "type": "string", + "readOnly": true }, "expirationDate": { "description": "Certificate expiration date.", - "type": "string" - }, - "thumbprint": { - "description": "Certificate thumbprint.", - "type": "string" + "type": "string", + "readOnly": true } } }, @@ -4042,15 +4040,18 @@ "properties": { "version": { "description": "Certificate version.", - "type": "string" + "type": "string", + "readOnly": true }, "certificateAuthority": { "description": "Certificate issuing authority.", - "type": "string" + "type": "string", + "readOnly": true }, "certificateUrl": { "description": "Complete Url to the certificate", - "type": "string" + "type": "string", + "readOnly": true }, "useLatestVersion": { "description": "Whether to use the latest version for the certificate", @@ -4060,8 +4061,14 @@ "description": "The list of SANs.", "type": "array", "items": { - "type": "string" + "type": "string", + "readOnly": true } + }, + "thumbprint": { + "description": "Certificate thumbprint.", + "type": "string", + "readOnly": true } } }, @@ -4640,22 +4647,9 @@ "description": "Version of the secret to be used", "type": "string" }, - "certificateAuthority": { - "description": "Certificate issuing authority.", - "type": "string", - "readOnly": true - }, "useLatestVersion": { "description": "Whether to use the latest version for the certificate", "type": "boolean" - }, - "subjectAlternativeNames": { - "description": "The list of SANs.", - "type": "array", - "readOnly": true, - "items": { - "type": "string" - } } } }, From 99b8da47bdb5d6d19184d55de2b285531e2ad061 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Mon, 21 Jun 2021 17:52:38 -0700 Subject: [PATCH 6/9] Reoganize parameters and update descriptions --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 74 +++++++++---------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 654ed9df9e74..9a3e4965ed7d 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -2837,7 +2837,7 @@ "tags": [ "SecurityPolicies" ], - "description": "Updates an existing Secret within a profile.", + "description": "Updates an existing security policy within a profile.", "operationId": "SecurityPolicies_Patch", "x-ms-examples": { "SecurityPolicies_Patch": { @@ -2928,7 +2928,7 @@ { "name": "securityPolicyName", "in": "path", - "description": "Name of the Secret under the profile.", + "description": "Name of the security policy under the profile.", "required": true, "type": "string" }, @@ -4007,6 +4007,9 @@ "Certificate": { "description": "Certificate used for https", "properties": { + "type": { + "$ref": "#/definitions/SecretType" + }, "subject": { "description": "Subject name in the certificate.", "type": "string", @@ -4031,28 +4034,23 @@ "description": "Customer Certificate used for https", "allOf": [ { - "$ref": "#/definitions/Certificate" + "$ref": "#/definitions/Certificate", } ], - "required": [ - "certificateUrl" - ], "properties": { - "version": { + "secretSource": { + "description": "Resource reference to the KV certificate. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{certifcateName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", + "$ref": "./cdn.json#/definitions/ResourceReference", + }, + "secretVersion": { "description": "Certificate version.", - "type": "string", - "readOnly": true + "type": "string" }, "certificateAuthority": { "description": "Certificate issuing authority.", "type": "string", "readOnly": true }, - "certificateUrl": { - "description": "Complete Url to the certificate", - "type": "string", - "readOnly": true - }, "useLatestVersion": { "description": "Whether to use the latest version for the certificate", "type": "boolean" @@ -4080,22 +4078,13 @@ "secretType" ], "properties": { - "secretSource": { - "description": "The secret source.", - "$ref": "./cdn.json#/definitions/ResourceReference" - }, "secretType": { "description": "The secret type.", - "enum": [ - "UrlSigningKey", - "ManagedCertificate", - "CustomerCertificate" - ], - "type": "string", - "x-ms-enum": { - "name": "ValidateSecretType", - "modelAsString": true - } + "$ref": "#/definitions/SecretType" + }, + "secretSource": { + "description": "Resource reference to the KV secret. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{secretName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", + "$ref": "./cdn.json#/definitions/ResourceReference" }, "secretVersion": { "description": "Secret version, if customer is using a specific version.", @@ -4572,20 +4561,23 @@ "type": "object", "properties": { "type": { - "description": "The type of the Secret to create.", - "enum": [ - "UrlSigningKey", - "CustomerCertificate", - "ManagedCertificate" - ], - "type": "string", - "x-ms-enum": { - "name": "SecretType", - "modelAsString": true - } + "$ref": "#/definitions/SecretType" } } }, + "SecretType": { + "description": "The type of the secret resource.", + "enum": [ + "UrlSigningKey", + "CustomerCertificate", + "ManagedCertificate" + ], + "type": "string", + "x-ms-enum": { + "name": "SecretType", + "modelAsString": true + } + }, "UrlSigningKeyParameters": { "description": "Url signing key parameters", "x-ms-discriminator-value": "UrlSigningKey", @@ -4605,7 +4597,7 @@ "type": "string" }, "secretSource": { - "description": "Resource reference to the KV secret", + "description": "Resource reference to the KV secret. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{secretName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", "type": "object", "$ref": "./cdn.json#/definitions/ResourceReference" }, @@ -4639,7 +4631,7 @@ ], "properties": { "secretSource": { - "description": "Resource reference to the KV secret", + "description": "Resource reference to the KV certificate. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{certifcateName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", "type": "object", "$ref": "./cdn.json#/definitions/ResourceReference" }, From 22252b8c4e514b6c96eb76bff37d3beade2f7f20 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Mon, 21 Jun 2021 20:11:04 -0700 Subject: [PATCH 7/9] Update examples --- .../2021-06-01/examples/Secrets_Create.json | 60 ++++++++++--------- .../2021-06-01/examples/Secrets_Get.json | 19 +++--- .../examples/Secrets_ListByProfile.json | 31 +++++++--- .../2021-06-01/examples/Secrets_Update.json | 57 +++++++++--------- 4 files changed, 97 insertions(+), 70 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Create.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Create.json index 6d5871628ea2..9e50cb3775ee 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Create.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Create.json @@ -9,14 +9,9 @@ "properties": { "parameters": { "type": "CustomerCertificate", - "subjectAlternativeNames": [ - "foo.contoso.com", - "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", + "secretVersion": "abcdef1234578900abcdef1234567890", "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/secrets/certificatename" }, "useLatestVersion": false } @@ -32,16 +27,19 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -56,16 +54,19 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -80,16 +81,19 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Get.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Get.json index c265f15e2dc4..f133d7183bd8 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Get.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Get.json @@ -15,16 +15,19 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -32,4 +35,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_ListByProfile.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_ListByProfile.json index fa7a7af67021..41f25e4d9c18 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_ListByProfile.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_ListByProfile.json @@ -16,20 +16,37 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" } + }, + { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.Cdn/profiles/profile1/secrets/autogenerated_secret_name", + "type": "Microsoft.Cdn/profiles/secrets", + "name": "69f05517-6aaf-4a1e-a96d-f8c02f66c756-test12-afdx-test-domains-azfdtest-xyz", + "properties": { + "parameters": { + "type": "ManagedCertificate", + "subject": "bar.contoso.com", + "expirationDate": "2025-01-01T00:00:00-00:00" + }, + "provisioningState": "Succeeded", + "deploymentStatus": "InProgress" + } } ] } diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Update.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Update.json index 1e90d8239ac6..2acbca503ebf 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Update.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/examples/Secrets_Update.json @@ -5,19 +5,16 @@ "resourceGroupName": "RG", "profileName": "profile1", "secretName": "secret1", - "secretProperties": { - "parameters": { - "type": "CustomerCertificate", - "subjectAlternativeNames": [ - "foo.contoso.com", - "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + "secret": { + "properties": { + "parameters": { + "type": "CustomerCertificate", + "secretVersion": "abcdef1234578900abcdef1234567890", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/secrets/certificatename" + }, + "useLatestVersion": false + } } } }, @@ -30,16 +27,19 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" @@ -54,16 +54,19 @@ "properties": { "parameters": { "type": "CustomerCertificate", + "subject": "*.contoso.com", + "certificateAuthority": "Symantec", + "expirationDate": "2025-01-01T00:00:00-00:00", + "thumbprint": "ABCDEF1234567890ABCDEF1234567890ABCDEF12", + "secretSource": { + "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vaults/keyvaultname/secrets/certificatename" + }, + "secretVersion": "abcdef1234578900abcdef1234567890", + "useLatestVersion": true, "subjectAlternativeNames": [ "foo.contoso.com", "www3.foo.contoso.com" - ], - "secretVersion": "67c452f83c804aed80aa3a21e523c226", - "certificateAuthority": "Symantec", - "secretSource": { - "id": "/subscriptions/subid/resourcegroups/RG/providers/Microsoft.KeyVault/vault/kvName/certificate/certName" - }, - "useLatestVersion": false + ] }, "provisioningState": "Succeeded", "deploymentStatus": "NotStarted" From 2a114f63eeb02666e0bed7c3c268dd21d09db8c2 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Thu, 24 Jun 2021 12:30:56 -0700 Subject: [PATCH 8/9] Fix typos and expand abbhreviations --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 9a3e4965ed7d..6422c7c15141 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -4039,7 +4039,7 @@ ], "properties": { "secretSource": { - "description": "Resource reference to the KV certificate. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{certifcateName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", + "description": "Resource reference to the Azure Key Vault certificate. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{certificateName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", "$ref": "./cdn.json#/definitions/ResourceReference", }, "secretVersion": { @@ -4083,7 +4083,7 @@ "$ref": "#/definitions/SecretType" }, "secretSource": { - "description": "Resource reference to the KV secret. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{secretName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", + "description": "Resource reference to the Azure Key Vault secret. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{secretName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", "$ref": "./cdn.json#/definitions/ResourceReference" }, "secretVersion": { @@ -4597,7 +4597,7 @@ "type": "string" }, "secretSource": { - "description": "Resource reference to the KV secret. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{secretName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", + "description": "Resource reference to the Azure Key Vault secret. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{secretName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", "type": "object", "$ref": "./cdn.json#/definitions/ResourceReference" }, From ee995587980e807ca9c036e72044e92c3bd04235 Mon Sep 17 00:00:00 2001 From: Jessica Li Date: Thu, 24 Jun 2021 12:33:22 -0700 Subject: [PATCH 9/9] Fix more typo --- .../resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json index 6422c7c15141..135c81f73f1c 100644 --- a/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json +++ b/specification/cdn/resource-manager/Microsoft.Cdn/stable/2021-06-01/afdx.json @@ -4631,7 +4631,7 @@ ], "properties": { "secretSource": { - "description": "Resource reference to the KV certificate. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{certifcateName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", + "description": "Resource reference to the Azure Key Vault certificate. Expected to be in format of /subscriptions/{​​​​​​​​​subscriptionId}​​​​​​​​​/resourceGroups/{​​​​​​​​​resourceGroupName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/providers/Microsoft.KeyVault/vaults/{vaultName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​/secrets/{certificateName}​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​", "type": "object", "$ref": "./cdn.json#/definitions/ResourceReference" },