Skip to content

Support UserAssigned MSI for CosmosDB #10306

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 4 commits into from
Aug 19, 2020
Merged

Support UserAssigned MSI for CosmosDB #10306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
695e5da
Support UserAssigned MSI for CosmosDB
xujin-zhang Jul 30, 2020
b0b3ec9
add examples
xujin-zhang Aug 19, 2020
edcfd35
Prettify
xujin-zhang Aug 19, 2020
e0d4d4f
Prettier Fix
xujin-zhang Aug 19, 2020
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
26 changes: 24 additions & 2 deletions ...cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2020-06-01-preview/cosmos-db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5610,6 +5610,9 @@
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/DatabaseAccountUpdateProperties"
},
"identity": {
"$ref": "#/definitions/ManagedServiceIdentity"
}
}
},
Expand Down Expand Up @@ -6971,17 +6974,36 @@
},
"type": {
"type": "string",
"description": "The type of identity used for the resource. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the service.",
"description": "The type of identity used for the resource. The type 'SystemAssigned,UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the service.",
"enum": [
"SystemAssigned",
"UserAssigned",
"SystemAssigned, UserAssigned",
"SystemAssigned,UserAssigned",
"None"
],
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
},
"userAssignedIdentities": {
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {
"principalId": {
"readOnly": true,
"type": "string",
"description": "The principal id of user assigned identity."
},
"clientId": {
"readOnly": true,
"type": "string",
"description": "The client id of user assigned identity."
}
}
},
"description": "The list of user identities associated with resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
}
},
"description": "Identity for the resource."
Expand Down
15 changes: 15 additions & 0 deletions ...soft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"location": "westus",
"tags": {},
"kind": "MongoDB",
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {}
}
},
"properties": {
"databaseAccountOfferType": "Standard",
"ipRules": [
Expand Down Expand Up @@ -68,6 +74,15 @@
"type": "Microsoft.DocumentDB/databaseAccounts",
"kind": "MongoDB",
"tags": {},
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {
"clientId": "fbe75b66-01c5-4f87-a220-233af3270436",
"principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9219"
}
}
},
"properties": {
"provisioningState": "Initializing",
"isVirtualNetworkFilterEnabled": true,
Expand Down
15 changes: 15 additions & 0 deletions ...icrosoft.DocumentDB/preview/2020-06-01-preview/examples/CosmosDBDatabaseAccountPatch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
"tags": {
"dept": "finance"
},
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {}
}
},
"properties": {
"ipRules": [
{
Expand Down Expand Up @@ -53,6 +59,15 @@
"tags": {
"dept": "finance"
},
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/fa5fc227-a624-475e-b696-cdd604c735bc/resourceGroups/eu2cgroup/providers/Microsoft.ManagedIdentity/userAssignedIdentities/id1": {
"clientId": "fbe75b66-01c5-4f87-a220-233af3270436",
"principalId": "075a0ca6-43f6-4434-9abf-c9b1b79f9219"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"documentEndpoint": "https://ddb1.documents.azure.com:443/",
Expand Down