Skip to content

Commit a3611da

Browse files
author
SDKAuto
committed
CodeGen from PR 14346 in Azure/azure-rest-api-specs
Merge 60c215322e9f9ec4b259e48c9486cb0de40bee89 into e134a5f
1 parent fd411ac commit a3611da

File tree

66 files changed

+299
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+299
-130
lines changed

sdk/synapse/azure-mgmt-synapse/_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": "e6a01441f54c719b8713490ee37e51d6220073c2",
4+
"commit": "a5c6c34ac7be6ec3f874053cca5d53f14b3b5e9c",
55
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
66
"autorest_command": "autorest specification/synapse/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 [email protected]/autorest.python@~4.0.71 --version=V2",
77
"readme": "specification/synapse/resource-manager/readme.md"

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/_synapse_management_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def __init__(
221221
super(SynapseManagementClient, self).__init__(self.config.credentials, self.config)
222222

223223
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
224-
self.api_version = '2021-03-01'
224+
self.api_version = '2021-05-01'
225225
self._serialize = Serializer(client_models)
226226
self._deserialize = Deserializer(client_models)
227227

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from ._models_py3 import CmdkeySetup
2323
from ._models_py3 import ComponentSetup
2424
from ._models_py3 import CreateSqlPoolRestorePointDefinition
25+
from ._models_py3 import CspWorkspaceAdminProperties
2526
from ._models_py3 import CustomerManagedKeyDetails
2627
from ._models_py3 import CustomSetupBase
2728
from ._models_py3 import DataLakeStorageAccountDetails
@@ -59,6 +60,7 @@
5960
from ._models_py3 import IntegrationRuntimeVNetProperties
6061
from ._models_py3 import IpFirewallRuleInfo
6162
from ._models_py3 import IpFirewallRuleProperties
63+
from ._models_py3 import KekIdentityProperties
6264
from ._models_py3 import Key
6365
from ._models_py3 import LibraryInfo
6466
from ._models_py3 import LibraryRequirements
@@ -177,6 +179,7 @@
177179
from ._models import CmdkeySetup
178180
from ._models import ComponentSetup
179181
from ._models import CreateSqlPoolRestorePointDefinition
182+
from ._models import CspWorkspaceAdminProperties
180183
from ._models import CustomerManagedKeyDetails
181184
from ._models import CustomSetupBase
182185
from ._models import DataLakeStorageAccountDetails
@@ -214,6 +217,7 @@
214217
from ._models import IntegrationRuntimeVNetProperties
215218
from ._models import IpFirewallRuleInfo
216219
from ._models import IpFirewallRuleProperties
220+
from ._models import KekIdentityProperties
217221
from ._models import Key
218222
from ._models import LibraryInfo
219223
from ._models import LibraryRequirements
@@ -418,6 +422,7 @@
418422
'CmdkeySetup',
419423
'ComponentSetup',
420424
'CreateSqlPoolRestorePointDefinition',
425+
'CspWorkspaceAdminProperties',
421426
'CustomerManagedKeyDetails',
422427
'CustomSetupBase',
423428
'DataLakeStorageAccountDetails',
@@ -455,6 +460,7 @@
455460
'IntegrationRuntimeVNetProperties',
456461
'IpFirewallRuleInfo',
457462
'IpFirewallRuleProperties',
463+
'KekIdentityProperties',
458464
'Key',
459465
'LibraryInfo',
460466
'LibraryRequirements',

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

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,23 @@ def __init__(self, **kwargs):
575575
self.restore_point_label = kwargs.get('restore_point_label', None)
576576

577577

578+
class CspWorkspaceAdminProperties(Model):
579+
"""Initial workspace AAD admin properties for a CSP subscription.
580+
581+
:param initial_workspace_admin_object_id: AAD object ID of initial
582+
workspace admin
583+
:type initial_workspace_admin_object_id: str
584+
"""
585+
586+
_attribute_map = {
587+
'initial_workspace_admin_object_id': {'key': 'initialWorkspaceAdminObjectId', 'type': 'str'},
588+
}
589+
590+
def __init__(self, **kwargs):
591+
super(CspWorkspaceAdminProperties, self).__init__(**kwargs)
592+
self.initial_workspace_admin_object_id = kwargs.get('initial_workspace_admin_object_id', None)
593+
594+
578595
class CustomerManagedKeyDetails(Model):
579596
"""Details of the customer managed key associated with the workspace.
580597
@@ -585,6 +602,8 @@ class CustomerManagedKeyDetails(Model):
585602
:vartype status: str
586603
:param key: The key object of the workspace
587604
:type key: ~azure.mgmt.synapse.models.WorkspaceKeyDetails
605+
:param kek_identity: Key encryption key
606+
:type kek_identity: ~azure.mgmt.synapse.models.KekIdentityProperties
588607
"""
589608

590609
_validation = {
@@ -594,12 +613,14 @@ class CustomerManagedKeyDetails(Model):
594613
_attribute_map = {
595614
'status': {'key': 'status', 'type': 'str'},
596615
'key': {'key': 'key', 'type': 'WorkspaceKeyDetails'},
616+
'kek_identity': {'key': 'kekIdentity', 'type': 'KekIdentityProperties'},
597617
}
598618

599619
def __init__(self, **kwargs):
600620
super(CustomerManagedKeyDetails, self).__init__(**kwargs)
601621
self.status = None
602622
self.key = kwargs.get('key', None)
623+
self.kek_identity = kwargs.get('kek_identity', None)
603624

604625

605626
class DataLakeStorageAccountDetails(Model):
@@ -2329,6 +2350,27 @@ def __init__(self, **kwargs):
23292350
self.start_ip_address = kwargs.get('start_ip_address', None)
23302351

23312352

2353+
class KekIdentityProperties(Model):
2354+
"""Key encryption key properties.
2355+
2356+
:param user_assigned_identity: User assigned identity resource Id
2357+
:type user_assigned_identity: str
2358+
:param use_system_assigned_identity: Boolean specifying whether to use
2359+
system assigned identity or not
2360+
:type use_system_assigned_identity: object
2361+
"""
2362+
2363+
_attribute_map = {
2364+
'user_assigned_identity': {'key': 'userAssignedIdentity', 'type': 'str'},
2365+
'use_system_assigned_identity': {'key': 'useSystemAssignedIdentity', 'type': 'object'},
2366+
}
2367+
2368+
def __init__(self, **kwargs):
2369+
super(KekIdentityProperties, self).__init__(**kwargs)
2370+
self.user_assigned_identity = kwargs.get('user_assigned_identity', None)
2371+
self.use_system_assigned_identity = kwargs.get('use_system_assigned_identity', None)
2372+
2373+
23322374
class Key(ProxyResource):
23332375
"""A workspace key.
23342376
@@ -6936,10 +6978,14 @@ class Workspace(TrackedResource):
69366978
~azure.mgmt.synapse.models.PurviewConfiguration
69376979
:ivar adla_resource_id: The ADLA resource ID.
69386980
:vartype adla_resource_id: str
6939-
:param public_network_access: Enable or Disable pubic network access to
6981+
:param public_network_access: Enable or Disable public network access to
69406982
workspace. Possible values include: 'Enabled', 'Disabled'
69416983
:type public_network_access: str or
69426984
~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess
6985+
:param csp_workspace_admin_properties: Initial workspace AAD admin
6986+
properties for a CSP subscription
6987+
:type csp_workspace_admin_properties:
6988+
~azure.mgmt.synapse.models.CspWorkspaceAdminProperties
69436989
:param identity: Identity of the workspace
69446990
:type identity: ~azure.mgmt.synapse.models.ManagedIdentity
69456991
"""
@@ -6978,6 +7024,7 @@ class Workspace(TrackedResource):
69787024
'purview_configuration': {'key': 'properties.purviewConfiguration', 'type': 'PurviewConfiguration'},
69797025
'adla_resource_id': {'key': 'properties.adlaResourceId', 'type': 'str'},
69807026
'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'},
7027+
'csp_workspace_admin_properties': {'key': 'properties.cspWorkspaceAdminProperties', 'type': 'CspWorkspaceAdminProperties'},
69817028
'identity': {'key': 'identity', 'type': 'ManagedIdentity'},
69827029
}
69837030

@@ -7000,6 +7047,7 @@ def __init__(self, **kwargs):
70007047
self.purview_configuration = kwargs.get('purview_configuration', None)
70017048
self.adla_resource_id = None
70027049
self.public_network_access = kwargs.get('public_network_access', None)
7050+
self.csp_workspace_admin_properties = kwargs.get('csp_workspace_admin_properties', None)
70037051
self.identity = kwargs.get('identity', None)
70047052

70057053

@@ -7097,7 +7145,7 @@ class WorkspacePatchInfo(Model):
70977145
:vartype provisioning_state: str
70987146
:param encryption: The encryption details of the workspace
70997147
:type encryption: ~azure.mgmt.synapse.models.EncryptionDetails
7100-
:param public_network_access: Enable or Disable pubic network access to
7148+
:param public_network_access: Enable or Disable public network access to
71017149
workspace. Possible values include: 'Enabled', 'Disabled'
71027150
:type public_network_access: str or
71037151
~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess

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

Lines changed: 52 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,23 @@ def __init__(self, *, restore_point_label: str, **kwargs) -> None:
575575
self.restore_point_label = restore_point_label
576576

577577

578+
class CspWorkspaceAdminProperties(Model):
579+
"""Initial workspace AAD admin properties for a CSP subscription.
580+
581+
:param initial_workspace_admin_object_id: AAD object ID of initial
582+
workspace admin
583+
:type initial_workspace_admin_object_id: str
584+
"""
585+
586+
_attribute_map = {
587+
'initial_workspace_admin_object_id': {'key': 'initialWorkspaceAdminObjectId', 'type': 'str'},
588+
}
589+
590+
def __init__(self, *, initial_workspace_admin_object_id: str=None, **kwargs) -> None:
591+
super(CspWorkspaceAdminProperties, self).__init__(**kwargs)
592+
self.initial_workspace_admin_object_id = initial_workspace_admin_object_id
593+
594+
578595
class CustomerManagedKeyDetails(Model):
579596
"""Details of the customer managed key associated with the workspace.
580597
@@ -585,6 +602,8 @@ class CustomerManagedKeyDetails(Model):
585602
:vartype status: str
586603
:param key: The key object of the workspace
587604
:type key: ~azure.mgmt.synapse.models.WorkspaceKeyDetails
605+
:param kek_identity: Key encryption key
606+
:type kek_identity: ~azure.mgmt.synapse.models.KekIdentityProperties
588607
"""
589608

590609
_validation = {
@@ -594,12 +613,14 @@ class CustomerManagedKeyDetails(Model):
594613
_attribute_map = {
595614
'status': {'key': 'status', 'type': 'str'},
596615
'key': {'key': 'key', 'type': 'WorkspaceKeyDetails'},
616+
'kek_identity': {'key': 'kekIdentity', 'type': 'KekIdentityProperties'},
597617
}
598618

599-
def __init__(self, *, key=None, **kwargs) -> None:
619+
def __init__(self, *, key=None, kek_identity=None, **kwargs) -> None:
600620
super(CustomerManagedKeyDetails, self).__init__(**kwargs)
601621
self.status = None
602622
self.key = key
623+
self.kek_identity = kek_identity
603624

604625

605626
class DataLakeStorageAccountDetails(Model):
@@ -2329,6 +2350,27 @@ def __init__(self, *, end_ip_address: str=None, start_ip_address: str=None, **kw
23292350
self.start_ip_address = start_ip_address
23302351

23312352

2353+
class KekIdentityProperties(Model):
2354+
"""Key encryption key properties.
2355+
2356+
:param user_assigned_identity: User assigned identity resource Id
2357+
:type user_assigned_identity: str
2358+
:param use_system_assigned_identity: Boolean specifying whether to use
2359+
system assigned identity or not
2360+
:type use_system_assigned_identity: object
2361+
"""
2362+
2363+
_attribute_map = {
2364+
'user_assigned_identity': {'key': 'userAssignedIdentity', 'type': 'str'},
2365+
'use_system_assigned_identity': {'key': 'useSystemAssignedIdentity', 'type': 'object'},
2366+
}
2367+
2368+
def __init__(self, *, user_assigned_identity: str=None, use_system_assigned_identity=None, **kwargs) -> None:
2369+
super(KekIdentityProperties, self).__init__(**kwargs)
2370+
self.user_assigned_identity = user_assigned_identity
2371+
self.use_system_assigned_identity = use_system_assigned_identity
2372+
2373+
23322374
class Key(ProxyResource):
23332375
"""A workspace key.
23342376
@@ -6936,10 +6978,14 @@ class Workspace(TrackedResource):
69366978
~azure.mgmt.synapse.models.PurviewConfiguration
69376979
:ivar adla_resource_id: The ADLA resource ID.
69386980
:vartype adla_resource_id: str
6939-
:param public_network_access: Enable or Disable pubic network access to
6981+
:param public_network_access: Enable or Disable public network access to
69406982
workspace. Possible values include: 'Enabled', 'Disabled'
69416983
:type public_network_access: str or
69426984
~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess
6985+
:param csp_workspace_admin_properties: Initial workspace AAD admin
6986+
properties for a CSP subscription
6987+
:type csp_workspace_admin_properties:
6988+
~azure.mgmt.synapse.models.CspWorkspaceAdminProperties
69436989
:param identity: Identity of the workspace
69446990
:type identity: ~azure.mgmt.synapse.models.ManagedIdentity
69456991
"""
@@ -6978,10 +7024,11 @@ class Workspace(TrackedResource):
69787024
'purview_configuration': {'key': 'properties.purviewConfiguration', 'type': 'PurviewConfiguration'},
69797025
'adla_resource_id': {'key': 'properties.adlaResourceId', 'type': 'str'},
69807026
'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'},
7027+
'csp_workspace_admin_properties': {'key': 'properties.cspWorkspaceAdminProperties', 'type': 'CspWorkspaceAdminProperties'},
69817028
'identity': {'key': 'identity', 'type': 'ManagedIdentity'},
69827029
}
69837030

6984-
def __init__(self, *, location: str, tags=None, default_data_lake_storage=None, sql_administrator_login_password: str=None, managed_resource_group_name: str=None, sql_administrator_login: str=None, virtual_network_profile=None, connectivity_endpoints=None, managed_virtual_network: str=None, private_endpoint_connections=None, encryption=None, managed_virtual_network_settings=None, workspace_repository_configuration=None, purview_configuration=None, public_network_access=None, identity=None, **kwargs) -> None:
7031+
def __init__(self, *, location: str, tags=None, default_data_lake_storage=None, sql_administrator_login_password: str=None, managed_resource_group_name: str=None, sql_administrator_login: str=None, virtual_network_profile=None, connectivity_endpoints=None, managed_virtual_network: str=None, private_endpoint_connections=None, encryption=None, managed_virtual_network_settings=None, workspace_repository_configuration=None, purview_configuration=None, public_network_access=None, csp_workspace_admin_properties=None, identity=None, **kwargs) -> None:
69857032
super(Workspace, self).__init__(tags=tags, location=location, **kwargs)
69867033
self.default_data_lake_storage = default_data_lake_storage
69877034
self.sql_administrator_login_password = sql_administrator_login_password
@@ -7000,6 +7047,7 @@ def __init__(self, *, location: str, tags=None, default_data_lake_storage=None,
70007047
self.purview_configuration = purview_configuration
70017048
self.adla_resource_id = None
70027049
self.public_network_access = public_network_access
7050+
self.csp_workspace_admin_properties = csp_workspace_admin_properties
70037051
self.identity = identity
70047052

70057053

@@ -7097,7 +7145,7 @@ class WorkspacePatchInfo(Model):
70977145
:vartype provisioning_state: str
70987146
:param encryption: The encryption details of the workspace
70997147
:type encryption: ~azure.mgmt.synapse.models.EncryptionDetails
7100-
:param public_network_access: Enable or Disable pubic network access to
7148+
:param public_network_access: Enable or Disable public network access to
71017149
workspace. Possible values include: 'Enabled', 'Disabled'
71027150
:type public_network_access: str or
71037151
~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/operations/_big_data_pools_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class BigDataPoolsOperations(object):
2626
:param config: Configuration of service client.
2727
:param serializer: An object model serializer.
2828
:param deserializer: An object model deserializer.
29-
:ivar api_version: The API version to use for this operation. Constant value: "2021-03-01".
29+
:ivar api_version: The API version to use for this operation. Constant value: "2021-05-01".
3030
"""
3131

3232
models = models
@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
3636
self._client = client
3737
self._serialize = serializer
3838
self._deserialize = deserializer
39-
self.api_version = "2021-03-01"
39+
self.api_version = "2021-05-01"
4040

4141
self.config = config
4242

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/operations/_data_masking_policies_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DataMaskingPoliciesOperations(object):
2424
:param config: Configuration of service client.
2525
:param serializer: An object model serializer.
2626
:param deserializer: An object model deserializer.
27-
:ivar api_version: The API version to use for this operation. Constant value: "2021-03-01".
27+
:ivar api_version: The API version to use for this operation. Constant value: "2021-05-01".
2828
:ivar data_masking_policy_name: The name of the data masking policy for which the masking rule applies. Constant value: "Default".
2929
"""
3030

@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
3535
self._client = client
3636
self._serialize = serializer
3737
self._deserialize = deserializer
38-
self.api_version = "2021-03-01"
38+
self.api_version = "2021-05-01"
3939
self.data_masking_policy_name = "Default"
4040

4141
self.config = config

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/operations/_data_masking_rules_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class DataMaskingRulesOperations(object):
2424
:param config: Configuration of service client.
2525
:param serializer: An object model serializer.
2626
:param deserializer: An object model deserializer.
27-
:ivar api_version: The API version to use for this operation. Constant value: "2021-03-01".
27+
:ivar api_version: The API version to use for this operation. Constant value: "2021-05-01".
2828
:ivar data_masking_policy_name: The name of the data masking policy for which the masking rule applies. Constant value: "Default".
2929
"""
3030

@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
3535
self._client = client
3636
self._serialize = serializer
3737
self._deserialize = deserializer
38-
self.api_version = "2021-03-01"
38+
self.api_version = "2021-05-01"
3939
self.data_masking_policy_name = "Default"
4040

4141
self.config = config

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/operations/_extended_sql_pool_blob_auditing_policies_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ExtendedSqlPoolBlobAuditingPoliciesOperations(object):
2525
:param config: Configuration of service client.
2626
:param serializer: An object model serializer.
2727
:param deserializer: An object model deserializer.
28-
:ivar api_version: The API version to use for this operation. Constant value: "2021-03-01".
28+
:ivar api_version: The API version to use for this operation. Constant value: "2021-05-01".
2929
:ivar blob_auditing_policy_name: The name of the blob auditing policy. Constant value: "default".
3030
"""
3131

@@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
3636
self._client = client
3737
self._serialize = serializer
3838
self._deserialize = deserializer
39-
self.api_version = "2021-03-01"
39+
self.api_version = "2021-05-01"
4040
self.blob_auditing_policy_name = "default"
4141

4242
self.config = config

sdk/synapse/azure-mgmt-synapse/azure/mgmt/synapse/operations/_integration_runtime_auth_keys_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class IntegrationRuntimeAuthKeysOperations(object):
2424
:param config: Configuration of service client.
2525
:param serializer: An object model serializer.
2626
:param deserializer: An object model deserializer.
27-
:ivar api_version: The API version to use for this operation. Constant value: "2021-03-01".
27+
:ivar api_version: The API version to use for this operation. Constant value: "2021-05-01".
2828
"""
2929

3030
models = models
@@ -34,7 +34,7 @@ def __init__(self, client, config, serializer, deserializer):
3434
self._client = client
3535
self._serialize = serializer
3636
self._deserialize = deserializer
37-
self.api_version = "2021-03-01"
37+
self.api_version = "2021-05-01"
3838

3939
self.config = config
4040

0 commit comments

Comments
 (0)