Skip to content

Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 #13120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 2, 2021
Merged

Fix swagger KPI issue on additional property "tenantId" in deployment script with api-version 2020-10-01 #13120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
38429a8
Update deploymentScripts.json
lwang2016 May 4, 2020
ad7e3d7
Merge branch 'master' of https://github.com/lwang2016/azure-rest-api-…
lwang2016 Oct 7, 2020
68867f2
Update deploymentScripts.json
lwang2016 Oct 7, 2020
40d893b
Fix swagger KPI issue on additional property "tenantId" in deployment…
lwang2016 Feb 23, 2021
b056bba
Merge branch 'master' into lewang/fixtenantid
lwang2016 Feb 23, 2021
b78c8c8
Update deploymentScripts.json
lwang2016 Feb 23, 2021
e7161ad
update retentionInterval description.
lwang2016 Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...es/resource-manager/Microsoft.Resources/preview/2019-10-01-preview/deploymentScripts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -755,6 +755,7 @@
}
},
"tenantId": {
"readOnly": true,
"type": "string",
"description": "ID of the Azure Active Directory."
},
Expand Down
7 changes: 6 additions & 1 deletion ...n/resources/resource-manager/Microsoft.Resources/stable/2020-10-01/deploymentScripts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -756,6 +756,11 @@
"modelAsString": true
}
},
"tenantId": {
"readOnly": true,
"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.",
Expand Down