Skip to content

Commit e77ce60

Browse files
srkakurusrkakuru
authored
Add userAssignedIdentities property to the Identity section in 2021-05-01 and 2021-06-01-preview (#15296)
1 parent e0a8cac commit e77ce60

File tree

4 files changed

+128
-8
lines changed

4 files changed

+128
-8
lines changed

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateWorkspace.json‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"api-version": "2021-06-01-preview",
77
"workspaceInfo": {
88
"identity": {
9-
"type": "SystemAssigned"
9+
"type": "SystemAssigned,UserAssigned",
10+
"userAssignedIdentities": {
11+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {}
12+
}
1013
},
1114
"properties": {
1215
"defaultDataLakeStorage": {
@@ -38,6 +41,10 @@
3841
},
3942
"encryption": {
4043
"cmk": {
44+
"kekIdentity": {
45+
"userAssignedIdentity": "/subscriptions/b64d7b94-73e7-4d36-94b2-7764ea3fd74a/resourcegroups/SynapseCI/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
46+
"useSystemAssignedIdentity": false
47+
},
4148
"key": {
4249
"name": "default",
4350
"keyVaultUrl": "https://vault.azure.net/keys/key1"
@@ -63,7 +70,13 @@
6370
"type": "Microsoft.Synapse/workspaces",
6471
"location": "East US",
6572
"identity": {
66-
"type": "SystemAssigned",
73+
"type": "SystemAssigned,UserAssigned",
74+
"userAssignedIdentities": {
75+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
76+
"clientId": "ffffffff-8888-4444-8888-333333333333",
77+
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
78+
}
79+
},
6780
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
6881
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
6982
},
@@ -112,6 +125,10 @@
112125
"encryption": {
113126
"doubleEncryptionEnabled": true,
114127
"cmk": {
128+
"kekIdentity": {
129+
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
130+
"useSystemAssignedIdentity": false
131+
},
115132
"status": "Consistent",
116133
"key": {
117134
"name": "default",
@@ -132,6 +149,17 @@
132149
"name": "workspace1",
133150
"type": "Microsoft.Synapse/workspaces",
134151
"location": "East US",
152+
"identity": {
153+
"type": "SystemAssigned,UserAssigned",
154+
"userAssignedIdentities": {
155+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
156+
"clientId": "ffffffff-8888-4444-8888-333333333333",
157+
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
158+
}
159+
},
160+
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
161+
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
162+
},
135163
"properties": {
136164
"defaultDataLakeStorage": {
137165
"accountUrl": "https://accountname.dfs.core.windows.net",
@@ -160,7 +188,7 @@
160188
"doubleEncryptionEnabled": true,
161189
"cmk": {
162190
"kekIdentity": {
163-
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami",
191+
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
164192
"useSystemAssignedIdentity": false
165193
},
166194
"status": "Consistent",

‎specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,16 +1014,48 @@
10141014
"description": "The type of managed identity for the workspace",
10151015
"enum": [
10161016
"None",
1017-
"SystemAssigned"
1017+
"SystemAssigned",
1018+
"SystemAssigned,UserAssigned"
10181019
],
10191020
"type": "string",
10201021
"x-ms-enum": {
10211022
"name": "ResourceIdentityType",
10221023
"modelAsString": false
10231024
}
1025+
},
1026+
"userAssignedIdentities": {
1027+
"description": "The user assigned managed identities.",
1028+
"$ref": "#/definitions/UserAssignedManagedIdentities"
10241029
}
10251030
}
10261031
},
1032+
"UserAssignedManagedIdentities": {
1033+
"type": "object",
1034+
"description": "The User Assigned Managed Identities.",
1035+
"additionalProperties": {
1036+
"$ref": "#/definitions/UserAssignedManagedIdentity"
1037+
}
1038+
},
1039+
"UserAssignedManagedIdentity": {
1040+
"description": "User Assigned Managed Identity",
1041+
"properties": {
1042+
"clientId": {
1043+
"type": "string",
1044+
"format": "uuid",
1045+
"description": "The client ID.",
1046+
"readOnly": true,
1047+
"x-nullable": true
1048+
},
1049+
"principalId": {
1050+
"type": "string",
1051+
"format": "uuid",
1052+
"description": "The principal ID.",
1053+
"readOnly": true,
1054+
"x-nullable": true
1055+
}
1056+
},
1057+
"type": "object"
1058+
},
10271059
"VirtualNetworkProfile": {
10281060
"description": "Virtual Network Profile",
10291061
"type": "object",

‎specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/examples/CreateOrUpdateWorkspace.json‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"api-version": "2021-05-01",
77
"workspaceInfo": {
88
"identity": {
9-
"type": "SystemAssigned"
9+
"type": "SystemAssigned,UserAssigned",
10+
"userAssignedIdentities": {
11+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {}
12+
}
1013
},
1114
"properties": {
1215
"defaultDataLakeStorage": {
@@ -38,6 +41,10 @@
3841
},
3942
"encryption": {
4043
"cmk": {
44+
"kekIdentity": {
45+
"userAssignedIdentity": "/subscriptions/b64d7b94-73e7-4d36-94b2-7764ea3fd74a/resourcegroups/SynapseCI/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
46+
"useSystemAssignedIdentity": false
47+
},
4148
"key": {
4249
"name": "default",
4350
"keyVaultUrl": "https://vault.azure.net/keys/key1"
@@ -63,7 +70,13 @@
6370
"type": "Microsoft.Synapse/workspaces",
6471
"location": "East US",
6572
"identity": {
66-
"type": "SystemAssigned",
73+
"type": "SystemAssigned,UserAssigned",
74+
"userAssignedIdentities": {
75+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
76+
"clientId": "ffffffff-8888-4444-8888-333333333333",
77+
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
78+
}
79+
},
6780
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
6881
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
6982
},
@@ -112,6 +125,10 @@
112125
"encryption": {
113126
"doubleEncryptionEnabled": true,
114127
"cmk": {
128+
"kekIdentity": {
129+
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
130+
"useSystemAssignedIdentity": false
131+
},
115132
"status": "Consistent",
116133
"key": {
117134
"name": "default",
@@ -132,6 +149,17 @@
132149
"name": "workspace1",
133150
"type": "Microsoft.Synapse/workspaces",
134151
"location": "East US",
152+
"identity": {
153+
"type": "SystemAssigned,UserAssigned",
154+
"userAssignedIdentities": {
155+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1": {
156+
"clientId": "ffffffff-8888-4444-8888-333333333333",
157+
"principalId": "eeeeeeee-9999-4444-8888-333333333333"
158+
}
159+
},
160+
"principalId": "f4b0f1c2-xxxx-43db-xxxx-ccd99e1afd22",
161+
"tenantId": "72f988bf-xxxx-41af-xxxx-2d7cd011db47"
162+
},
135163
"properties": {
136164
"defaultDataLakeStorage": {
137165
"accountUrl": "https://accountname.dfs.core.windows.net",
@@ -160,7 +188,7 @@
160188
"doubleEncryptionEnabled": true,
161189
"cmk": {
162190
"kekIdentity": {
163-
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami",
191+
"userAssignedIdentity": "/subscriptions/00000000-1111-2222-3333-444444444444/resourcegroups/resourceGroup1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/uami1",
164192
"useSystemAssignedIdentity": false
165193
},
166194
"status": "Consistent",

‎specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/workspace.json‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1014,16 +1014,48 @@
10141014
"description": "The type of managed identity for the workspace",
10151015
"enum": [
10161016
"None",
1017-
"SystemAssigned"
1017+
"SystemAssigned",
1018+
"SystemAssigned,UserAssigned"
10181019
],
10191020
"type": "string",
10201021
"x-ms-enum": {
10211022
"name": "ResourceIdentityType",
10221023
"modelAsString": false
10231024
}
1025+
},
1026+
"userAssignedIdentities": {
1027+
"description": "The user assigned managed identities.",
1028+
"$ref": "#/definitions/UserAssignedManagedIdentities"
10241029
}
10251030
}
10261031
},
1032+
"UserAssignedManagedIdentities": {
1033+
"type": "object",
1034+
"description": "The User Assigned Managed Identities.",
1035+
"additionalProperties": {
1036+
"$ref": "#/definitions/UserAssignedManagedIdentity"
1037+
}
1038+
},
1039+
"UserAssignedManagedIdentity": {
1040+
"description": "User Assigned Managed Identity",
1041+
"properties": {
1042+
"clientId": {
1043+
"type": "string",
1044+
"format": "uuid",
1045+
"description": "The client ID.",
1046+
"readOnly": true,
1047+
"x-nullable": true
1048+
},
1049+
"principalId": {
1050+
"type": "string",
1051+
"format": "uuid",
1052+
"description": "The principal ID.",
1053+
"readOnly": true,
1054+
"x-nullable": true
1055+
}
1056+
},
1057+
"type": "object"
1058+
},
10271059
"VirtualNetworkProfile": {
10281060
"description": "Virtual Network Profile",
10291061
"type": "object",

0 commit comments

Comments
 (0)