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

Add userAssignedIdentities property to the Identity section in 2021-05-01 and 2021-06-01-preview #15296

Merged
merged 1 commit into from
Aug 4, 2021
Merged

Add userAssignedIdentities property to the Identity section in 2021-05-01 and 2021-06-01-preview #15296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 31 additions & 3 deletions ...anager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"api-version": "2021-06-01-preview",
"workspaceInfo": {
"identity": {
"type": "SystemAssigned"
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {}
}
},
"properties": {
"defaultDataLakeStorage": {
Expand Down Expand Up @@ -38,6 +41,10 @@
},
"encryption": {
"cmk": {
"kekIdentity": {
"userAssignedIdentity": "/subscriptions/b64d7b94-73e7-4d36-94b2-7764ea3fd74a/resourcegroups/SynapseCI/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
"useSystemAssignedIdentity": false
},
"key": {
"name": "default",
"keyVaultUrl": "https://vault.azure.net/keys/key1"
Expand All @@ -63,7 +70,13 @@
"type": "Microsoft.Synapse/workspaces",
"location": "East US",
"identity": {
"type": "SystemAssigned",
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
"clientId": "ffffffff-8888-4444-8888-333333333333",
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
}
},
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
},
Expand Down Expand Up @@ -112,6 +125,10 @@
"encryption": {
"doubleEncryptionEnabled": true,
"cmk": {
"kekIdentity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
"useSystemAssignedIdentity": false
},
"status": "Consistent",
"key": {
"name": "default",
Expand All @@ -132,6 +149,17 @@
"name": "workspace1",
"type": "Microsoft.Synapse/workspaces",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
"clientId": "ffffffff-8888-4444-8888-333333333333",
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
}
},
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
},
"properties": {
"defaultDataLakeStorage": {
"accountUrl": "https://accountname.dfs.core.windows.net",
Expand Down Expand Up @@ -160,7 +188,7 @@
"doubleEncryptionEnabled": true,
"cmk": {
"kekIdentity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami",
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
"useSystemAssignedIdentity": false
},
"status": "Consistent",
Expand Down
34 changes: 33 additions & 1 deletion ...tion/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,16 +1014,48 @@
"description": "The type of managed identity for the workspace",
"enum": [
"None",
"SystemAssigned"
"SystemAssigned",
"SystemAssigned,UserAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
},
"userAssignedIdentities": {
"description": "The user assigned managed identities.",
"$ref": "#/definitions/UserAssignedManagedIdentities"
}
}
},
"UserAssignedManagedIdentities": {
"type": "object",
"description": "The User Assigned Managed Identities.",
"additionalProperties": {
"$ref": "#/definitions/UserAssignedManagedIdentity"
}
},
"UserAssignedManagedIdentity": {
"description": "User Assigned Managed Identity",
"properties": {
"clientId": {
"type": "string",
"format": "uuid",
"description": "The client ID.",
"readOnly": true,
"x-nullable": true
},
"principalId": {
"type": "string",
"format": "uuid",
"description": "The principal ID.",
"readOnly": true,
"x-nullable": true
}
},
"type": "object"
},
"VirtualNetworkProfile": {
"description": "Virtual Network Profile",
"type": "object",
Expand Down
34 changes: 31 additions & 3 deletions ...esource-manager/Microsoft.Synapse/stable/2021-05-01/examples/CreateOrUpdateWorkspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"api-version": "2021-05-01",
"workspaceInfo": {
"identity": {
"type": "SystemAssigned"
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {}
}
},
"properties": {
"defaultDataLakeStorage": {
Expand Down Expand Up @@ -38,6 +41,10 @@
},
"encryption": {
"cmk": {
"kekIdentity": {
"userAssignedIdentity": "/subscriptions/b64d7b94-73e7-4d36-94b2-7764ea3fd74a/resourcegroups/SynapseCI/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
"useSystemAssignedIdentity": false
},
"key": {
"name": "default",
"keyVaultUrl": "https://vault.azure.net/keys/key1"
Expand All @@ -63,7 +70,13 @@
"type": "Microsoft.Synapse/workspaces",
"location": "East US",
"identity": {
"type": "SystemAssigned",
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
"clientId": "ffffffff-8888-4444-8888-333333333333",
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
}
},
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
},
Expand Down Expand Up @@ -112,6 +125,10 @@
"encryption": {
"doubleEncryptionEnabled": true,
"cmk": {
"kekIdentity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
"useSystemAssignedIdentity": false
},
"status": "Consistent",
"key": {
"name": "default",
Expand All @@ -132,6 +149,17 @@
"name": "workspace1",
"type": "Microsoft.Synapse/workspaces",
"location": "East US",
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
"clientId": "ffffffff-8888-4444-8888-333333333333",
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
}
},
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
},
"properties": {
"defaultDataLakeStorage": {
"accountUrl": "https://accountname.dfs.core.windows.net",
Expand Down Expand Up @@ -160,7 +188,7 @@
"doubleEncryptionEnabled": true,
"cmk": {
"kekIdentity": {
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami",
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
"useSystemAssignedIdentity": false
},
"status": "Consistent",
Expand Down
34 changes: 33 additions & 1 deletion specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/workspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,16 +1014,48 @@
"description": "The type of managed identity for the workspace",
"enum": [
"None",
"SystemAssigned"
"SystemAssigned",
"SystemAssigned,UserAssigned"
],
"type": "string",
"x-ms-enum": {
"name": "ResourceIdentityType",
"modelAsString": false
}
},
"userAssignedIdentities": {
"description": "The user assigned managed identities.",
"$ref": "#/definitions/UserAssignedManagedIdentities"
}
}
},
"UserAssignedManagedIdentities": {
"type": "object",
"description": "The User Assigned Managed Identities.",
"additionalProperties": {
"$ref": "#/definitions/UserAssignedManagedIdentity"
}
},
"UserAssignedManagedIdentity": {
"description": "User Assigned Managed Identity",
"properties": {
"clientId": {
"type": "string",
"format": "uuid",
"description": "The client ID.",
"readOnly": true,
"x-nullable": true
},
"principalId": {
"type": "string",
"format": "uuid",
"description": "The principal ID.",
"readOnly": true,
"x-nullable": true
}
},
"type": "object"
},
"VirtualNetworkProfile": {
"description": "Virtual Network Profile",
"type": "object",
Expand Down