Skip to content

Commit 407164b

Browse files
author
SDKAuto
committed
CodeGen from PR 15027 in Azure/azure-rest-api-specs
Merge bf7e0abc6b9af1e2a3741a715c39c4281806dcdd into 7f3c678
1 parent 4480744 commit 407164b

10 files changed

+14
-95
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.2",
2+
"autorest": "3.4.5",
33
"use": [
4-
"@autorest/[email protected].0",
4+
"@autorest/[email protected].3",
55
"@autorest/[email protected]"
66
],
7-
"commit": "a07f49e3f75a134c1acdacc338c9f9dc32386f66",
7+
"commit": "0b540cc19c40416f320e4febf79c3bf2fccd682e",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/sql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected].0 --use=@autorest/[email protected] --version=3.4.2",
9+
"autorest_command": "autorest specification/sql/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/[email protected].3 --use=@autorest/[email protected] --version=3.4.5",
1010
"readme": "specification/sql/resource-manager/readme.md"
1111
}

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "3.0.0"
9+
VERSION = "0.9.0"

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_extended_server_blob_auditing_policies_operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def get_long_running_output(pipeline_response):
213213
return cls(pipeline_response, deserialized, {})
214214
return deserialized
215215

216+
blob_auditing_policy_name = "default"
216217
path_format_arguments = {
217218
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
218219
'serverName': self._serialize.url("server_name", server_name, 'str'),

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/aio/operations/_server_blob_auditing_policies_operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ def get_long_running_output(pipeline_response):
213213
return cls(pipeline_response, deserialized, {})
214214
return deserialized
215215

216+
blob_auditing_policy_name = "default"
216217
path_format_arguments = {
217218
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
218219
'serverName': self._serialize.url("server_name", server_name, 'str'),

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@
240240
from ._models_py3 import ReplicationLinkListResult
241241
from ._models_py3 import Resource
242242
from ._models_py3 import ResourceIdentity
243-
from ._models_py3 import ResourceIdentityWithUserAssignedIdentities
244243
from ._models_py3 import ResourceMoveDefinition
245244
from ._models_py3 import ResourceWithWritableName
246245
from ._models_py3 import RestorableDroppedDatabase
@@ -582,7 +581,6 @@
582581
from ._models import ReplicationLinkListResult # type: ignore
583582
from ._models import Resource # type: ignore
584583
from ._models import ResourceIdentity # type: ignore
585-
from ._models import ResourceIdentityWithUserAssignedIdentities # type: ignore
586584
from ._models import ResourceMoveDefinition # type: ignore
587585
from ._models import ResourceWithWritableName # type: ignore
588586
from ._models import RestorableDroppedDatabase # type: ignore
@@ -1066,7 +1064,6 @@
10661064
'ReplicationLinkListResult',
10671065
'Resource',
10681066
'ResourceIdentity',
1069-
'ResourceIdentityWithUserAssignedIdentities',
10701067
'ResourceMoveDefinition',
10711068
'ResourceWithWritableName',
10721069
'RestorableDroppedDatabase',

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

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ class CheckNameAvailabilityRequest(msrest.serialization.Model):
436436

437437
:param name: Required.
438438
:type name: str
439-
:ivar type: Required. Default value: "Microsoft.Sql/servers".
439+
:ivar type: Has constant value: "Microsoft.Sql/servers".
440440
:vartype type: str
441441
"""
442442

@@ -11299,7 +11299,7 @@ class ResourceIdentity(msrest.serialization.Model):
1129911299
:vartype principal_id: str
1130011300
:param type: The identity type. Set this to 'SystemAssigned' in order to automatically create
1130111301
and assign an Azure Active Directory principal for the resource. Possible values include:
11302-
"None", "SystemAssigned", "UserAssigned".
11302+
"None", "SystemAssigned", "UserAssigned", "SystemAssigned,UserAssigned".
1130311303
:type type: str or ~azure.mgmt.sql.models.IdentityType
1130411304
:ivar tenant_id: The Azure Active Directory tenant id.
1130511305
:vartype tenant_id: str
@@ -11328,46 +11328,6 @@ def __init__(
1132811328
self.tenant_id = None
1132911329

1133011330

11331-
class ResourceIdentityWithUserAssignedIdentities(msrest.serialization.Model):
11332-
"""Azure Active Directory identity configuration for a resource.
11333-
11334-
Variables are only populated by the server, and will be ignored when sending a request.
11335-
11336-
:param user_assigned_identities: The resource ids of the user assigned identities to use.
11337-
:type user_assigned_identities: dict[str, ~azure.mgmt.sql.models.UserIdentity]
11338-
:ivar principal_id: The Azure Active Directory principal id.
11339-
:vartype principal_id: str
11340-
:param type: The identity type. Set this to 'SystemAssigned' in order to automatically create
11341-
and assign an Azure Active Directory principal for the resource. Possible values include:
11342-
"None", "SystemAssigned", "UserAssigned".
11343-
:type type: str or ~azure.mgmt.sql.models.IdentityType
11344-
:ivar tenant_id: The Azure Active Directory tenant id.
11345-
:vartype tenant_id: str
11346-
"""
11347-
11348-
_validation = {
11349-
'principal_id': {'readonly': True},
11350-
'tenant_id': {'readonly': True},
11351-
}
11352-
11353-
_attribute_map = {
11354-
'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserIdentity}'},
11355-
'principal_id': {'key': 'principalId', 'type': 'str'},
11356-
'type': {'key': 'type', 'type': 'str'},
11357-
'tenant_id': {'key': 'tenantId', 'type': 'str'},
11358-
}
11359-
11360-
def __init__(
11361-
self,
11362-
**kwargs
11363-
):
11364-
super(ResourceIdentityWithUserAssignedIdentities, self).__init__(**kwargs)
11365-
self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
11366-
self.principal_id = None
11367-
self.type = kwargs.get('type', None)
11368-
self.tenant_id = None
11369-
11370-
1137111331
class ResourceMoveDefinition(msrest.serialization.Model):
1137211332
"""Contains the information necessary to perform a resource move (rename).
1137311333

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

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ class CheckNameAvailabilityRequest(msrest.serialization.Model):
450450

451451
:param name: Required.
452452
:type name: str
453-
:ivar type: Required. Default value: "Microsoft.Sql/servers".
453+
:ivar type: Has constant value: "Microsoft.Sql/servers".
454454
:vartype type: str
455455
"""
456456

@@ -11885,7 +11885,7 @@ class ResourceIdentity(msrest.serialization.Model):
1188511885
:vartype principal_id: str
1188611886
:param type: The identity type. Set this to 'SystemAssigned' in order to automatically create
1188711887
and assign an Azure Active Directory principal for the resource. Possible values include:
11888-
"None", "SystemAssigned", "UserAssigned".
11888+
"None", "SystemAssigned", "UserAssigned", "SystemAssigned,UserAssigned".
1188911889
:type type: str or ~azure.mgmt.sql.models.IdentityType
1189011890
:ivar tenant_id: The Azure Active Directory tenant id.
1189111891
:vartype tenant_id: str
@@ -11917,49 +11917,6 @@ def __init__(
1191711917
self.tenant_id = None
1191811918

1191911919

11920-
class ResourceIdentityWithUserAssignedIdentities(msrest.serialization.Model):
11921-
"""Azure Active Directory identity configuration for a resource.
11922-
11923-
Variables are only populated by the server, and will be ignored when sending a request.
11924-
11925-
:param user_assigned_identities: The resource ids of the user assigned identities to use.
11926-
:type user_assigned_identities: dict[str, ~azure.mgmt.sql.models.UserIdentity]
11927-
:ivar principal_id: The Azure Active Directory principal id.
11928-
:vartype principal_id: str
11929-
:param type: The identity type. Set this to 'SystemAssigned' in order to automatically create
11930-
and assign an Azure Active Directory principal for the resource. Possible values include:
11931-
"None", "SystemAssigned", "UserAssigned".
11932-
:type type: str or ~azure.mgmt.sql.models.IdentityType
11933-
:ivar tenant_id: The Azure Active Directory tenant id.
11934-
:vartype tenant_id: str
11935-
"""
11936-
11937-
_validation = {
11938-
'principal_id': {'readonly': True},
11939-
'tenant_id': {'readonly': True},
11940-
}
11941-
11942-
_attribute_map = {
11943-
'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{UserIdentity}'},
11944-
'principal_id': {'key': 'principalId', 'type': 'str'},
11945-
'type': {'key': 'type', 'type': 'str'},
11946-
'tenant_id': {'key': 'tenantId', 'type': 'str'},
11947-
}
11948-
11949-
def __init__(
11950-
self,
11951-
*,
11952-
user_assigned_identities: Optional[Dict[str, "UserIdentity"]] = None,
11953-
type: Optional[Union[str, "IdentityType"]] = None,
11954-
**kwargs
11955-
):
11956-
super(ResourceIdentityWithUserAssignedIdentities, self).__init__(**kwargs)
11957-
self.user_assigned_identities = user_assigned_identities
11958-
self.principal_id = None
11959-
self.type = type
11960-
self.tenant_id = None
11961-
11962-
1196311920
class ResourceMoveDefinition(msrest.serialization.Model):
1196411921
"""Contains the information necessary to perform a resource move (rename).
1196511922

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/models/_sql_management_client_enums.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ class IdentityType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
444444
NONE = "None"
445445
SYSTEM_ASSIGNED = "SystemAssigned"
446446
USER_ASSIGNED = "UserAssigned"
447+
SYSTEM_ASSIGNED_USER_ASSIGNED = "SystemAssigned,UserAssigned"
447448

448449
class ImplementationMethod(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
449450
"""Gets the method in which this recommended action can be manually implemented. e.g., TSql,

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_extended_server_blob_auditing_policies_operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ def get_long_running_output(pipeline_response):
220220
return cls(pipeline_response, deserialized, {})
221221
return deserialized
222222

223+
blob_auditing_policy_name = "default"
223224
path_format_arguments = {
224225
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
225226
'serverName': self._serialize.url("server_name", server_name, 'str'),

sdk/sql/azure-mgmt-sql/azure/mgmt/sql/operations/_server_blob_auditing_policies_operations.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ def get_long_running_output(pipeline_response):
220220
return cls(pipeline_response, deserialized, {})
221221
return deserialized
222222

223+
blob_auditing_policy_name = "default"
223224
path_format_arguments = {
224225
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
225226
'serverName': self._serialize.url("server_name", server_name, 'str'),

0 commit comments

Comments
 (0)