CodeGen from PR 14839 in Azure/azure-rest-api-specs

Merge ed6f91c70ea58154e9dac807da37c2ee2e0e2eeb into 9f25bad

Author: SDKAuto

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

@@ -1,7 +1,7 @@
 {
   "autorest": "V2",
   "use": "@microsoft.azure/autorest.python@~4.0.71",
-  "commit": "e6a01441f54c719b8713490ee37e51d6220073c2",
+  "commit": "f40b25be0b162133b9b9d113ed9c3afb3ad4423d",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "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",
   "readme": "specification/synapse/resource-manager/readme.md"

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

@@ -221,7 +221,7 @@ def __init__(
         super(SynapseManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2021-03-01'
+        self.api_version = '2021-05-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

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

@@ -22,6 +22,7 @@
     from ._models_py3 import CmdkeySetup
     from ._models_py3 import ComponentSetup
     from ._models_py3 import CreateSqlPoolRestorePointDefinition
+    from ._models_py3 import CspWorkspaceAdminProperties
     from ._models_py3 import CustomerManagedKeyDetails
     from ._models_py3 import CustomSetupBase
     from ._models_py3 import DataLakeStorageAccountDetails
@@ -59,6 +60,7 @@
     from ._models_py3 import IntegrationRuntimeVNetProperties
     from ._models_py3 import IpFirewallRuleInfo
     from ._models_py3 import IpFirewallRuleProperties
+    from ._models_py3 import KekIdentityProperties
     from ._models_py3 import Key
     from ._models_py3 import LibraryInfo
     from ._models_py3 import LibraryRequirements
@@ -177,6 +179,7 @@
     from ._models import CmdkeySetup
     from ._models import ComponentSetup
     from ._models import CreateSqlPoolRestorePointDefinition
+    from ._models import CspWorkspaceAdminProperties
     from ._models import CustomerManagedKeyDetails
     from ._models import CustomSetupBase
     from ._models import DataLakeStorageAccountDetails
@@ -214,6 +217,7 @@
     from ._models import IntegrationRuntimeVNetProperties
     from ._models import IpFirewallRuleInfo
     from ._models import IpFirewallRuleProperties
+    from ._models import KekIdentityProperties
     from ._models import Key
     from ._models import LibraryInfo
     from ._models import LibraryRequirements
@@ -418,6 +422,7 @@
     'CmdkeySetup',
     'ComponentSetup',
     'CreateSqlPoolRestorePointDefinition',
+    'CspWorkspaceAdminProperties',
     'CustomerManagedKeyDetails',
     'CustomSetupBase',
     'DataLakeStorageAccountDetails',
@@ -455,6 +460,7 @@
     'IntegrationRuntimeVNetProperties',
     'IpFirewallRuleInfo',
     'IpFirewallRuleProperties',
+    'KekIdentityProperties',
     'Key',
     'LibraryInfo',
     'LibraryRequirements',

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

@@ -332,7 +332,8 @@ class BigDataPoolResourceInfo(TrackedResource):
      'Large', 'XLarge', 'XXLarge', 'XXXLarge'
     :type node_size: str or ~azure.mgmt.synapse.models.NodeSize
     :param node_size_family: The kind of nodes that the Big Data pool
-     provides. Possible values include: 'None', 'MemoryOptimized'
+     provides. Possible values include: 'None', 'MemoryOptimized',
+     'HardwareAcceleratedFPGA', 'HardwareAcceleratedGPU'
     :type node_size_family: str or ~azure.mgmt.synapse.models.NodeSizeFamily
     :ivar last_succeeded_timestamp: The time when the Big Data pool was
      updated successfully.
@@ -575,6 +576,23 @@ def __init__(self, **kwargs):
         self.restore_point_label = kwargs.get('restore_point_label', None)
 
 
+class CspWorkspaceAdminProperties(Model):
+    """Initial workspace AAD admin properties for a CSP subscription.
+
+    :param initial_workspace_admin_object_id: AAD object ID of initial
+     workspace admin
+    :type initial_workspace_admin_object_id: str
+    """
+
+    _attribute_map = {
+        'initial_workspace_admin_object_id': {'key': 'initialWorkspaceAdminObjectId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(CspWorkspaceAdminProperties, self).__init__(**kwargs)
+        self.initial_workspace_admin_object_id = kwargs.get('initial_workspace_admin_object_id', None)
+
+
 class CustomerManagedKeyDetails(Model):
     """Details of the customer managed key associated with the workspace.
 
@@ -585,6 +603,8 @@ class CustomerManagedKeyDetails(Model):
     :vartype status: str
     :param key: The key object of the workspace
     :type key: ~azure.mgmt.synapse.models.WorkspaceKeyDetails
+    :param kek_identity: Key encryption key
+    :type kek_identity: ~azure.mgmt.synapse.models.KekIdentityProperties
     """
 
     _validation = {
@@ -594,12 +614,14 @@ class CustomerManagedKeyDetails(Model):
     _attribute_map = {
         'status': {'key': 'status', 'type': 'str'},
         'key': {'key': 'key', 'type': 'WorkspaceKeyDetails'},
+        'kek_identity': {'key': 'kekIdentity', 'type': 'KekIdentityProperties'},
     }
 
     def __init__(self, **kwargs):
         super(CustomerManagedKeyDetails, self).__init__(**kwargs)
         self.status = None
         self.key = kwargs.get('key', None)
+        self.kek_identity = kwargs.get('kek_identity', None)
 
 
 class DataLakeStorageAccountDetails(Model):
@@ -2329,6 +2351,27 @@ def __init__(self, **kwargs):
         self.start_ip_address = kwargs.get('start_ip_address', None)
 
 
+class KekIdentityProperties(Model):
+    """Key encryption key properties.
+
+    :param user_assigned_identity: User assigned identity resource Id
+    :type user_assigned_identity: str
+    :param use_system_assigned_identity: Boolean specifying whether to use
+     system assigned identity or not
+    :type use_system_assigned_identity: object
+    """
+
+    _attribute_map = {
+        'user_assigned_identity': {'key': 'userAssignedIdentity', 'type': 'str'},
+        'use_system_assigned_identity': {'key': 'useSystemAssignedIdentity', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KekIdentityProperties, self).__init__(**kwargs)
+        self.user_assigned_identity = kwargs.get('user_assigned_identity', None)
+        self.use_system_assigned_identity = kwargs.get('use_system_assigned_identity', None)
+
+
 class Key(ProxyResource):
     """A workspace key.
 
@@ -6936,10 +6979,14 @@ class Workspace(TrackedResource):
      ~azure.mgmt.synapse.models.PurviewConfiguration
     :ivar adla_resource_id: The ADLA resource ID.
     :vartype adla_resource_id: str
-    :param public_network_access: Enable or Disable pubic network access to
+    :param public_network_access: Enable or Disable public network access to
      workspace. Possible values include: 'Enabled', 'Disabled'
     :type public_network_access: str or
      ~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess
+    :param csp_workspace_admin_properties: Initial workspace AAD admin
+     properties for a CSP subscription
+    :type csp_workspace_admin_properties:
+     ~azure.mgmt.synapse.models.CspWorkspaceAdminProperties
     :param identity: Identity of the workspace
     :type identity: ~azure.mgmt.synapse.models.ManagedIdentity
     """
@@ -6978,6 +7025,7 @@ class Workspace(TrackedResource):
         'purview_configuration': {'key': 'properties.purviewConfiguration', 'type': 'PurviewConfiguration'},
         'adla_resource_id': {'key': 'properties.adlaResourceId', 'type': 'str'},
         'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'},
+        'csp_workspace_admin_properties': {'key': 'properties.cspWorkspaceAdminProperties', 'type': 'CspWorkspaceAdminProperties'},
         'identity': {'key': 'identity', 'type': 'ManagedIdentity'},
     }
 
@@ -7000,6 +7048,7 @@ def __init__(self, **kwargs):
         self.purview_configuration = kwargs.get('purview_configuration', None)
         self.adla_resource_id = None
         self.public_network_access = kwargs.get('public_network_access', None)
+        self.csp_workspace_admin_properties = kwargs.get('csp_workspace_admin_properties', None)
         self.identity = kwargs.get('identity', None)
 
 
@@ -7097,7 +7146,7 @@ class WorkspacePatchInfo(Model):
     :vartype provisioning_state: str
     :param encryption: The encryption details of the workspace
     :type encryption: ~azure.mgmt.synapse.models.EncryptionDetails
-    :param public_network_access: Enable or Disable pubic network access to
+    :param public_network_access: Enable or Disable public network access to
      workspace. Possible values include: 'Enabled', 'Disabled'
     :type public_network_access: str or
      ~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess

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

@@ -332,7 +332,8 @@ class BigDataPoolResourceInfo(TrackedResource):
      'Large', 'XLarge', 'XXLarge', 'XXXLarge'
     :type node_size: str or ~azure.mgmt.synapse.models.NodeSize
     :param node_size_family: The kind of nodes that the Big Data pool
-     provides. Possible values include: 'None', 'MemoryOptimized'
+     provides. Possible values include: 'None', 'MemoryOptimized',
+     'HardwareAcceleratedFPGA', 'HardwareAcceleratedGPU'
     :type node_size_family: str or ~azure.mgmt.synapse.models.NodeSizeFamily
     :ivar last_succeeded_timestamp: The time when the Big Data pool was
      updated successfully.
@@ -575,6 +576,23 @@ def __init__(self, *, restore_point_label: str, **kwargs) -> None:
         self.restore_point_label = restore_point_label
 
 
+class CspWorkspaceAdminProperties(Model):
+    """Initial workspace AAD admin properties for a CSP subscription.
+
+    :param initial_workspace_admin_object_id: AAD object ID of initial
+     workspace admin
+    :type initial_workspace_admin_object_id: str
+    """
+
+    _attribute_map = {
+        'initial_workspace_admin_object_id': {'key': 'initialWorkspaceAdminObjectId', 'type': 'str'},
+    }
+
+    def __init__(self, *, initial_workspace_admin_object_id: str=None, **kwargs) -> None:
+        super(CspWorkspaceAdminProperties, self).__init__(**kwargs)
+        self.initial_workspace_admin_object_id = initial_workspace_admin_object_id
+
+
 class CustomerManagedKeyDetails(Model):
     """Details of the customer managed key associated with the workspace.
 
@@ -585,6 +603,8 @@ class CustomerManagedKeyDetails(Model):
     :vartype status: str
     :param key: The key object of the workspace
     :type key: ~azure.mgmt.synapse.models.WorkspaceKeyDetails
+    :param kek_identity: Key encryption key
+    :type kek_identity: ~azure.mgmt.synapse.models.KekIdentityProperties
     """
 
     _validation = {
@@ -594,12 +614,14 @@ class CustomerManagedKeyDetails(Model):
     _attribute_map = {
         'status': {'key': 'status', 'type': 'str'},
         'key': {'key': 'key', 'type': 'WorkspaceKeyDetails'},
+        'kek_identity': {'key': 'kekIdentity', 'type': 'KekIdentityProperties'},
     }
 
-    def __init__(self, *, key=None, **kwargs) -> None:
+    def __init__(self, *, key=None, kek_identity=None, **kwargs) -> None:
         super(CustomerManagedKeyDetails, self).__init__(**kwargs)
         self.status = None
         self.key = key
+        self.kek_identity = kek_identity
 
 
 class DataLakeStorageAccountDetails(Model):
@@ -2329,6 +2351,27 @@ def __init__(self, *, end_ip_address: str=None, start_ip_address: str=None, **kw
         self.start_ip_address = start_ip_address
 
 
+class KekIdentityProperties(Model):
+    """Key encryption key properties.
+
+    :param user_assigned_identity: User assigned identity resource Id
+    :type user_assigned_identity: str
+    :param use_system_assigned_identity: Boolean specifying whether to use
+     system assigned identity or not
+    :type use_system_assigned_identity: object
+    """
+
+    _attribute_map = {
+        'user_assigned_identity': {'key': 'userAssignedIdentity', 'type': 'str'},
+        'use_system_assigned_identity': {'key': 'useSystemAssignedIdentity', 'type': 'object'},
+    }
+
+    def __init__(self, *, user_assigned_identity: str=None, use_system_assigned_identity=None, **kwargs) -> None:
+        super(KekIdentityProperties, self).__init__(**kwargs)
+        self.user_assigned_identity = user_assigned_identity
+        self.use_system_assigned_identity = use_system_assigned_identity
+
+
 class Key(ProxyResource):
     """A workspace key.
 
@@ -6936,10 +6979,14 @@ class Workspace(TrackedResource):
      ~azure.mgmt.synapse.models.PurviewConfiguration
     :ivar adla_resource_id: The ADLA resource ID.
     :vartype adla_resource_id: str
-    :param public_network_access: Enable or Disable pubic network access to
+    :param public_network_access: Enable or Disable public network access to
      workspace. Possible values include: 'Enabled', 'Disabled'
     :type public_network_access: str or
      ~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess
+    :param csp_workspace_admin_properties: Initial workspace AAD admin
+     properties for a CSP subscription
+    :type csp_workspace_admin_properties:
+     ~azure.mgmt.synapse.models.CspWorkspaceAdminProperties
     :param identity: Identity of the workspace
     :type identity: ~azure.mgmt.synapse.models.ManagedIdentity
     """
@@ -6978,10 +7025,11 @@ class Workspace(TrackedResource):
         'purview_configuration': {'key': 'properties.purviewConfiguration', 'type': 'PurviewConfiguration'},
         'adla_resource_id': {'key': 'properties.adlaResourceId', 'type': 'str'},
         'public_network_access': {'key': 'properties.publicNetworkAccess', 'type': 'str'},
+        'csp_workspace_admin_properties': {'key': 'properties.cspWorkspaceAdminProperties', 'type': 'CspWorkspaceAdminProperties'},
         'identity': {'key': 'identity', 'type': 'ManagedIdentity'},
     }
 
-    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:
+    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:
         super(Workspace, self).__init__(tags=tags, location=location, **kwargs)
         self.default_data_lake_storage = default_data_lake_storage
         self.sql_administrator_login_password = sql_administrator_login_password
@@ -7000,6 +7048,7 @@ def __init__(self, *, location: str, tags=None, default_data_lake_storage=None,
         self.purview_configuration = purview_configuration
         self.adla_resource_id = None
         self.public_network_access = public_network_access
+        self.csp_workspace_admin_properties = csp_workspace_admin_properties
         self.identity = identity
 
 
@@ -7097,7 +7146,7 @@ class WorkspacePatchInfo(Model):
     :vartype provisioning_state: str
     :param encryption: The encryption details of the workspace
     :type encryption: ~azure.mgmt.synapse.models.EncryptionDetails
-    :param public_network_access: Enable or Disable pubic network access to
+    :param public_network_access: Enable or Disable public network access to
      workspace. Possible values include: 'Enabled', 'Disabled'
     :type public_network_access: str or
      ~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess

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

@@ -27,6 +27,8 @@ class NodeSizeFamily(str, Enum):
 
     none = "None"
     memory_optimized = "MemoryOptimized"
+    hardware_accelerated_fpga = "HardwareAcceleratedFPGA"
+    hardware_accelerated_gpu = "HardwareAcceleratedGPU"
 
 
 class ProvisioningState(str, Enum):