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

Update Synapse with ADF swagger changes/2019-06-01-preview (Azure#12924)

* initial changes

* Fix CI pipeline issues

* address comment

* Fix CI pipeline errors

* Fix syntax errors in example files

* Fix CI pipeline errors

* Resolve CI errors

* Fix CI issues

* Change dataFlow to dataflow

* address review comments

* address comment

* fix enums that support expressions

* Fix comment

Co-authored-by: Dongwei Wang <[email protected]>

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

@@ -62,6 +62,7 @@
     from ._models_py3 import Key
     from ._models_py3 import LibraryInfo
     from ._models_py3 import LibraryRequirements
+    from ._models_py3 import LibraryResource
     from ._models_py3 import LinkedIntegrationRuntime
     from ._models_py3 import LinkedIntegrationRuntimeKeyAuthorization
     from ._models_py3 import LinkedIntegrationRuntimeRbacAuthorization
@@ -79,6 +80,7 @@
     from ._models_py3 import ManagedIntegrationRuntimeStatus
     from ._models_py3 import ManagedVirtualNetworkSettings
     from ._models_py3 import MetadataSyncConfig
+    from ._models_py3 import NetworkSettings
     from ._models_py3 import OperationMetaLogSpecification
     from ._models_py3 import OperationMetaMetricDimensionSpecification
     from ._models_py3 import OperationMetaMetricSpecification
@@ -216,6 +218,7 @@
     from ._models import Key
     from ._models import LibraryInfo
     from ._models import LibraryRequirements
+    from ._models import LibraryResource
     from ._models import LinkedIntegrationRuntime
     from ._models import LinkedIntegrationRuntimeKeyAuthorization
     from ._models import LinkedIntegrationRuntimeRbacAuthorization
@@ -233,6 +236,7 @@
     from ._models import ManagedIntegrationRuntimeStatus
     from ._models import ManagedVirtualNetworkSettings
     from ._models import MetadataSyncConfig
+    from ._models import NetworkSettings
     from ._models import OperationMetaLogSpecification
     from ._models import OperationMetaMetricDimensionSpecification
     from ._models import OperationMetaMetricSpecification
@@ -326,6 +330,7 @@
 from ._paged_models import IntegrationRuntimeResourcePaged
 from ._paged_models import IpFirewallRuleInfoPaged
 from ._paged_models import KeyPaged
+from ._paged_models import LibraryResourcePaged
 from ._paged_models import PrivateEndpointConnectionForPrivateLinkHubPaged
 from ._paged_models import PrivateEndpointConnectionPaged
 from ._paged_models import PrivateLinkHubPaged
@@ -357,6 +362,20 @@
     NodeSize,
     NodeSizeFamily,
     ProvisioningState,
+    IntegrationRuntimeType,
+    IntegrationRuntimeState,
+    DataFlowComputeType,
+    IntegrationRuntimeSsisCatalogPricingTier,
+    IntegrationRuntimeLicenseType,
+    IntegrationRuntimeEntityReferenceType,
+    IntegrationRuntimeEdition,
+    ManagedIntegrationRuntimeNodeStatus,
+    IntegrationRuntimeInternalChannelEncryptionMode,
+    SelfHostedIntegrationRuntimeNodeStatus,
+    IntegrationRuntimeUpdateResult,
+    IntegrationRuntimeAutoUpdate,
+    IntegrationRuntimeAuthKeyName,
+    SsisObjectMetadataType,
     OperationStatus,
     StorageAccountType,
     GeoBackupPolicyState,
@@ -381,22 +400,9 @@
     DataMaskingFunction,
     SensitivityLabelUpdateKind,
     RecommendedSensitivityLabelUpdateKind,
-    ResourceIdentityType,
-    IntegrationRuntimeType,
-    IntegrationRuntimeState,
-    DataFlowComputeType,
-    IntegrationRuntimeSsisCatalogPricingTier,
-    IntegrationRuntimeLicenseType,
-    IntegrationRuntimeEntityReferenceType,
-    IntegrationRuntimeEdition,
-    ManagedIntegrationRuntimeNodeStatus,
-    IntegrationRuntimeInternalChannelEncryptionMode,
-    SelfHostedIntegrationRuntimeNodeStatus,
-    IntegrationRuntimeUpdateResult,
-    IntegrationRuntimeAutoUpdate,
-    IntegrationRuntimeAuthKeyName,
-    SsisObjectMetadataType,
     ServerKeyType,
+    WorkspacePublicNetworkAccess,
+    ResourceIdentityType,
     SensitivityLabelSource,
     VulnerabilityAssessmentPolicyBaselineName,
 )
@@ -454,6 +460,7 @@
     'Key',
     'LibraryInfo',
     'LibraryRequirements',
+    'LibraryResource',
     'LinkedIntegrationRuntime',
     'LinkedIntegrationRuntimeKeyAuthorization',
     'LinkedIntegrationRuntimeRbacAuthorization',
@@ -471,6 +478,7 @@
     'ManagedIntegrationRuntimeStatus',
     'ManagedVirtualNetworkSettings',
     'MetadataSyncConfig',
+    'NetworkSettings',
     'OperationMetaLogSpecification',
     'OperationMetaMetricDimensionSpecification',
     'OperationMetaMetricSpecification',
@@ -557,6 +565,13 @@
     'WorkspaceRepositoryConfiguration',
     'BigDataPoolResourceInfoPaged',
     'IpFirewallRuleInfoPaged',
+    'IntegrationRuntimeResourcePaged',
+    'KeyPaged',
+    'LibraryResourcePaged',
+    'PrivateEndpointConnectionPaged',
+    'PrivateLinkResourcePaged',
+    'PrivateLinkHubPaged',
+    'PrivateEndpointConnectionForPrivateLinkHubPaged',
     'SqlPoolPaged',
     'GeoBackupPolicyPaged',
     'RestorePointPaged',
@@ -576,24 +591,32 @@
     'DataMaskingRulePaged',
     'WorkloadGroupPaged',
     'WorkloadClassifierPaged',
-    'WorkspacePaged',
-    'RestorableDroppedSqlPoolPaged',
-    'IntegrationRuntimeResourcePaged',
-    'PrivateLinkResourcePaged',
-    'PrivateEndpointConnectionPaged',
-    'PrivateLinkHubPaged',
-    'PrivateEndpointConnectionForPrivateLinkHubPaged',
     'ServerBlobAuditingPolicyPaged',
     'ExtendedServerBlobAuditingPolicyPaged',
     'ServerSecurityAlertPolicyPaged',
     'ServerVulnerabilityAssessmentPaged',
     'EncryptionProtectorPaged',
     'ServerUsagePaged',
     'RecoverableSqlPoolPaged',
-    'KeyPaged',
+    'WorkspacePaged',
+    'RestorableDroppedSqlPoolPaged',
     'NodeSize',
     'NodeSizeFamily',
     'ProvisioningState',
+    'IntegrationRuntimeType',
+    'IntegrationRuntimeState',
+    'DataFlowComputeType',
+    'IntegrationRuntimeSsisCatalogPricingTier',
+    'IntegrationRuntimeLicenseType',
+    'IntegrationRuntimeEntityReferenceType',
+    'IntegrationRuntimeEdition',
+    'ManagedIntegrationRuntimeNodeStatus',
+    'IntegrationRuntimeInternalChannelEncryptionMode',
+    'SelfHostedIntegrationRuntimeNodeStatus',
+    'IntegrationRuntimeUpdateResult',
+    'IntegrationRuntimeAutoUpdate',
+    'IntegrationRuntimeAuthKeyName',
+    'SsisObjectMetadataType',
     'OperationStatus',
     'StorageAccountType',
     'GeoBackupPolicyState',
@@ -618,22 +641,9 @@
     'DataMaskingFunction',
     'SensitivityLabelUpdateKind',
     'RecommendedSensitivityLabelUpdateKind',
-    'ResourceIdentityType',
-    'IntegrationRuntimeType',
-    'IntegrationRuntimeState',
-    'DataFlowComputeType',
-    'IntegrationRuntimeSsisCatalogPricingTier',
-    'IntegrationRuntimeLicenseType',
-    'IntegrationRuntimeEntityReferenceType',
-    'IntegrationRuntimeEdition',
-    'ManagedIntegrationRuntimeNodeStatus',
-    'IntegrationRuntimeInternalChannelEncryptionMode',
-    'SelfHostedIntegrationRuntimeNodeStatus',
-    'IntegrationRuntimeUpdateResult',
-    'IntegrationRuntimeAutoUpdate',
-    'IntegrationRuntimeAuthKeyName',
-    'SsisObjectMetadataType',
     'ServerKeyType',
+    'WorkspacePublicNetworkAccess',
+    'ResourceIdentityType',
     'SensitivityLabelSource',
     'VulnerabilityAssessmentPolicyBaselineName',
 ]

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

@@ -2454,6 +2454,73 @@ def __init__(self, **kwargs):
         self.filename = kwargs.get('filename', None)
 
 
+class LibraryResource(SubResource):
+    """Library response details.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Fully qualified resource ID for the resource. Ex -
+     /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}
+    :vartype id: str
+    :ivar name: The name of the resource
+    :vartype name: str
+    :ivar type: The type of the resource. E.g.
+     "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts"
+    :vartype type: str
+    :ivar etag: Resource Etag.
+    :vartype etag: str
+    :param library_resource_name: Name of the library.
+    :type library_resource_name: str
+    :param path: Storage blob path of library.
+    :type path: str
+    :param container_name: Storage blob container name.
+    :type container_name: str
+    :ivar uploaded_timestamp: The last update time of the library.
+    :vartype uploaded_timestamp: datetime
+    :param library_resource_type: Type of the library.
+    :type library_resource_type: str
+    :ivar provisioning_status: Provisioning status of the library/package.
+    :vartype provisioning_status: str
+    :ivar creator_id: Creator Id of the library/package.
+    :vartype creator_id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'etag': {'readonly': True},
+        'uploaded_timestamp': {'readonly': True},
+        'provisioning_status': {'readonly': True},
+        'creator_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+        'library_resource_name': {'key': 'properties.name', 'type': 'str'},
+        'path': {'key': 'properties.path', 'type': 'str'},
+        'container_name': {'key': 'properties.containerName', 'type': 'str'},
+        'uploaded_timestamp': {'key': 'properties.uploadedTimestamp', 'type': 'iso-8601'},
+        'library_resource_type': {'key': 'properties.type', 'type': 'str'},
+        'provisioning_status': {'key': 'properties.provisioningStatus', 'type': 'str'},
+        'creator_id': {'key': 'properties.creatorId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LibraryResource, self).__init__(**kwargs)
+        self.library_resource_name = kwargs.get('library_resource_name', None)
+        self.path = kwargs.get('path', None)
+        self.container_name = kwargs.get('container_name', None)
+        self.uploaded_timestamp = None
+        self.library_resource_type = kwargs.get('library_resource_type', None)
+        self.provisioning_status = None
+        self.creator_id = None
+
+
 class LinkedIntegrationRuntime(Model):
     """The linked integration runtime information.
 
@@ -3139,6 +3206,24 @@ def __init__(self, **kwargs):
         self.sync_interval_in_minutes = kwargs.get('sync_interval_in_minutes', None)
 
 
+class NetworkSettings(Model):
+    """Network Settings.
+
+    :param public_network_access: Enable or Disable pubic network access to
+     workspace. Possible values include: 'Enabled', 'Disabled'
+    :type public_network_access: str or
+     ~azure.mgmt.synapse.models.WorkspacePublicNetworkAccess
+    """
+
+    _attribute_map = {
+        'public_network_access': {'key': 'publicNetworkAccess', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkSettings, self).__init__(**kwargs)
+        self.public_network_access = kwargs.get('public_network_access', None)
+
+
 class OperationMetaLogSpecification(Model):
     """What is this?.
 
@@ -5111,7 +5196,7 @@ class SqlPool(TrackedResource):
     :param status: Resource status
     :type status: str
     :param restore_point_in_time: Snapshot time to restore
-    :type restore_point_in_time: str
+    :type restore_point_in_time: datetime
     :param create_mode: What is this?
     :type create_mode: str
     :param creation_date: Date the SQL pool was created
@@ -5142,7 +5227,7 @@ class SqlPool(TrackedResource):
         'recoverable_database_id': {'key': 'properties.recoverableDatabaseId', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'str'},
-        'restore_point_in_time': {'key': 'properties.restorePointInTime', 'type': 'str'},
+        'restore_point_in_time': {'key': 'properties.restorePointInTime', 'type': 'iso-8601'},
         'create_mode': {'key': 'properties.createMode', 'type': 'str'},
         'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
         'storage_account_type': {'key': 'properties.storageAccountType', 'type': 'str'},
@@ -5565,7 +5650,7 @@ class SqlPoolPatchInfo(Model):
     :param status: Resource status
     :type status: str
     :param restore_point_in_time: Snapshot time to restore
-    :type restore_point_in_time: str
+    :type restore_point_in_time: datetime
     :param create_mode: What is this?
     :type create_mode: str
     :param creation_date: Date the SQL pool was created
@@ -5586,7 +5671,7 @@ class SqlPoolPatchInfo(Model):
         'recoverable_database_id': {'key': 'properties.recoverableDatabaseId', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'status': {'key': 'properties.status', 'type': 'str'},
-        'restore_point_in_time': {'key': 'properties.restorePointInTime', 'type': 'str'},
+        'restore_point_in_time': {'key': 'properties.restorePointInTime', 'type': 'iso-8601'},
         'create_mode': {'key': 'properties.createMode', 'type': 'str'},
         'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
         'storage_account_type': {'key': 'properties.storageAccountType', 'type': 'str'},
@@ -6869,6 +6954,8 @@ class Workspace(TrackedResource):
      ~azure.mgmt.synapse.models.PurviewConfiguration
     :ivar adla_resource_id: The ADLA resource ID.
     :vartype adla_resource_id: str
+    :param network_settings: Network Settings
+    :type network_settings: ~azure.mgmt.synapse.models.NetworkSettings
     :param identity: Identity of the workspace
     :type identity: ~azure.mgmt.synapse.models.ManagedIdentity
     """
@@ -6906,6 +6993,7 @@ class Workspace(TrackedResource):
         'workspace_repository_configuration': {'key': 'properties.workspaceRepositoryConfiguration', 'type': 'WorkspaceRepositoryConfiguration'},
         'purview_configuration': {'key': 'properties.purviewConfiguration', 'type': 'PurviewConfiguration'},
         'adla_resource_id': {'key': 'properties.adlaResourceId', 'type': 'str'},
+        'network_settings': {'key': 'properties.networkSettings', 'type': 'NetworkSettings'},
         'identity': {'key': 'identity', 'type': 'ManagedIdentity'},
     }
 
@@ -6927,6 +7015,7 @@ def __init__(self, **kwargs):
         self.workspace_repository_configuration = kwargs.get('workspace_repository_configuration', None)
         self.purview_configuration = kwargs.get('purview_configuration', None)
         self.adla_resource_id = None
+        self.network_settings = kwargs.get('network_settings', None)
         self.identity = kwargs.get('identity', None)
 
 
@@ -7024,6 +7113,8 @@ class WorkspacePatchInfo(Model):
     :vartype provisioning_state: str
     :param encryption: The encryption details of the workspace
     :type encryption: ~azure.mgmt.synapse.models.EncryptionDetails
+    :param network_settings: Network Settings
+    :type network_settings: ~azure.mgmt.synapse.models.NetworkSettings
     """
 
     _validation = {
@@ -7039,6 +7130,7 @@ class WorkspacePatchInfo(Model):
         'purview_configuration': {'key': 'properties.purviewConfiguration', 'type': 'PurviewConfiguration'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'encryption': {'key': 'properties.encryption', 'type': 'EncryptionDetails'},
+        'network_settings': {'key': 'properties.networkSettings', 'type': 'NetworkSettings'},
     }
 
     def __init__(self, **kwargs):
@@ -7051,6 +7143,7 @@ def __init__(self, **kwargs):
         self.purview_configuration = kwargs.get('purview_configuration', None)
         self.provisioning_state = None
         self.encryption = kwargs.get('encryption', None)
+        self.network_settings = kwargs.get('network_settings', None)
 
 
 class WorkspaceRepositoryConfiguration(Model):