From 06fb40644a1eaad49c89a10e30dcad6c58367b6b Mon Sep 17 00:00:00 2001 From: SINADELL Date: Thu, 5 Aug 2021 14:47:05 -0700 Subject: [PATCH 1/5] Swagger changes for adding secret type AzureFirstpartyManaged certificate --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 24 +++++++++++++++++-- 1 file changed, 22 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 b39caabc9872..866edd444d1c 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 @@ -4065,6 +4065,14 @@ } } }, + "AzureFirstPartyManagedCertificate": { + "description": "Azure First Party Managed Certificate used for https", + "allOf": [ + { + "$ref": "#/definitions/Certificate" + } + ] + }, "ValidateSecretInput": { "description": "Input of the secret to be validated.", "type": "object", @@ -4082,7 +4090,8 @@ "enum": [ "UrlSigningKey", "ManagedCertificate", - "CustomerCertificate" + "CustomerCertificate", + "AzureFirstPartyManagedCertificate" ], "type": "string", "x-ms-enum": { @@ -4558,7 +4567,8 @@ "enum": [ "UrlSigningKey", "CustomerCertificate", - "ManagedCertificate" + "ManagedCertificate", + "AzureFirstPartyManagedCertificate" ], "type": "string", "x-ms-enum": { @@ -4646,6 +4656,16 @@ } } }, + "AzureFirstPartyManagedCertificateParameters": { + "description": "Azure FirstParty Managed Certificate used for https", + "x-ms-discriminator-value": "AzureFirstPartyManagedCertificate", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/SecretParameters" + } + ] + }, "RuleSetListResult": { "description": "Result of the request to list rule sets. It contains a list of rule set objects and a URL link to get the next set of results.", "properties": { From db9e2cb4dc3cbc395faa68e99313d282c0fc3511 Mon Sep 17 00:00:00 2001 From: SINADELL Date: Wed, 3 Nov 2021 17:00:47 -0700 Subject: [PATCH 2/5] Updating description for AzureFirstPartyManagedCertificate secret type --- .../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 866edd444d1c..df5e6b6c7aed 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 @@ -4066,7 +4066,7 @@ } }, "AzureFirstPartyManagedCertificate": { - "description": "Azure First Party Managed Certificate used for https", + "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https", "allOf": [ { "$ref": "#/definitions/Certificate" @@ -4091,7 +4091,7 @@ "UrlSigningKey", "ManagedCertificate", "CustomerCertificate", - "AzureFirstPartyManagedCertificate" + "AzureFirstPartyManagedCertificate" ], "type": "string", "x-ms-enum": { @@ -4657,7 +4657,7 @@ } }, "AzureFirstPartyManagedCertificateParameters": { - "description": "Azure FirstParty Managed Certificate used for https", + "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https", "x-ms-discriminator-value": "AzureFirstPartyManagedCertificate", "type": "object", "allOf": [ From 129bfcb95401273166fca9051101b256f006599b Mon Sep 17 00:00:00 2001 From: SINADELL Date: Thu, 4 Nov 2021 11:26:20 -0700 Subject: [PATCH 3/5] Updating description for AzureFirstPartyManagedCertificate secret type --- .../Microsoft.Cdn/stable/2021-06-01/afdx.json | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 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 df5e6b6c7aed..b6bc2efcfe20 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 @@ -4081,23 +4081,17 @@ "secretType" ], "properties": { + "secretType": { + "description": "The secret type.", + "$ref": "#/definitions/SecretType" + }, "secretSource": { - "description": "The secret source.", + "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" }, - "secretType": { - "description": "The secret type.", - "enum": [ - "UrlSigningKey", - "ManagedCertificate", - "CustomerCertificate", - "AzureFirstPartyManagedCertificate" - ], - "type": "string", - "x-ms-enum": { - "name": "ValidateSecretType", - "modelAsString": true - } + "secretVersion": { + "description": "Secret version, if customer is using a specific version.", + "type": "string" } } }, @@ -4563,20 +4557,23 @@ "type": "object", "properties": { "type": { - "description": "The type of the Secret to create.", - "enum": [ - "UrlSigningKey", - "CustomerCertificate", - "ManagedCertificate", - "AzureFirstPartyManagedCertificate" - ], - "type": "string", - "x-ms-enum": { - "name": "SecretType", - "modelAsString": true - } + "$ref": "#/definitions/SecretType" } } + }, + "SecretType": { + "description": "The type of the secret resource.", + "enum": [ + "UrlSigningKey", + "CustomerCertificate", + "ManagedCertificate", + "AzureFirstPartyManagedCertificate" + ], + "type": "string", + "x-ms-enum": { + "name": "SecretType", + "modelAsString": true + } }, "UrlSigningKeyParameters": { "description": "Url signing key parameters", From b00f6c0bb85f1f7670d9fb603121971094cf545b Mon Sep 17 00:00:00 2001 From: SINADELL Date: Thu, 4 Nov 2021 11:48:49 -0700 Subject: [PATCH 4/5] resolving merge conflict --- .../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 1e32dec5165e..5ce30dda9c4e 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 @@ -4073,7 +4073,7 @@ } } }, - "AzureFirstPartyManagedCertificate": { + "AzureFirstPartyManagedCertificate": { "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https", "allOf": [ { @@ -4569,7 +4569,7 @@ } } }, - "SecretType": { + "SecretType": { "description": "The type of the secret resource.", "enum": [ "UrlSigningKey", @@ -4650,7 +4650,7 @@ } } }, - "AzureFirstPartyManagedCertificateParameters": { + "AzureFirstPartyManagedCertificateParameters": { "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https", "x-ms-discriminator-value": "AzureFirstPartyManagedCertificate", "type": "object", From a36a0b44c59a5ae3393fc3a0a94247e11232620f Mon Sep 17 00:00:00 2001 From: SINADELL Date: Thu, 4 Nov 2021 13:41:13 -0700 Subject: [PATCH 5/5] resolving merge conflict --- .../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 5ce30dda9c4e..8f91318b0fa6 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 @@ -4074,7 +4074,7 @@ } }, "AzureFirstPartyManagedCertificate": { - "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https", + "description": "Azure FirstParty Managed Certificate provided by other first party rp's to enable HTTPS.", "allOf": [ { "$ref": "#/definitions/Certificate" @@ -4651,7 +4651,7 @@ } }, "AzureFirstPartyManagedCertificateParameters": { - "description": "Azure FirstParty Managed Certificate provided by other first party rp's, used for https", + "description": "Azure FirstParty Managed Certificate provided by other first party rp's to enable HTTPS.", "x-ms-discriminator-value": "AzureFirstPartyManagedCertificate", "type": "object", "allOf": [