Skip to content
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

Jump to bottom

Update UserAssignedIdentities spec in Web #5288

Merged
merged 2 commits into from
Mar 4, 2019
Merged

Update UserAssignedIdentities spec in Web #5288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2d7ae7
Update UserAssignedIdentities spec in Web
Hamster-Huey Feb 27, 2019
28eed48
fix linterdiff tool
sergey-shandar Feb 28, 2019
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
6 changes: 1 addition & 5 deletions scripts/momentOfTruth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ async function getLinterResult(swaggerPath) {
throw new Error("AutoRest failed");
}

if (stderr !== "") {
console.error(`Error: ${stderr}`)
process.exit(1)
}
let resultString = stdout;
let resultString = stdout + stderr;
if (resultString.indexOf('{') !== -1) {
resultString = resultString.replace(/Processing batch task - {.*} \.\n/g, "");
resultString = "[" + resultString.substring(resultString.indexOf('{')).trim().replace(/\}\n\{/g, "},\n{") + "]";
Expand Down
23 changes: 17 additions & 6 deletions specification/web/resource-manager/Microsoft.Web/stable/2018-02-01/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1326,12 +1326,23 @@
"type": "string",
"readOnly": true
},
"identityIds": {
"description": "Array of UserAssigned managed service identities.",
"type": "array",
"items": {
"description": "Resource Id for UserAssigned managed service identity",
"type": "string"
"userAssignedIdentities": {
"description": "The list of user assigned identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}",
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {
"principalId": {
"description": "Principal Id of user assigned identity",
"type": "string",
"readOnly": true
},
"clientId": {
"description": "Client Id of user assigned identity",
"type": "string",
"readOnly": true
}
}
}
}
}
Expand Down