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

Uai ws kv #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Uai ws kv #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a1816
uai for cmk
DeMale Oct 2, 2020
b0a456c
fix prettier
DeMale Oct 5, 2020
4aebd28
retained identityclientId
DeMale Dec 9, 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
13 changes: 11 additions & 2 deletions ...icrosoft.MachineLearningServices/preview/2020-09-01-preview/examples/createWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"tier": "Basic"
},
"identity": {
"type": "SystemAssigned"
"type": "SystemAssigned, UserAssigned"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no space after comma

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, you are supposed to do the change in the new version 2021-01-01

},
"properties": {
"friendlyName": "HelloName",
Expand All @@ -22,6 +22,9 @@
"storageAccount": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/accountcrud-1234/providers/Microsoft.Storage/storageAccounts/testStorageAccount",
"encryption": {
"status": "Enabled",
"identity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuai"
},
"keyVaultProperties": {
"keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb",
Expand Down Expand Up @@ -53,7 +56,7 @@
"identity": {
"principalId": "00000000-1111-2222-3333-444444444444",
"tenantId": "00000000-1111-2222-3333-444444444444",
"type": "SystemAssigned"
"type": "SystemAssigned, UserAssigned"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, no space after comma

},
"sku": {
"name": "Basic",
Expand All @@ -70,6 +73,9 @@
"description": "test description",
"encryption": {
"status": "Enabled",
"identity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuai"
},
"keyVaultProperties": {
"keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb",
Expand Down Expand Up @@ -113,6 +119,9 @@
"description": "test description",
"encryption": {
"status": "Enabled",
"identity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuai"
},
"keyVaultProperties": {
"keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb",
Expand Down
3 changes: 3 additions & 0 deletions ...r/Microsoft.MachineLearningServices/preview/2020-09-01-preview/examples/getWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
"description": "test description",
"encryption": {
"status": "Enabled",
"identity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.ManagedIdentity/userAssignedIdentities/testuai"
},
"keyVaultProperties": {
"keyVaultArmId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/workspace-1234/providers/Microsoft.KeyVault/vaults/testkv",
"keyIdentifier": "https://testkv.vault.azure.net/keys/testkey/aabbccddee112233445566778899aabb",
Expand Down
18 changes: 18 additions & 0 deletions ...Microsoft.MachineLearningServices/preview/2020-09-01-preview/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4218,13 +4218,18 @@
"modelAsString": true
}
},
"identity": {
"$ref": "#/definitions/IdentityForCmk",
"description": "The identity that will be used to access the key vault for encryption at rest."
},
"keyVaultProperties": {
"$ref": "#/definitions/KeyVaultProperties",
"description": "Customer Key vault properties."
}
},
"required": [
"status",
"identity",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought identity is optional?

"keyVaultProperties"
],
"type": "object"
Expand All @@ -4250,6 +4255,19 @@
],
"type": "object"
},
"IdentityForCmk": {
"description": "Identity that will be used to access key vault for encryption at rest",
"type": "object",
"properties": {
"userAssignedIdentity": {
"description": "The ArmId of the user assigned identity that will be used to access the customer managed key vault",
"type": "string"
}
},
"required": [
"userAssignedIdentity"
]
},
"LinkedServiceResponse": {
"description": "Linked service.",
"type": "object",
Expand Down