Skip to content

Commit 069dc7c

Browse files
author
msftbot[bot]
authored
[ReleasePR synapse] Add userAssignedIdentities property to the Identity section in 2021-05-01 and 2021-06-01-preview (#1819)
Create to sync Azure/azure-rest-api-specs#15296 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/master...AzureSDKAutomation:sdkAuto/synapse?expand=1)
2 parents c7aeb5e + f8702b5 commit 069dc7c

File tree

2 files changed

+44
-2
lines changed

2 files changed

+44
-2
lines changed

schemas/2021-05-01/Microsoft.Synapse.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3095,14 +3095,30 @@
30953095
"type": "string",
30963096
"enum": [
30973097
"None",
3098-
"SystemAssigned"
3098+
"SystemAssigned",
3099+
"SystemAssigned,UserAssigned"
30993100
]
31003101
},
31013102
{
31023103
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
31033104
}
31043105
],
31053106
"description": "The type of managed identity for the workspace."
3107+
},
3108+
"userAssignedIdentities": {
3109+
"oneOf": [
3110+
{
3111+
"type": "object",
3112+
"additionalProperties": {
3113+
"$ref": "#/definitions/UserAssignedManagedIdentity"
3114+
},
3115+
"properties": {}
3116+
},
3117+
{
3118+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3119+
}
3120+
],
3121+
"description": "The User Assigned Managed Identities."
31063122
}
31073123
},
31083124
"description": "The workspace managed identity"
@@ -4045,6 +4061,11 @@
40454061
},
40464062
"description": "Represents the properties of a database transparent data encryption."
40474063
},
4064+
"UserAssignedManagedIdentity": {
4065+
"type": "object",
4066+
"properties": {},
4067+
"description": "User Assigned Managed Identity"
4068+
},
40484069
"VirtualNetworkProfile": {
40494070
"type": "object",
40504071
"properties": {

schemas/2021-06-01-preview/Microsoft.Synapse.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4120,14 +4120,30 @@
41204120
"type": "string",
41214121
"enum": [
41224122
"None",
4123-
"SystemAssigned"
4123+
"SystemAssigned",
4124+
"SystemAssigned,UserAssigned"
41244125
]
41254126
},
41264127
{
41274128
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
41284129
}
41294130
],
41304131
"description": "The type of managed identity for the workspace."
4132+
},
4133+
"userAssignedIdentities": {
4134+
"oneOf": [
4135+
{
4136+
"type": "object",
4137+
"additionalProperties": {
4138+
"$ref": "#/definitions/UserAssignedManagedIdentity"
4139+
},
4140+
"properties": {}
4141+
},
4142+
{
4143+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4144+
}
4145+
],
4146+
"description": "The User Assigned Managed Identities."
41314147
}
41324148
},
41334149
"description": "The workspace managed identity"
@@ -5289,6 +5305,11 @@
52895305
},
52905306
"description": "Represents the properties of a database transparent data encryption."
52915307
},
5308+
"UserAssignedManagedIdentity": {
5309+
"type": "object",
5310+
"properties": {},
5311+
"description": "User Assigned Managed Identity"
5312+
},
52925313
"VirtualNetworkProfile": {
52935314
"type": "object",
52945315
"properties": {

0 commit comments

Comments
 (0)