Skip to content

Commit 190e9d3

Browse files
Azure CLI BotSDKAutoRAY-316
authored
[AutoRelease] t1-sql-2021-05-24-54817 (Azure#18872)
* CodeGen from PR 14439 in Azure/azure-rest-api-specs SQL - Add Resource Identity swagger to common v2 (Azure#14439) * Add Resource Identity swagger to common v2 * Change version number * Changed version num. Removed parameters * version,CHANGELOG * test * changelog config Co-authored-by: SDKAuto <sdkautomation@microsoft.com> Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: Zed <601306339@qq.com>
1 parent c4d5960 commit 190e9d3

File tree

8 files changed

+149
-747
lines changed

8 files changed

+149
-747
lines changed

‎sdk/sql/azure-mgmt-sql/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Release History
22

3+
## 0.28.0 (2021-05-24)
4+
5+
- Add resource identity
6+
37
## 0.27.0 (2021-05-13)
48

59
**Features**

‎sdk/sql/azure-mgmt-sql/_meta.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"autorest": "V2",
33
"use": "@microsoft.azure/autorest.python@~4.0.71",
4-
"commit": "9107915e46d1f46b5f1eeacecc8bc1eb20898c79",
4+
"commit": "1c801aa70be460b277f1d81f9cced889ca5008fe",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
66
"autorest_command": "autorest specification/sql/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2",
77
"readme": "specification/sql/resource-manager/readme.md"

‎sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
from ._models_py3 import RecoverableManagedDatabase
177177
from ._models_py3 import ReplicationLink
178178
from ._models_py3 import Resource
179+
from ._models_py3 import ResourceIdentity
179180
from ._models_py3 import ResourceIdentityWithUserAssignedIdentities
180181
from ._models_py3 import ResourceMoveDefinition
181182
from ._models_py3 import ResourceWithWritableName
@@ -418,6 +419,7 @@
418419
from ._models import RecoverableManagedDatabase
419420
from ._models import ReplicationLink
420421
from ._models import Resource
422+
from ._models import ResourceIdentity
421423
from ._models import ResourceIdentityWithUserAssignedIdentities
422424
from ._models import ResourceMoveDefinition
423425
from ._models import ResourceWithWritableName
@@ -870,6 +872,7 @@
870872
'RecoverableManagedDatabase',
871873
'ReplicationLink',
872874
'Resource',
875+
'ResourceIdentity',
873876
'ResourceIdentityWithUserAssignedIdentities',
874877
'ResourceMoveDefinition',
875878
'ResourceWithWritableName',

‎sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models.py‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5996,8 +5996,7 @@ class ManagedInstance(TrackedResource):
59965996
:type tags: dict[str, str]
59975997
:param identity: The Azure Active Directory identity of the managed
59985998
instance.
5999-
:type identity:
6000-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
5999+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
60016000
:param sku: Managed instance SKU. Allowed values for sku.name: GP_Gen4,
60026001
GP_Gen5, BC_Gen4, BC_Gen5
60036002
:type sku: ~azure.mgmt.sql.models.Sku
@@ -6121,7 +6120,7 @@ class ManagedInstance(TrackedResource):
61216120
'type': {'key': 'type', 'type': 'str'},
61226121
'location': {'key': 'location', 'type': 'str'},
61236122
'tags': {'key': 'tags', 'type': '{str}'},
6124-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
6123+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
61256124
'sku': {'key': 'sku', 'type': 'Sku'},
61266125
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
61276126
'managed_instance_create_mode': {'key': 'properties.managedInstanceCreateMode', 'type': 'str'},
@@ -7164,8 +7163,7 @@ class ManagedInstanceUpdate(Model):
71647163
:param sku: Managed instance sku
71657164
:type sku: ~azure.mgmt.sql.models.Sku
71667165
:param identity: Managed instance identity
7167-
:type identity:
7168-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
7166+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
71697167
:ivar provisioning_state: Possible values include: 'Creating', 'Deleting',
71707168
'Updating', 'Unknown', 'Succeeded', 'Failed'
71717169
:vartype provisioning_state: str or ~azure.mgmt.sql.models.enum
@@ -7280,7 +7278,7 @@ class ManagedInstanceUpdate(Model):
72807278

72817279
_attribute_map = {
72827280
'sku': {'key': 'sku', 'type': 'Sku'},
7283-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
7281+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
72847282
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
72857283
'managed_instance_create_mode': {'key': 'properties.managedInstanceCreateMode', 'type': 'str'},
72867284
'fully_qualified_domain_name': {'key': 'properties.fullyQualifiedDomainName', 'type': 'str'},
@@ -9428,6 +9426,47 @@ def __init__(self, **kwargs):
94289426
self.link_type = None
94299427

94309428

9429+
class ResourceIdentity(Model):
9430+
"""Azure Active Directory identity configuration for a resource.
9431+
9432+
Variables are only populated by the server, and will be ignored when
9433+
sending a request.
9434+
9435+
:param user_assigned_identities: The resource ids of the user assigned
9436+
identities to use
9437+
:type user_assigned_identities: dict[str,
9438+
~azure.mgmt.sql.models.UserIdentity]
9439+
:ivar principal_id: The Azure Active Directory principal id.
9440+
:vartype principal_id: str
9441+
:param type: The identity type. Set this to 'SystemAssigned' in order to
9442+
automatically create and assign an Azure Active Directory principal for
9443+
the resource. Possible values include: 'None', 'SystemAssigned',
9444+
'UserAssigned'
9445+
:type type: str or ~azure.mgmt.sql.models.IdentityType
9446+
:ivar tenant_id: The Azure Active Directory tenant id.
9447+
:vartype tenant_id: str
9448+
"""
9449+
9450+
_validation = {
9451+
'principal_id': {'readonly': True},
9452+
'tenant_id': {'readonly': True},
9453+
}
9454+
9455+
_attribute_map = {
9456+
'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserIdentity}'},
9457+
'principal_id': {'key': 'principalId', 'type': 'str'},
9458+
'type': {'key': 'type', 'type': 'str'},
9459+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
9460+
}
9461+
9462+
def __init__(self, **kwargs):
9463+
super(ResourceIdentity, self).__init__(**kwargs)
9464+
self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
9465+
self.principal_id = None
9466+
self.type = kwargs.get('type', None)
9467+
self.tenant_id = None
9468+
9469+
94319470
class ResourceIdentityWithUserAssignedIdentities(Model):
94329471
"""Azure Active Directory identity configuration for a resource.
94339472

@@ -10014,8 +10053,7 @@ class Server(TrackedResource):
1001410053
:param tags: Resource tags.
1001510054
:type tags: dict[str, str]
1001610055
:param identity: The Azure Active Directory identity of the server.
10017-
:type identity:
10018-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
10056+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
1001910057
:ivar kind: Kind of sql server. This is metadata used for the Azure portal
1002010058
experience.
1002110059
:vartype kind: str
@@ -10076,7 +10114,7 @@ class Server(TrackedResource):
1007610114
'type': {'key': 'type', 'type': 'str'},
1007710115
'location': {'key': 'location', 'type': 'str'},
1007810116
'tags': {'key': 'tags', 'type': '{str}'},
10079-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
10117+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
1008010118
'kind': {'key': 'kind', 'type': 'str'},
1008110119
'administrator_login': {'key': 'properties.administratorLogin', 'type': 'str'},
1008210120
'administrator_login_password': {'key': 'properties.administratorLoginPassword', 'type': 'str'},
@@ -11077,8 +11115,7 @@ class ServerUpdate(Model):
1107711115
sending a request.
1107811116

1107911117
:param identity: Server identity
11080-
:type identity:
11081-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
11118+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
1108211119
:param administrator_login: Administrator username for the server. Once
1108311120
created it cannot be changed.
1108411121
:type administrator_login: str
@@ -11128,7 +11165,7 @@ class ServerUpdate(Model):
1112811165
}
1112911166

1113011167
_attribute_map = {
11131-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
11168+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
1113211169
'administrator_login': {'key': 'properties.administratorLogin', 'type': 'str'},
1113311170
'administrator_login_password': {'key': 'properties.administratorLoginPassword', 'type': 'str'},
1113411171
'version': {'key': 'properties.version', 'type': 'str'},

‎sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_models_py3.py‎

Lines changed: 49 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5996,8 +5996,7 @@ class ManagedInstance(TrackedResource):
59965996
:type tags: dict[str, str]
59975997
:param identity: The Azure Active Directory identity of the managed
59985998
instance.
5999-
:type identity:
6000-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
5999+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
60016000
:param sku: Managed instance SKU. Allowed values for sku.name: GP_Gen4,
60026001
GP_Gen5, BC_Gen4, BC_Gen5
60036002
:type sku: ~azure.mgmt.sql.models.Sku
@@ -6121,7 +6120,7 @@ class ManagedInstance(TrackedResource):
61216120
'type': {'key': 'type', 'type': 'str'},
61226121
'location': {'key': 'location', 'type': 'str'},
61236122
'tags': {'key': 'tags', 'type': '{str}'},
6124-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
6123+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
61256124
'sku': {'key': 'sku', 'type': 'Sku'},
61266125
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
61276126
'managed_instance_create_mode': {'key': 'properties.managedInstanceCreateMode', 'type': 'str'},
@@ -7164,8 +7163,7 @@ class ManagedInstanceUpdate(Model):
71647163
:param sku: Managed instance sku
71657164
:type sku: ~azure.mgmt.sql.models.Sku
71667165
:param identity: Managed instance identity
7167-
:type identity:
7168-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
7166+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
71697167
:ivar provisioning_state: Possible values include: 'Creating', 'Deleting',
71707168
'Updating', 'Unknown', 'Succeeded', 'Failed'
71717169
:vartype provisioning_state: str or ~azure.mgmt.sql.models.enum
@@ -7280,7 +7278,7 @@ class ManagedInstanceUpdate(Model):
72807278

72817279
_attribute_map = {
72827280
'sku': {'key': 'sku', 'type': 'Sku'},
7283-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
7281+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
72847282
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
72857283
'managed_instance_create_mode': {'key': 'properties.managedInstanceCreateMode', 'type': 'str'},
72867284
'fully_qualified_domain_name': {'key': 'properties.fullyQualifiedDomainName', 'type': 'str'},
@@ -9428,6 +9426,47 @@ def __init__(self, **kwargs) -> None:
94289426
self.link_type = None
94299427

94309428

9429+
class ResourceIdentity(Model):
9430+
"""Azure Active Directory identity configuration for a resource.
9431+
9432+
Variables are only populated by the server, and will be ignored when
9433+
sending a request.
9434+
9435+
:param user_assigned_identities: The resource ids of the user assigned
9436+
identities to use
9437+
:type user_assigned_identities: dict[str,
9438+
~azure.mgmt.sql.models.UserIdentity]
9439+
:ivar principal_id: The Azure Active Directory principal id.
9440+
:vartype principal_id: str
9441+
:param type: The identity type. Set this to 'SystemAssigned' in order to
9442+
automatically create and assign an Azure Active Directory principal for
9443+
the resource. Possible values include: 'None', 'SystemAssigned',
9444+
'UserAssigned'
9445+
:type type: str or ~azure.mgmt.sql.models.IdentityType
9446+
:ivar tenant_id: The Azure Active Directory tenant id.
9447+
:vartype tenant_id: str
9448+
"""
9449+
9450+
_validation = {
9451+
'principal_id': {'readonly': True},
9452+
'tenant_id': {'readonly': True},
9453+
}
9454+
9455+
_attribute_map = {
9456+
'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserIdentity}'},
9457+
'principal_id': {'key': 'principalId', 'type': 'str'},
9458+
'type': {'key': 'type', 'type': 'str'},
9459+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
9460+
}
9461+
9462+
def __init__(self, *, user_assigned_identities=None, type=None, **kwargs) -> None:
9463+
super(ResourceIdentity, self).__init__(**kwargs)
9464+
self.user_assigned_identities = user_assigned_identities
9465+
self.principal_id = None
9466+
self.type = type
9467+
self.tenant_id = None
9468+
9469+
94319470
class ResourceIdentityWithUserAssignedIdentities(Model):
94329471
"""Azure Active Directory identity configuration for a resource.
94339472

@@ -10014,8 +10053,7 @@ class Server(TrackedResource):
1001410053
:param tags: Resource tags.
1001510054
:type tags: dict[str, str]
1001610055
:param identity: The Azure Active Directory identity of the server.
10017-
:type identity:
10018-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
10056+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
1001910057
:ivar kind: Kind of sql server. This is metadata used for the Azure portal
1002010058
experience.
1002110059
:vartype kind: str
@@ -10076,7 +10114,7 @@ class Server(TrackedResource):
1007610114
'type': {'key': 'type', 'type': 'str'},
1007710115
'location': {'key': 'location', 'type': 'str'},
1007810116
'tags': {'key': 'tags', 'type': '{str}'},
10079-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
10117+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
1008010118
'kind': {'key': 'kind', 'type': 'str'},
1008110119
'administrator_login': {'key': 'properties.administratorLogin', 'type': 'str'},
1008210120
'administrator_login_password': {'key': 'properties.administratorLoginPassword', 'type': 'str'},
@@ -11077,8 +11115,7 @@ class ServerUpdate(Model):
1107711115
sending a request.
1107811116

1107911117
:param identity: Server identity
11080-
:type identity:
11081-
~azure.mgmt.sql.models.ResourceIdentityWithUserAssignedIdentities
11118+
:type identity: ~azure.mgmt.sql.models.ResourceIdentity
1108211119
:param administrator_login: Administrator username for the server. Once
1108311120
created it cannot be changed.
1108411121
:type administrator_login: str
@@ -11128,7 +11165,7 @@ class ServerUpdate(Model):
1112811165
}
1112911166

1113011167
_attribute_map = {
11131-
'identity': {'key': 'identity', 'type': 'ResourceIdentityWithUserAssignedIdentities'},
11168+
'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
1113211169
'administrator_login': {'key': 'properties.administratorLogin', 'type': 'str'},
1113311170
'administrator_login_password': {'key': 'properties.administratorLoginPassword', 'type': 'str'},
1113411171
'version': {'key': 'properties.version', 'type': 'str'},

‎sdk/sql/azure-mgmt-sql/azure/mgmt/sql/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
VERSION = "0.27.0"
12+
VERSION = "0.28.0"

0 commit comments

Comments
 (0)