diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateWorkspace.json index 7771953d1bfc..57d7ae2744a8 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateWorkspace.json @@ -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": { @@ -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" @@ -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" }, @@ -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", @@ -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", @@ -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", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json index c1292971990e..b324b026c98a 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/workspace.json @@ -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", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/examples/CreateOrUpdateWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/examples/CreateOrUpdateWorkspace.json index c0e08fc31520..79473c212d43 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/examples/CreateOrUpdateWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/examples/CreateOrUpdateWorkspace.json @@ -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": { @@ -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" @@ -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" }, @@ -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", @@ -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", @@ -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", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/workspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/workspace.json index 6f356ffd749d..fb447a0746ee 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/workspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-05-01/workspace.json @@ -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",