From 38429a8310c13ad16d4fe601d8d46e7a2c0250c8 Mon Sep 17 00:00:00 2001 From: lwang2016 Date: Mon, 4 May 2020 16:28:58 -0700 Subject: [PATCH 1/5] Update deploymentScripts.json Mark environment variable secureValue as secret --- .../preview/2019-10-01-preview/deploymentScripts.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json index 32186dd68c5e..1a8320f05151 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json @@ -790,7 +790,8 @@ }, "secureValue": { "type": "string", - "description": "The value of the secure environment variable." + "description": "The value of the secure environment variable.", + "x-ms-secret": true } }, "required": [ From 68867f2be44e59be4faad389015591bac4294447 Mon Sep 17 00:00:00 2001 From: lwang2016 Date: Wed, 7 Oct 2020 00:12:28 -0700 Subject: [PATCH 2/5] Update deploymentScripts.json Fix a bug in Microsoft.Resources/deploymentScripts where tenantId property is missed from ManagedServiceIdentity. --- .../preview/2019-10-01-preview/deploymentScripts.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json index 1a8320f05151..5353e011b425 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json @@ -752,6 +752,10 @@ "modelAsString": true } }, + "tenantId": { + "type": "string", + "description": "ID of the Azure Active Directory." + }, "userAssignedIdentities": { "type": "object", "description": "The list of user-assigned managed identities associated with the resource. Key is the Azure resource Id of the managed identity.", From 40d893b51d636c7d1b072d00365a0a96e59ca98b Mon Sep 17 00:00:00 2001 From: lwang2016 Date: Tue, 23 Feb 2021 10:39:21 -0800 Subject: [PATCH 3/5] Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 --- .../preview/2019-10-01-preview/deploymentScripts.json | 3 +++ .../stable/2020-10-01/deploymentScripts.json | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json index 5353e011b425..aed50d5f58a4 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json @@ -754,6 +754,7 @@ }, "tenantId": { "type": "string", + "readOnly": true, "description": "ID of the Azure Active Directory." }, "userAssignedIdentities": { @@ -772,10 +773,12 @@ "properties": { "principalId": { "type": "string", + "readOnly": true, "description": "Azure Active Directory principal ID associated with this identity." }, "clientId": { "type": "string", + "readOnly": true, "description": "Client App Id associated with this identity." } } diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json index 93a79b905a36..d086f4da3309 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json @@ -754,6 +754,11 @@ "modelAsString": true } }, + "tenantId": { + "type": "string", + "readOnly": true, + "description": "ID of the Azure Active Directory." + }, "userAssignedIdentities": { "type": "object", "description": "The list of user-assigned managed identities associated with the resource. Key is the Azure resource Id of the managed identity.", @@ -770,10 +775,12 @@ "properties": { "principalId": { "type": "string", + "readOnly": true, "description": "Azure Active Directory principal ID associated with this identity." }, "clientId": { "type": "string", + "readOnly": true, "description": "Client App Id associated with this identity." } } From b78c8c894784e3def63408737f37529278cc012d Mon Sep 17 00:00:00 2001 From: lwang2016 Date: Tue, 23 Feb 2021 11:50:23 -0800 Subject: [PATCH 4/5] Update deploymentScripts.json --- .../stable/2020-10-01/deploymentScripts.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json index 6de821f24ee2..a53329a3c9e1 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json @@ -757,8 +757,8 @@ } }, "tenantId": { - "type": "string", "readOnly": true, + "type": "string", "description": "ID of the Azure Active Directory." }, "userAssignedIdentities": { @@ -778,13 +778,11 @@ "principalId": { "readOnly": true, "type": "string", - "readOnly": true, "description": "Azure Active Directory principal ID associated with this identity." }, "clientId": { "readOnly": true, "type": "string", - "readOnly": true, "description": "Client App Id associated with this identity." } } From e7161ade0ecb69834ab1532ee6ccecd50153db0c Mon Sep 17 00:00:00 2001 From: lwang2016 Date: Tue, 2 Mar 2021 00:18:06 -0800 Subject: [PATCH 5/5] update retentionInterval description. --- .../preview/2019-10-01-preview/deploymentScripts.json | 2 +- .../stable/2020-10-01/deploymentScripts.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json index 2856f40dabfd..05cc3a50b8ec 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json @@ -601,7 +601,7 @@ "retentionInterval": { "type": "string", "format": "duration", - "description": "Interval for which the service retains the script resource after it reaches a terminal state. Resource will be deleted when this duration expires. Duration is based on ISO 8601 pattern (for example P7D means one week)." + "description": "Interval for which the service retains the script resource after it reaches a terminal state. Resource will be deleted when this duration expires. Duration is based on ISO 8601 pattern (for example P1D means one day)." }, "timeout": { "type": "string", diff --git a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json index a53329a3c9e1..b05f6d197dd4 100644 --- a/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json +++ b/specification/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json @@ -603,7 +603,7 @@ "retentionInterval": { "type": "string", "format": "duration", - "description": "Interval for which the service retains the script resource after it reaches a terminal state. Resource will be deleted when this duration expires. Duration is based on ISO 8601 pattern (for example P7D means one week)." + "description": "Interval for which the service retains the script resource after it reaches a terminal state. Resource will be deleted when this duration expires. Duration is based on ISO 8601 pattern (for example P1D means one day)." }, "timeout": { "type": "string",