diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py index 97b5b70d4587..86680dcf55dc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -58,7 +58,7 @@ def __init__( self.subscription_id = subscription_id -class DataFactoryManagementClient(object): +class DataFactoryManagementClient(SDKClient): """The Azure Data Factory V2 management API provides a RESTful set of web services that interact with Azure Data Factory V2 services. :ivar config: Configuration for client. @@ -97,7 +97,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = DataFactoryManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(DataFactoryManagementClient, 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 = '2017-09-01-preview' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index f25f49f6cb4a..ed790633bf18 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -18,6 +18,7 @@ from .azure_key_vault_secret_reference_py3 import AzureKeyVaultSecretReference from .secret_base_py3 import SecretBase from .factory_identity_py3 import FactoryIdentity + from .factory_vsts_configuration_py3 import FactoryVSTSConfiguration from .factory_py3 import Factory from .integration_runtime_py3 import IntegrationRuntime from .integration_runtime_resource_py3 import IntegrationRuntimeResource @@ -39,6 +40,7 @@ from .trigger_resource_py3 import TriggerResource from .create_run_response_py3 import CreateRunResponse from .error_response_py3 import ErrorResponse, ErrorResponseException + from .factory_repo_update_py3 import FactoryRepoUpdate from .pipeline_reference_py3 import PipelineReference from .trigger_pipeline_reference_py3 import TriggerPipelineReference from .factory_update_parameters_py3 import FactoryUpdateParameters @@ -58,6 +60,7 @@ from .operation_service_specification_py3 import OperationServiceSpecification from .operation_py3 import Operation from .operation_list_response_py3 import OperationListResponse + from .responsys_linked_service_py3 import ResponsysLinkedService from .azure_databricks_linked_service_py3 import AzureDatabricksLinkedService from .azure_data_lake_analytics_linked_service_py3 import AzureDataLakeAnalyticsLinkedService from .hd_insight_on_demand_linked_service_py3 import HDInsightOnDemandLinkedService @@ -131,6 +134,7 @@ from .sql_server_linked_service_py3 import SqlServerLinkedService from .azure_sql_dw_linked_service_py3 import AzureSqlDWLinkedService from .azure_storage_linked_service_py3 import AzureStorageLinkedService + from .responsys_object_dataset_py3 import ResponsysObjectDataset from .salesforce_marketing_cloud_object_dataset_py3 import SalesforceMarketingCloudObjectDataset from .vertica_table_dataset_py3 import VerticaTableDataset from .netezza_table_dataset_py3 import NetezzaTableDataset @@ -196,6 +200,7 @@ from .amazon_s3_dataset_py3 import AmazonS3Dataset from .retry_policy_py3 import RetryPolicy from .tumbling_window_trigger_py3 import TumblingWindowTrigger + from .blob_events_trigger_py3 import BlobEventsTrigger from .blob_trigger_py3 import BlobTrigger from .recurrence_schedule_occurrence_py3 import RecurrenceScheduleOccurrence from .recurrence_schedule_py3 import RecurrenceSchedule @@ -213,6 +218,7 @@ from .web_activity_py3 import WebActivity from .redshift_unload_settings_py3 import RedshiftUnloadSettings from .amazon_redshift_source_py3 import AmazonRedshiftSource + from .responsys_source_py3 import ResponsysSource from .salesforce_marketing_cloud_source_py3 import SalesforceMarketingCloudSource from .vertica_source_py3 import VerticaSource from .netezza_source_py3 import NetezzaSource @@ -339,6 +345,7 @@ from .azure_key_vault_secret_reference import AzureKeyVaultSecretReference from .secret_base import SecretBase from .factory_identity import FactoryIdentity + from .factory_vsts_configuration import FactoryVSTSConfiguration from .factory import Factory from .integration_runtime import IntegrationRuntime from .integration_runtime_resource import IntegrationRuntimeResource @@ -360,6 +367,7 @@ from .trigger_resource import TriggerResource from .create_run_response import CreateRunResponse from .error_response import ErrorResponse, ErrorResponseException + from .factory_repo_update import FactoryRepoUpdate from .pipeline_reference import PipelineReference from .trigger_pipeline_reference import TriggerPipelineReference from .factory_update_parameters import FactoryUpdateParameters @@ -379,6 +387,7 @@ from .operation_service_specification import OperationServiceSpecification from .operation import Operation from .operation_list_response import OperationListResponse + from .responsys_linked_service import ResponsysLinkedService from .azure_databricks_linked_service import AzureDatabricksLinkedService from .azure_data_lake_analytics_linked_service import AzureDataLakeAnalyticsLinkedService from .hd_insight_on_demand_linked_service import HDInsightOnDemandLinkedService @@ -452,6 +461,7 @@ from .sql_server_linked_service import SqlServerLinkedService from .azure_sql_dw_linked_service import AzureSqlDWLinkedService from .azure_storage_linked_service import AzureStorageLinkedService + from .responsys_object_dataset import ResponsysObjectDataset from .salesforce_marketing_cloud_object_dataset import SalesforceMarketingCloudObjectDataset from .vertica_table_dataset import VerticaTableDataset from .netezza_table_dataset import NetezzaTableDataset @@ -517,6 +527,7 @@ from .amazon_s3_dataset import AmazonS3Dataset from .retry_policy import RetryPolicy from .tumbling_window_trigger import TumblingWindowTrigger + from .blob_events_trigger import BlobEventsTrigger from .blob_trigger import BlobTrigger from .recurrence_schedule_occurrence import RecurrenceScheduleOccurrence from .recurrence_schedule import RecurrenceSchedule @@ -534,6 +545,7 @@ from .web_activity import WebActivity from .redshift_unload_settings import RedshiftUnloadSettings from .amazon_redshift_source import AmazonRedshiftSource + from .responsys_source import ResponsysSource from .salesforce_marketing_cloud_source import SalesforceMarketingCloudSource from .vertica_source import VerticaSource from .netezza_source import NetezzaSource @@ -694,6 +706,7 @@ DatasetCompressionLevel, JsonFormatFilePattern, TumblingWindowFrequency, + BlobEventTypes, DayOfWeek, DaysOfWeek, RecurrenceFrequency, @@ -728,6 +741,7 @@ 'AzureKeyVaultSecretReference', 'SecretBase', 'FactoryIdentity', + 'FactoryVSTSConfiguration', 'Factory', 'IntegrationRuntime', 'IntegrationRuntimeResource', @@ -749,6 +763,7 @@ 'TriggerResource', 'CreateRunResponse', 'ErrorResponse', 'ErrorResponseException', + 'FactoryRepoUpdate', 'PipelineReference', 'TriggerPipelineReference', 'FactoryUpdateParameters', @@ -768,6 +783,7 @@ 'OperationServiceSpecification', 'Operation', 'OperationListResponse', + 'ResponsysLinkedService', 'AzureDatabricksLinkedService', 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemandLinkedService', @@ -841,6 +857,7 @@ 'SqlServerLinkedService', 'AzureSqlDWLinkedService', 'AzureStorageLinkedService', + 'ResponsysObjectDataset', 'SalesforceMarketingCloudObjectDataset', 'VerticaTableDataset', 'NetezzaTableDataset', @@ -906,6 +923,7 @@ 'AmazonS3Dataset', 'RetryPolicy', 'TumblingWindowTrigger', + 'BlobEventsTrigger', 'BlobTrigger', 'RecurrenceScheduleOccurrence', 'RecurrenceSchedule', @@ -923,6 +941,7 @@ 'WebActivity', 'RedshiftUnloadSettings', 'AmazonRedshiftSource', + 'ResponsysSource', 'SalesforceMarketingCloudSource', 'VerticaSource', 'NetezzaSource', @@ -1082,6 +1101,7 @@ 'DatasetCompressionLevel', 'JsonFormatFilePattern', 'TumblingWindowFrequency', + 'BlobEventTypes', 'DayOfWeek', 'DaysOfWeek', 'RecurrenceFrequency', diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service_py3.py index e55cd710ca7c..e1a5ba11f560 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AmazonMWSLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset_py3.py index 980bc9445650..7250b12f0fb9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AmazonMWSObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_source_py3.py index 524a047cc6fc..895281f9af51 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_mws_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class AmazonMWSSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service_py3.py index 1d6e7a098786..7912ad040946 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AmazonRedshiftLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_source_py3.py index de43ec3bdff0..9542e56e4850 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class AmazonRedshiftSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset_py3.py index 3ca9f3ca5d86..b9cc4fc4782b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AmazonS3Dataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service_py3.py index fca34c82fb88..044e8bc299cf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AmazonS3LinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/avro_format_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/avro_format_py3.py index eb1f141852a9..35d459c4b2a6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/avro_format_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/avro_format_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_storage_format import DatasetStorageFormat +from .dataset_storage_format_py3 import DatasetStorageFormat class AvroFormat(DatasetStorageFormat): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service_py3.py index 928dfecf2664..63724f76f13f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureBatchLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset_py3.py index fb3265a92c6f..fe28cffcac03 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureBlobDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service_py3.py index f5b32873f157..b6c4b993cae7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureDataLakeAnalyticsLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset_py3.py index 0fcf6571644f..5053cbd9a7a6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureDataLakeStoreDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service_py3.py index 3244f5d35bb6..10e3b72e654e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureDataLakeStoreLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_sink_py3.py index 1ea62762385f..449c7b0a2a3e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class AzureDataLakeStoreSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_source_py3.py index 36896f7f69e3..d228d787bff4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class AzureDataLakeStoreSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service_py3.py index f41395a54f74..f6113d0209b9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_databricks_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureDatabricksLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service_py3.py index 0f66d72b1d75..e13cf7fb527a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureKeyVaultLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_secret_reference_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_secret_reference_py3.py index 4ce7e7c32313..c5fe4c7afbd4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_secret_reference_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_key_vault_secret_reference_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .secret_base import SecretBase +from .secret_base_py3 import SecretBase class AzureKeyVaultSecretReference(SecretBase): @@ -44,7 +44,7 @@ class AzureKeyVaultSecretReference(SecretBase): } def __init__(self, *, store, secret_name, secret_version=None, **kwargs) -> None: - super(AzureKeyVaultSecretReference, self).__init__(, **kwargs) + super(AzureKeyVaultSecretReference, self).__init__(**kwargs) self.store = store self.secret_name = secret_name self.secret_version = secret_version diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py index 7dc7f9d3a154..67f0f605ca5d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_batch_execution_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class AzureMLBatchExecutionActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service_py3.py index 9bea24015ba7..0fff3cea9b8a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureMLLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py index d035b2ac4049..ff0dce23464f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_ml_update_resource_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class AzureMLUpdateResourceActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py index 471ecb2e21f0..aa8f74d8ecda 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service.py @@ -33,8 +33,9 @@ class AzureMySqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -53,7 +54,7 @@ class AzureMySqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service_py3.py index f6dde454fb27..928a621ff74b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureMySqlLinkedService(LinkedService): @@ -33,8 +33,9 @@ class AzureMySqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -53,7 +54,7 @@ class AzureMySqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_source_py3.py index aaa6377548ef..4e1d35981f78 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class AzureMySqlSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset_py3.py index cb8e662e5941..3807f7484878 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_my_sql_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureMySqlTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py index 62824fc83fcd..168ba5f589d7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service.py @@ -33,8 +33,9 @@ class AzurePostgreSqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class AzurePostgreSqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service_py3.py index fe496511710a..e64ab78696d4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzurePostgreSqlLinkedService(LinkedService): @@ -33,8 +33,9 @@ class AzurePostgreSqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class AzurePostgreSqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_source_py3.py index 6dbc32ed38a7..2af53cf91da2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class AzurePostgreSqlSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset_py3.py index 8aff95ae35f7..9f3a62d269f2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_postgre_sql_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzurePostgreSqlTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_queue_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_queue_sink_py3.py index 4357c290185c..debc14c0c7e1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_queue_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_queue_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class AzureQueueSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset_py3.py index f97335cba8ee..b949c1878a80 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureSearchIndexDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_sink_py3.py index 90ed08a6f910..9ed48b36a588 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_index_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class AzureSearchIndexSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service_py3.py index 2cd8ef33be9f..6cc3cdc98b89 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_search_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureSearchLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py index 250b004f00be..c1ecc189d194 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service.py @@ -33,8 +33,9 @@ class AzureSqlDatabaseLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param service_principal_id: The ID of the service principal used to authenticate against Azure SQL Database. Type: string (or Expression with resultType string). @@ -63,7 +64,7 @@ class AzureSqlDatabaseLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service_py3.py index ffa86ded4b4e..80286301c6a8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_database_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureSqlDatabaseLinkedService(LinkedService): @@ -33,8 +33,9 @@ class AzureSqlDatabaseLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param service_principal_id: The ID of the service principal used to authenticate against Azure SQL Database. Type: string (or Expression with resultType string). @@ -63,7 +64,7 @@ class AzureSqlDatabaseLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py index 989d8c799955..ef56c4142321 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service.py @@ -33,8 +33,10 @@ class AzureSqlDWLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. Type: string, SecureString + or AzureKeyVaultSecretReference. + :type connection_string: object :param service_principal_id: The ID of the service principal used to authenticate against Azure SQL Data Warehouse. Type: string (or Expression with resultType string). @@ -63,7 +65,7 @@ class AzureSqlDWLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service_py3.py index 6d0644a4d37d..2f8d316510aa 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureSqlDWLinkedService(LinkedService): @@ -33,8 +33,10 @@ class AzureSqlDWLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. Type: string, SecureString + or AzureKeyVaultSecretReference. + :type connection_string: object :param service_principal_id: The ID of the service principal used to authenticate against Azure SQL Data Warehouse. Type: string (or Expression with resultType string). @@ -63,7 +65,7 @@ class AzureSqlDWLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'}, 'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'}, 'tenant': {'key': 'typeProperties.tenant', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset_py3.py index 2a5040f3cdcc..145d409e2b76 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_dw_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureSqlDWTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset_py3.py index 67d236b072fd..8a226a2e673b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_sql_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureSqlTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py index bd78469cfcf5..d21da53dc341 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service.py @@ -34,8 +34,9 @@ class AzureStorageLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param connection_string: The connection string. It is mutually exclusive - with sasUri property. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + with sasUri property. Type: string, SecureString or + AzureKeyVaultSecretReference. + :type connection_string: object :param sas_uri: SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property. :type sas_uri: ~azure.mgmt.datafactory.models.SecretBase @@ -56,7 +57,7 @@ class AzureStorageLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service_py3.py index 2cbb53b69dcb..6852af1d13ac 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_storage_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class AzureStorageLinkedService(LinkedService): @@ -34,8 +34,9 @@ class AzureStorageLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param connection_string: The connection string. It is mutually exclusive - with sasUri property. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + with sasUri property. Type: string, SecureString or + AzureKeyVaultSecretReference. + :type connection_string: object :param sas_uri: SAS URI of the Azure Storage resource. It is mutually exclusive with connectionString property. :type sas_uri: ~azure.mgmt.datafactory.models.SecretBase @@ -56,7 +57,7 @@ class AzureStorageLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset_py3.py index 98956e68bc72..b0c1cd13e693 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class AzureTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_sink_py3.py index 2ba396eead2f..630df4f1f606 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class AzureTableSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_source_py3.py index 00c0fb93f3dc..30ca05775f27 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_table_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class AzureTableSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_events_trigger.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_events_trigger.py new file mode 100644 index 000000000000..cb8647fc1577 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_events_trigger.py @@ -0,0 +1,81 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .multiple_pipeline_trigger import MultiplePipelineTrigger + + +class BlobEventsTrigger(MultiplePipelineTrigger): + """Trigger that runs everytime a Blob event occurs. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param description: Trigger description. + :type description: str + :ivar runtime_state: Indicates if trigger is running or not. Updated when + Start/Stop APIs are called on the Trigger. Possible values include: + 'Started', 'Stopped', 'Disabled' + :vartype runtime_state: str or + ~azure.mgmt.datafactory.models.TriggerRuntimeState + :param type: Required. Constant filled by server. + :type type: str + :param pipelines: Pipelines that need to be started. + :type pipelines: + list[~azure.mgmt.datafactory.models.TriggerPipelineReference] + :param blob_path_begins_with: The blob path must begin with the pattern + provided for trigger to fire. For example, '/records/blobs/december/' will + only fire the trigger for blobs in the december folder under the records + container. At least one of these must be provided: blobPathBeginsWith, + blobPathEndsWith. + :type blob_path_begins_with: str + :param blob_path_ends_with: The blob path must end with the pattern + provided for trigger to fire. For example, 'december/boxes.csv' will only + fire the trigger for blobs named boxes in a december folder. At least one + of these must be provided: blobPathBeginsWith, blobPathEndsWith. + :type blob_path_ends_with: str + :param events: Required. The type of events that cause this trigger to + fire. + :type events: list[str or ~azure.mgmt.datafactory.models.BlobEventTypes] + :param scope: Required. The ARM resource ID of the Storage Account. + :type scope: str + """ + + _validation = { + 'runtime_state': {'readonly': True}, + 'type': {'required': True}, + 'events': {'required': True}, + 'scope': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'description': {'key': 'description', 'type': 'str'}, + 'runtime_state': {'key': 'runtimeState', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'pipelines': {'key': 'pipelines', 'type': '[TriggerPipelineReference]'}, + 'blob_path_begins_with': {'key': 'typeProperties.blobPathBeginsWith', 'type': 'str'}, + 'blob_path_ends_with': {'key': 'typeProperties.blobPathEndsWith', 'type': 'str'}, + 'events': {'key': 'typeProperties.events', 'type': '[str]'}, + 'scope': {'key': 'typeProperties.scope', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(BlobEventsTrigger, self).__init__(**kwargs) + self.blob_path_begins_with = kwargs.get('blob_path_begins_with', None) + self.blob_path_ends_with = kwargs.get('blob_path_ends_with', None) + self.events = kwargs.get('events', None) + self.scope = kwargs.get('scope', None) + self.type = 'BlobEventsTrigger' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_events_trigger_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_events_trigger_py3.py new file mode 100644 index 000000000000..150f9eed2012 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_events_trigger_py3.py @@ -0,0 +1,81 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .multiple_pipeline_trigger_py3 import MultiplePipelineTrigger + + +class BlobEventsTrigger(MultiplePipelineTrigger): + """Trigger that runs everytime a Blob event occurs. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param description: Trigger description. + :type description: str + :ivar runtime_state: Indicates if trigger is running or not. Updated when + Start/Stop APIs are called on the Trigger. Possible values include: + 'Started', 'Stopped', 'Disabled' + :vartype runtime_state: str or + ~azure.mgmt.datafactory.models.TriggerRuntimeState + :param type: Required. Constant filled by server. + :type type: str + :param pipelines: Pipelines that need to be started. + :type pipelines: + list[~azure.mgmt.datafactory.models.TriggerPipelineReference] + :param blob_path_begins_with: The blob path must begin with the pattern + provided for trigger to fire. For example, '/records/blobs/december/' will + only fire the trigger for blobs in the december folder under the records + container. At least one of these must be provided: blobPathBeginsWith, + blobPathEndsWith. + :type blob_path_begins_with: str + :param blob_path_ends_with: The blob path must end with the pattern + provided for trigger to fire. For example, 'december/boxes.csv' will only + fire the trigger for blobs named boxes in a december folder. At least one + of these must be provided: blobPathBeginsWith, blobPathEndsWith. + :type blob_path_ends_with: str + :param events: Required. The type of events that cause this trigger to + fire. + :type events: list[str or ~azure.mgmt.datafactory.models.BlobEventTypes] + :param scope: Required. The ARM resource ID of the Storage Account. + :type scope: str + """ + + _validation = { + 'runtime_state': {'readonly': True}, + 'type': {'required': True}, + 'events': {'required': True}, + 'scope': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'description': {'key': 'description', 'type': 'str'}, + 'runtime_state': {'key': 'runtimeState', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'pipelines': {'key': 'pipelines', 'type': '[TriggerPipelineReference]'}, + 'blob_path_begins_with': {'key': 'typeProperties.blobPathBeginsWith', 'type': 'str'}, + 'blob_path_ends_with': {'key': 'typeProperties.blobPathEndsWith', 'type': 'str'}, + 'events': {'key': 'typeProperties.events', 'type': '[str]'}, + 'scope': {'key': 'typeProperties.scope', 'type': 'str'}, + } + + def __init__(self, *, events, scope: str, additional_properties=None, description: str=None, pipelines=None, blob_path_begins_with: str=None, blob_path_ends_with: str=None, **kwargs) -> None: + super(BlobEventsTrigger, self).__init__(additional_properties=additional_properties, description=description, pipelines=pipelines, **kwargs) + self.blob_path_begins_with = blob_path_begins_with + self.blob_path_ends_with = blob_path_ends_with + self.events = events + self.scope = scope + self.type = 'BlobEventsTrigger' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_sink_py3.py index 7d8d3dc642fd..1d6ac96aff6e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class BlobSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_source_py3.py index 8c442e8f408f..5b9dc775f069 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class BlobSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_trigger_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_trigger_py3.py index f7123fbcf9bd..cf53b39ba72f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_trigger_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/blob_trigger_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .multiple_pipeline_trigger import MultiplePipelineTrigger +from .multiple_pipeline_trigger_py3 import MultiplePipelineTrigger class BlobTrigger(MultiplePipelineTrigger): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service_py3.py index 43a1e607b58f..dbc74f10002f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class CassandraLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_source_py3.py index 6c62419c1e29..323d85d1e742 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class CassandraSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset_py3.py index e8932fe02571..6927e69a6e0d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cassandra_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class CassandraTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service_py3.py index ba57ab2874c4..790e6bc76b76 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class ConcurLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset_py3.py index 50b5325f3656..b77695bdc037 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class ConcurObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_source_py3.py index d019deb98e5a..5205786a4585 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/concur_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class ConcurSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py index 72eb7caec9fb..8623e8d151e2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/control_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .activity import Activity +from .activity_py3 import Activity class ControlActivity(Activity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py index 6da5626be374..30dd29e42139 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class CopyActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py index e7c55fbe9e9c..9a11107fc8e8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source.py @@ -16,18 +16,19 @@ class CopySource(Model): """A copy activity source. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: AmazonRedshiftSource, SalesforceMarketingCloudSource, - VerticaSource, NetezzaSource, ZohoSource, XeroSource, SquareSource, - SparkSource, ShopifySource, ServiceNowSource, QuickBooksSource, - PrestoSource, PhoenixSource, PaypalSource, MarketoSource, MariaDBSource, - MagentoSource, JiraSource, ImpalaSource, HubspotSource, HiveSource, - HBaseSource, GreenplumSource, GoogleBigQuerySource, EloquaSource, - DrillSource, CouchbaseSource, ConcurSource, AzurePostgreSqlSource, - AmazonMWSSource, HttpSource, AzureDataLakeStoreSource, MongoDbSource, - CassandraSource, WebSource, OracleSource, AzureMySqlSource, HdfsSource, - FileSystemSource, SqlDWSource, SqlSource, SapEccSource, - SapCloudForCustomerSource, SalesforceSource, RelationalSource, - DynamicsSource, DocumentDbCollectionSource, BlobSource, AzureTableSource + sub-classes are: AmazonRedshiftSource, ResponsysSource, + SalesforceMarketingCloudSource, VerticaSource, NetezzaSource, ZohoSource, + XeroSource, SquareSource, SparkSource, ShopifySource, ServiceNowSource, + QuickBooksSource, PrestoSource, PhoenixSource, PaypalSource, MarketoSource, + MariaDBSource, MagentoSource, JiraSource, ImpalaSource, HubspotSource, + HiveSource, HBaseSource, GreenplumSource, GoogleBigQuerySource, + EloquaSource, DrillSource, CouchbaseSource, ConcurSource, + AzurePostgreSqlSource, AmazonMWSSource, HttpSource, + AzureDataLakeStoreSource, MongoDbSource, CassandraSource, WebSource, + OracleSource, AzureMySqlSource, HdfsSource, FileSystemSource, SqlDWSource, + SqlSource, SapEccSource, SapCloudForCustomerSource, SalesforceSource, + RelationalSource, DynamicsSource, DocumentDbCollectionSource, BlobSource, + AzureTableSource All required parameters must be populated in order to send to Azure. @@ -57,7 +58,7 @@ class CopySource(Model): } _subtype_map = { - 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', 'SalesforceMarketingCloudSource': 'SalesforceMarketingCloudSource', 'VerticaSource': 'VerticaSource', 'NetezzaSource': 'NetezzaSource', 'ZohoSource': 'ZohoSource', 'XeroSource': 'XeroSource', 'SquareSource': 'SquareSource', 'SparkSource': 'SparkSource', 'ShopifySource': 'ShopifySource', 'ServiceNowSource': 'ServiceNowSource', 'QuickBooksSource': 'QuickBooksSource', 'PrestoSource': 'PrestoSource', 'PhoenixSource': 'PhoenixSource', 'PaypalSource': 'PaypalSource', 'MarketoSource': 'MarketoSource', 'MariaDBSource': 'MariaDBSource', 'MagentoSource': 'MagentoSource', 'JiraSource': 'JiraSource', 'ImpalaSource': 'ImpalaSource', 'HubspotSource': 'HubspotSource', 'HiveSource': 'HiveSource', 'HBaseSource': 'HBaseSource', 'GreenplumSource': 'GreenplumSource', 'GoogleBigQuerySource': 'GoogleBigQuerySource', 'EloquaSource': 'EloquaSource', 'DrillSource': 'DrillSource', 'CouchbaseSource': 'CouchbaseSource', 'ConcurSource': 'ConcurSource', 'AzurePostgreSqlSource': 'AzurePostgreSqlSource', 'AmazonMWSSource': 'AmazonMWSSource', 'HttpSource': 'HttpSource', 'AzureDataLakeStoreSource': 'AzureDataLakeStoreSource', 'MongoDbSource': 'MongoDbSource', 'CassandraSource': 'CassandraSource', 'WebSource': 'WebSource', 'OracleSource': 'OracleSource', 'AzureMySqlSource': 'AzureMySqlSource', 'HdfsSource': 'HdfsSource', 'FileSystemSource': 'FileSystemSource', 'SqlDWSource': 'SqlDWSource', 'SqlSource': 'SqlSource', 'SapEccSource': 'SapEccSource', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} + 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', 'ResponsysSource': 'ResponsysSource', 'SalesforceMarketingCloudSource': 'SalesforceMarketingCloudSource', 'VerticaSource': 'VerticaSource', 'NetezzaSource': 'NetezzaSource', 'ZohoSource': 'ZohoSource', 'XeroSource': 'XeroSource', 'SquareSource': 'SquareSource', 'SparkSource': 'SparkSource', 'ShopifySource': 'ShopifySource', 'ServiceNowSource': 'ServiceNowSource', 'QuickBooksSource': 'QuickBooksSource', 'PrestoSource': 'PrestoSource', 'PhoenixSource': 'PhoenixSource', 'PaypalSource': 'PaypalSource', 'MarketoSource': 'MarketoSource', 'MariaDBSource': 'MariaDBSource', 'MagentoSource': 'MagentoSource', 'JiraSource': 'JiraSource', 'ImpalaSource': 'ImpalaSource', 'HubspotSource': 'HubspotSource', 'HiveSource': 'HiveSource', 'HBaseSource': 'HBaseSource', 'GreenplumSource': 'GreenplumSource', 'GoogleBigQuerySource': 'GoogleBigQuerySource', 'EloquaSource': 'EloquaSource', 'DrillSource': 'DrillSource', 'CouchbaseSource': 'CouchbaseSource', 'ConcurSource': 'ConcurSource', 'AzurePostgreSqlSource': 'AzurePostgreSqlSource', 'AmazonMWSSource': 'AmazonMWSSource', 'HttpSource': 'HttpSource', 'AzureDataLakeStoreSource': 'AzureDataLakeStoreSource', 'MongoDbSource': 'MongoDbSource', 'CassandraSource': 'CassandraSource', 'WebSource': 'WebSource', 'OracleSource': 'OracleSource', 'AzureMySqlSource': 'AzureMySqlSource', 'HdfsSource': 'HdfsSource', 'FileSystemSource': 'FileSystemSource', 'SqlDWSource': 'SqlDWSource', 'SqlSource': 'SqlSource', 'SapEccSource': 'SapEccSource', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source_py3.py index f117bfbe7c3b..7c1a96b2897a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/copy_source_py3.py @@ -16,18 +16,19 @@ class CopySource(Model): """A copy activity source. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: AmazonRedshiftSource, SalesforceMarketingCloudSource, - VerticaSource, NetezzaSource, ZohoSource, XeroSource, SquareSource, - SparkSource, ShopifySource, ServiceNowSource, QuickBooksSource, - PrestoSource, PhoenixSource, PaypalSource, MarketoSource, MariaDBSource, - MagentoSource, JiraSource, ImpalaSource, HubspotSource, HiveSource, - HBaseSource, GreenplumSource, GoogleBigQuerySource, EloquaSource, - DrillSource, CouchbaseSource, ConcurSource, AzurePostgreSqlSource, - AmazonMWSSource, HttpSource, AzureDataLakeStoreSource, MongoDbSource, - CassandraSource, WebSource, OracleSource, AzureMySqlSource, HdfsSource, - FileSystemSource, SqlDWSource, SqlSource, SapEccSource, - SapCloudForCustomerSource, SalesforceSource, RelationalSource, - DynamicsSource, DocumentDbCollectionSource, BlobSource, AzureTableSource + sub-classes are: AmazonRedshiftSource, ResponsysSource, + SalesforceMarketingCloudSource, VerticaSource, NetezzaSource, ZohoSource, + XeroSource, SquareSource, SparkSource, ShopifySource, ServiceNowSource, + QuickBooksSource, PrestoSource, PhoenixSource, PaypalSource, MarketoSource, + MariaDBSource, MagentoSource, JiraSource, ImpalaSource, HubspotSource, + HiveSource, HBaseSource, GreenplumSource, GoogleBigQuerySource, + EloquaSource, DrillSource, CouchbaseSource, ConcurSource, + AzurePostgreSqlSource, AmazonMWSSource, HttpSource, + AzureDataLakeStoreSource, MongoDbSource, CassandraSource, WebSource, + OracleSource, AzureMySqlSource, HdfsSource, FileSystemSource, SqlDWSource, + SqlSource, SapEccSource, SapCloudForCustomerSource, SalesforceSource, + RelationalSource, DynamicsSource, DocumentDbCollectionSource, BlobSource, + AzureTableSource All required parameters must be populated in order to send to Azure. @@ -57,7 +58,7 @@ class CopySource(Model): } _subtype_map = { - 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', 'SalesforceMarketingCloudSource': 'SalesforceMarketingCloudSource', 'VerticaSource': 'VerticaSource', 'NetezzaSource': 'NetezzaSource', 'ZohoSource': 'ZohoSource', 'XeroSource': 'XeroSource', 'SquareSource': 'SquareSource', 'SparkSource': 'SparkSource', 'ShopifySource': 'ShopifySource', 'ServiceNowSource': 'ServiceNowSource', 'QuickBooksSource': 'QuickBooksSource', 'PrestoSource': 'PrestoSource', 'PhoenixSource': 'PhoenixSource', 'PaypalSource': 'PaypalSource', 'MarketoSource': 'MarketoSource', 'MariaDBSource': 'MariaDBSource', 'MagentoSource': 'MagentoSource', 'JiraSource': 'JiraSource', 'ImpalaSource': 'ImpalaSource', 'HubspotSource': 'HubspotSource', 'HiveSource': 'HiveSource', 'HBaseSource': 'HBaseSource', 'GreenplumSource': 'GreenplumSource', 'GoogleBigQuerySource': 'GoogleBigQuerySource', 'EloquaSource': 'EloquaSource', 'DrillSource': 'DrillSource', 'CouchbaseSource': 'CouchbaseSource', 'ConcurSource': 'ConcurSource', 'AzurePostgreSqlSource': 'AzurePostgreSqlSource', 'AmazonMWSSource': 'AmazonMWSSource', 'HttpSource': 'HttpSource', 'AzureDataLakeStoreSource': 'AzureDataLakeStoreSource', 'MongoDbSource': 'MongoDbSource', 'CassandraSource': 'CassandraSource', 'WebSource': 'WebSource', 'OracleSource': 'OracleSource', 'AzureMySqlSource': 'AzureMySqlSource', 'HdfsSource': 'HdfsSource', 'FileSystemSource': 'FileSystemSource', 'SqlDWSource': 'SqlDWSource', 'SqlSource': 'SqlSource', 'SapEccSource': 'SapEccSource', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} + 'type': {'AmazonRedshiftSource': 'AmazonRedshiftSource', 'ResponsysSource': 'ResponsysSource', 'SalesforceMarketingCloudSource': 'SalesforceMarketingCloudSource', 'VerticaSource': 'VerticaSource', 'NetezzaSource': 'NetezzaSource', 'ZohoSource': 'ZohoSource', 'XeroSource': 'XeroSource', 'SquareSource': 'SquareSource', 'SparkSource': 'SparkSource', 'ShopifySource': 'ShopifySource', 'ServiceNowSource': 'ServiceNowSource', 'QuickBooksSource': 'QuickBooksSource', 'PrestoSource': 'PrestoSource', 'PhoenixSource': 'PhoenixSource', 'PaypalSource': 'PaypalSource', 'MarketoSource': 'MarketoSource', 'MariaDBSource': 'MariaDBSource', 'MagentoSource': 'MagentoSource', 'JiraSource': 'JiraSource', 'ImpalaSource': 'ImpalaSource', 'HubspotSource': 'HubspotSource', 'HiveSource': 'HiveSource', 'HBaseSource': 'HBaseSource', 'GreenplumSource': 'GreenplumSource', 'GoogleBigQuerySource': 'GoogleBigQuerySource', 'EloquaSource': 'EloquaSource', 'DrillSource': 'DrillSource', 'CouchbaseSource': 'CouchbaseSource', 'ConcurSource': 'ConcurSource', 'AzurePostgreSqlSource': 'AzurePostgreSqlSource', 'AmazonMWSSource': 'AmazonMWSSource', 'HttpSource': 'HttpSource', 'AzureDataLakeStoreSource': 'AzureDataLakeStoreSource', 'MongoDbSource': 'MongoDbSource', 'CassandraSource': 'CassandraSource', 'WebSource': 'WebSource', 'OracleSource': 'OracleSource', 'AzureMySqlSource': 'AzureMySqlSource', 'HdfsSource': 'HdfsSource', 'FileSystemSource': 'FileSystemSource', 'SqlDWSource': 'SqlDWSource', 'SqlSource': 'SqlSource', 'SapEccSource': 'SapEccSource', 'SapCloudForCustomerSource': 'SapCloudForCustomerSource', 'SalesforceSource': 'SalesforceSource', 'RelationalSource': 'RelationalSource', 'DynamicsSource': 'DynamicsSource', 'DocumentDbCollectionSource': 'DocumentDbCollectionSource', 'BlobSource': 'BlobSource', 'AzureTableSource': 'AzureTableSource'} } def __init__(self, *, additional_properties=None, source_retry_count=None, source_retry_wait=None, **kwargs) -> None: diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py index 1ca42b56e86d..98d6e9a81eea 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service.py @@ -33,8 +33,9 @@ class CosmosDbLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -53,7 +54,7 @@ class CosmosDbLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service_py3.py index 8bf8ce4bf74a..a338f3dc093b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/cosmos_db_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class CosmosDbLinkedService(LinkedService): @@ -33,8 +33,9 @@ class CosmosDbLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -53,7 +54,7 @@ class CosmosDbLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py index 63787690a7ab..7c8aceb401dd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service.py @@ -33,8 +33,9 @@ class CouchbaseLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class CouchbaseLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service_py3.py index 3c53fb08cd4e..7f94dca390eb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class CouchbaseLinkedService(LinkedService): @@ -33,8 +33,9 @@ class CouchbaseLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class CouchbaseLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_source_py3.py index 21535b3f1987..cc661253a13d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class CouchbaseSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset_py3.py index 99f9d2e8d218..aab909106680 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/couchbase_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class CouchbaseTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py index 65520468a96c..10542a55610f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class CustomActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service_py3.py index d11e5f8f8076..2ec05f7a32d9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_data_source_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class CustomDataSourceLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset_py3.py index e8c97da85a2d..8070049fa8cd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/custom_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class CustomDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py index cb828e14276b..fb948ae66a19 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_factory_management_client_enums.py @@ -248,6 +248,12 @@ class TumblingWindowFrequency(str, Enum): hour = "Hour" +class BlobEventTypes(str, Enum): + + microsoft_storage_blob_created = "Microsoft.Storage.BlobCreated" + microsoft_storage_blob_deleted = "Microsoft.Storage.BlobDeleted" + + class DayOfWeek(str, Enum): sunday = "Sunday" diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py index 022ec770081d..3b0ff6dbe94f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/data_lake_analytics_usql_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class DataLakeAnalyticsUSQLActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py index a2beeb2fe9dd..cefdc1681830 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/databricks_notebook_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class DatabricksNotebookActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py index 9fc6e4a433f6..4ebebafdda73 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset.py @@ -17,18 +17,19 @@ class Dataset(Model): data stores, such as tables, files, folders, and documents. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: SalesforceMarketingCloudObjectDataset, - VerticaTableDataset, NetezzaTableDataset, ZohoObjectDataset, - XeroObjectDataset, SquareObjectDataset, SparkObjectDataset, - ShopifyObjectDataset, ServiceNowObjectDataset, QuickBooksObjectDataset, - PrestoObjectDataset, PhoenixObjectDataset, PaypalObjectDataset, - MarketoObjectDataset, MariaDBTableDataset, MagentoObjectDataset, - JiraObjectDataset, ImpalaObjectDataset, HubspotObjectDataset, - HiveObjectDataset, HBaseObjectDataset, GreenplumTableDataset, - GoogleBigQueryObjectDataset, EloquaObjectDataset, DrillTableDataset, - CouchbaseTableDataset, ConcurObjectDataset, AzurePostgreSqlTableDataset, - AmazonMWSObjectDataset, HttpDataset, AzureSearchIndexDataset, - WebTableDataset, SqlServerTableDataset, SapEccResourceDataset, + sub-classes are: ResponsysObjectDataset, + SalesforceMarketingCloudObjectDataset, VerticaTableDataset, + NetezzaTableDataset, ZohoObjectDataset, XeroObjectDataset, + SquareObjectDataset, SparkObjectDataset, ShopifyObjectDataset, + ServiceNowObjectDataset, QuickBooksObjectDataset, PrestoObjectDataset, + PhoenixObjectDataset, PaypalObjectDataset, MarketoObjectDataset, + MariaDBTableDataset, MagentoObjectDataset, JiraObjectDataset, + ImpalaObjectDataset, HubspotObjectDataset, HiveObjectDataset, + HBaseObjectDataset, GreenplumTableDataset, GoogleBigQueryObjectDataset, + EloquaObjectDataset, DrillTableDataset, CouchbaseTableDataset, + ConcurObjectDataset, AzurePostgreSqlTableDataset, AmazonMWSObjectDataset, + HttpDataset, AzureSearchIndexDataset, WebTableDataset, + SqlServerTableDataset, SapEccResourceDataset, SapCloudForCustomerResourceDataset, SalesforceObjectDataset, RelationalTableDataset, AzureMySqlTableDataset, OracleTableDataset, ODataResourceDataset, MongoDbCollectionDataset, FileShareDataset, @@ -76,7 +77,7 @@ class Dataset(Model): } _subtype_map = { - 'type': {'SalesforceMarketingCloudObject': 'SalesforceMarketingCloudObjectDataset', 'VerticaTable': 'VerticaTableDataset', 'NetezzaTable': 'NetezzaTableDataset', 'ZohoObject': 'ZohoObjectDataset', 'XeroObject': 'XeroObjectDataset', 'SquareObject': 'SquareObjectDataset', 'SparkObject': 'SparkObjectDataset', 'ShopifyObject': 'ShopifyObjectDataset', 'ServiceNowObject': 'ServiceNowObjectDataset', 'QuickBooksObject': 'QuickBooksObjectDataset', 'PrestoObject': 'PrestoObjectDataset', 'PhoenixObject': 'PhoenixObjectDataset', 'PaypalObject': 'PaypalObjectDataset', 'MarketoObject': 'MarketoObjectDataset', 'MariaDBTable': 'MariaDBTableDataset', 'MagentoObject': 'MagentoObjectDataset', 'JiraObject': 'JiraObjectDataset', 'ImpalaObject': 'ImpalaObjectDataset', 'HubspotObject': 'HubspotObjectDataset', 'HiveObject': 'HiveObjectDataset', 'HBaseObject': 'HBaseObjectDataset', 'GreenplumTable': 'GreenplumTableDataset', 'GoogleBigQueryObject': 'GoogleBigQueryObjectDataset', 'EloquaObject': 'EloquaObjectDataset', 'DrillTable': 'DrillTableDataset', 'CouchbaseTable': 'CouchbaseTableDataset', 'ConcurObject': 'ConcurObjectDataset', 'AzurePostgreSqlTable': 'AzurePostgreSqlTableDataset', 'AmazonMWSObject': 'AmazonMWSObjectDataset', 'HttpFile': 'HttpDataset', 'AzureSearchIndex': 'AzureSearchIndexDataset', 'WebTable': 'WebTableDataset', 'SqlServerTable': 'SqlServerTableDataset', 'SapEccResource': 'SapEccResourceDataset', 'SapCloudForCustomerResource': 'SapCloudForCustomerResourceDataset', 'SalesforceObject': 'SalesforceObjectDataset', 'RelationalTable': 'RelationalTableDataset', 'AzureMySqlTable': 'AzureMySqlTableDataset', 'OracleTable': 'OracleTableDataset', 'ODataResource': 'ODataResourceDataset', 'MongoDbCollection': 'MongoDbCollectionDataset', 'FileShare': 'FileShareDataset', 'AzureDataLakeStoreFile': 'AzureDataLakeStoreDataset', 'DynamicsEntity': 'DynamicsEntityDataset', 'DocumentDbCollection': 'DocumentDbCollectionDataset', 'CustomDataset': 'CustomDataset', 'CassandraTable': 'CassandraTableDataset', 'AzureSqlDWTable': 'AzureSqlDWTableDataset', 'AzureSqlTable': 'AzureSqlTableDataset', 'AzureTable': 'AzureTableDataset', 'AzureBlob': 'AzureBlobDataset', 'AmazonS3Object': 'AmazonS3Dataset'} + 'type': {'ResponsysObject': 'ResponsysObjectDataset', 'SalesforceMarketingCloudObject': 'SalesforceMarketingCloudObjectDataset', 'VerticaTable': 'VerticaTableDataset', 'NetezzaTable': 'NetezzaTableDataset', 'ZohoObject': 'ZohoObjectDataset', 'XeroObject': 'XeroObjectDataset', 'SquareObject': 'SquareObjectDataset', 'SparkObject': 'SparkObjectDataset', 'ShopifyObject': 'ShopifyObjectDataset', 'ServiceNowObject': 'ServiceNowObjectDataset', 'QuickBooksObject': 'QuickBooksObjectDataset', 'PrestoObject': 'PrestoObjectDataset', 'PhoenixObject': 'PhoenixObjectDataset', 'PaypalObject': 'PaypalObjectDataset', 'MarketoObject': 'MarketoObjectDataset', 'MariaDBTable': 'MariaDBTableDataset', 'MagentoObject': 'MagentoObjectDataset', 'JiraObject': 'JiraObjectDataset', 'ImpalaObject': 'ImpalaObjectDataset', 'HubspotObject': 'HubspotObjectDataset', 'HiveObject': 'HiveObjectDataset', 'HBaseObject': 'HBaseObjectDataset', 'GreenplumTable': 'GreenplumTableDataset', 'GoogleBigQueryObject': 'GoogleBigQueryObjectDataset', 'EloquaObject': 'EloquaObjectDataset', 'DrillTable': 'DrillTableDataset', 'CouchbaseTable': 'CouchbaseTableDataset', 'ConcurObject': 'ConcurObjectDataset', 'AzurePostgreSqlTable': 'AzurePostgreSqlTableDataset', 'AmazonMWSObject': 'AmazonMWSObjectDataset', 'HttpFile': 'HttpDataset', 'AzureSearchIndex': 'AzureSearchIndexDataset', 'WebTable': 'WebTableDataset', 'SqlServerTable': 'SqlServerTableDataset', 'SapEccResource': 'SapEccResourceDataset', 'SapCloudForCustomerResource': 'SapCloudForCustomerResourceDataset', 'SalesforceObject': 'SalesforceObjectDataset', 'RelationalTable': 'RelationalTableDataset', 'AzureMySqlTable': 'AzureMySqlTableDataset', 'OracleTable': 'OracleTableDataset', 'ODataResource': 'ODataResourceDataset', 'MongoDbCollection': 'MongoDbCollectionDataset', 'FileShare': 'FileShareDataset', 'AzureDataLakeStoreFile': 'AzureDataLakeStoreDataset', 'DynamicsEntity': 'DynamicsEntityDataset', 'DocumentDbCollection': 'DocumentDbCollectionDataset', 'CustomDataset': 'CustomDataset', 'CassandraTable': 'CassandraTableDataset', 'AzureSqlDWTable': 'AzureSqlDWTableDataset', 'AzureSqlTable': 'AzureSqlTableDataset', 'AzureTable': 'AzureTableDataset', 'AzureBlob': 'AzureBlobDataset', 'AmazonS3Object': 'AmazonS3Dataset'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_bzip2_compression_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_bzip2_compression_py3.py index fbf34be77561..f97af4588e0a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_bzip2_compression_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_bzip2_compression_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_compression import DatasetCompression +from .dataset_compression_py3 import DatasetCompression class DatasetBZip2Compression(DatasetCompression): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_deflate_compression_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_deflate_compression_py3.py index 14a7e8be45c9..715fe91a12a3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_deflate_compression_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_deflate_compression_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_compression import DatasetCompression +from .dataset_compression_py3 import DatasetCompression class DatasetDeflateCompression(DatasetCompression): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_gzip_compression_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_gzip_compression_py3.py index 7e8f11cf8e87..99b1081469f8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_gzip_compression_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_gzip_compression_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_compression import DatasetCompression +from .dataset_compression_py3 import DatasetCompression class DatasetGZipCompression(DatasetCompression): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_py3.py index 18d3a0d74068..65f43811d7a7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_py3.py @@ -17,18 +17,19 @@ class Dataset(Model): data stores, such as tables, files, folders, and documents. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: SalesforceMarketingCloudObjectDataset, - VerticaTableDataset, NetezzaTableDataset, ZohoObjectDataset, - XeroObjectDataset, SquareObjectDataset, SparkObjectDataset, - ShopifyObjectDataset, ServiceNowObjectDataset, QuickBooksObjectDataset, - PrestoObjectDataset, PhoenixObjectDataset, PaypalObjectDataset, - MarketoObjectDataset, MariaDBTableDataset, MagentoObjectDataset, - JiraObjectDataset, ImpalaObjectDataset, HubspotObjectDataset, - HiveObjectDataset, HBaseObjectDataset, GreenplumTableDataset, - GoogleBigQueryObjectDataset, EloquaObjectDataset, DrillTableDataset, - CouchbaseTableDataset, ConcurObjectDataset, AzurePostgreSqlTableDataset, - AmazonMWSObjectDataset, HttpDataset, AzureSearchIndexDataset, - WebTableDataset, SqlServerTableDataset, SapEccResourceDataset, + sub-classes are: ResponsysObjectDataset, + SalesforceMarketingCloudObjectDataset, VerticaTableDataset, + NetezzaTableDataset, ZohoObjectDataset, XeroObjectDataset, + SquareObjectDataset, SparkObjectDataset, ShopifyObjectDataset, + ServiceNowObjectDataset, QuickBooksObjectDataset, PrestoObjectDataset, + PhoenixObjectDataset, PaypalObjectDataset, MarketoObjectDataset, + MariaDBTableDataset, MagentoObjectDataset, JiraObjectDataset, + ImpalaObjectDataset, HubspotObjectDataset, HiveObjectDataset, + HBaseObjectDataset, GreenplumTableDataset, GoogleBigQueryObjectDataset, + EloquaObjectDataset, DrillTableDataset, CouchbaseTableDataset, + ConcurObjectDataset, AzurePostgreSqlTableDataset, AmazonMWSObjectDataset, + HttpDataset, AzureSearchIndexDataset, WebTableDataset, + SqlServerTableDataset, SapEccResourceDataset, SapCloudForCustomerResourceDataset, SalesforceObjectDataset, RelationalTableDataset, AzureMySqlTableDataset, OracleTableDataset, ODataResourceDataset, MongoDbCollectionDataset, FileShareDataset, @@ -76,7 +77,7 @@ class Dataset(Model): } _subtype_map = { - 'type': {'SalesforceMarketingCloudObject': 'SalesforceMarketingCloudObjectDataset', 'VerticaTable': 'VerticaTableDataset', 'NetezzaTable': 'NetezzaTableDataset', 'ZohoObject': 'ZohoObjectDataset', 'XeroObject': 'XeroObjectDataset', 'SquareObject': 'SquareObjectDataset', 'SparkObject': 'SparkObjectDataset', 'ShopifyObject': 'ShopifyObjectDataset', 'ServiceNowObject': 'ServiceNowObjectDataset', 'QuickBooksObject': 'QuickBooksObjectDataset', 'PrestoObject': 'PrestoObjectDataset', 'PhoenixObject': 'PhoenixObjectDataset', 'PaypalObject': 'PaypalObjectDataset', 'MarketoObject': 'MarketoObjectDataset', 'MariaDBTable': 'MariaDBTableDataset', 'MagentoObject': 'MagentoObjectDataset', 'JiraObject': 'JiraObjectDataset', 'ImpalaObject': 'ImpalaObjectDataset', 'HubspotObject': 'HubspotObjectDataset', 'HiveObject': 'HiveObjectDataset', 'HBaseObject': 'HBaseObjectDataset', 'GreenplumTable': 'GreenplumTableDataset', 'GoogleBigQueryObject': 'GoogleBigQueryObjectDataset', 'EloquaObject': 'EloquaObjectDataset', 'DrillTable': 'DrillTableDataset', 'CouchbaseTable': 'CouchbaseTableDataset', 'ConcurObject': 'ConcurObjectDataset', 'AzurePostgreSqlTable': 'AzurePostgreSqlTableDataset', 'AmazonMWSObject': 'AmazonMWSObjectDataset', 'HttpFile': 'HttpDataset', 'AzureSearchIndex': 'AzureSearchIndexDataset', 'WebTable': 'WebTableDataset', 'SqlServerTable': 'SqlServerTableDataset', 'SapEccResource': 'SapEccResourceDataset', 'SapCloudForCustomerResource': 'SapCloudForCustomerResourceDataset', 'SalesforceObject': 'SalesforceObjectDataset', 'RelationalTable': 'RelationalTableDataset', 'AzureMySqlTable': 'AzureMySqlTableDataset', 'OracleTable': 'OracleTableDataset', 'ODataResource': 'ODataResourceDataset', 'MongoDbCollection': 'MongoDbCollectionDataset', 'FileShare': 'FileShareDataset', 'AzureDataLakeStoreFile': 'AzureDataLakeStoreDataset', 'DynamicsEntity': 'DynamicsEntityDataset', 'DocumentDbCollection': 'DocumentDbCollectionDataset', 'CustomDataset': 'CustomDataset', 'CassandraTable': 'CassandraTableDataset', 'AzureSqlDWTable': 'AzureSqlDWTableDataset', 'AzureSqlTable': 'AzureSqlTableDataset', 'AzureTable': 'AzureTableDataset', 'AzureBlob': 'AzureBlobDataset', 'AmazonS3Object': 'AmazonS3Dataset'} + 'type': {'ResponsysObject': 'ResponsysObjectDataset', 'SalesforceMarketingCloudObject': 'SalesforceMarketingCloudObjectDataset', 'VerticaTable': 'VerticaTableDataset', 'NetezzaTable': 'NetezzaTableDataset', 'ZohoObject': 'ZohoObjectDataset', 'XeroObject': 'XeroObjectDataset', 'SquareObject': 'SquareObjectDataset', 'SparkObject': 'SparkObjectDataset', 'ShopifyObject': 'ShopifyObjectDataset', 'ServiceNowObject': 'ServiceNowObjectDataset', 'QuickBooksObject': 'QuickBooksObjectDataset', 'PrestoObject': 'PrestoObjectDataset', 'PhoenixObject': 'PhoenixObjectDataset', 'PaypalObject': 'PaypalObjectDataset', 'MarketoObject': 'MarketoObjectDataset', 'MariaDBTable': 'MariaDBTableDataset', 'MagentoObject': 'MagentoObjectDataset', 'JiraObject': 'JiraObjectDataset', 'ImpalaObject': 'ImpalaObjectDataset', 'HubspotObject': 'HubspotObjectDataset', 'HiveObject': 'HiveObjectDataset', 'HBaseObject': 'HBaseObjectDataset', 'GreenplumTable': 'GreenplumTableDataset', 'GoogleBigQueryObject': 'GoogleBigQueryObjectDataset', 'EloquaObject': 'EloquaObjectDataset', 'DrillTable': 'DrillTableDataset', 'CouchbaseTable': 'CouchbaseTableDataset', 'ConcurObject': 'ConcurObjectDataset', 'AzurePostgreSqlTable': 'AzurePostgreSqlTableDataset', 'AmazonMWSObject': 'AmazonMWSObjectDataset', 'HttpFile': 'HttpDataset', 'AzureSearchIndex': 'AzureSearchIndexDataset', 'WebTable': 'WebTableDataset', 'SqlServerTable': 'SqlServerTableDataset', 'SapEccResource': 'SapEccResourceDataset', 'SapCloudForCustomerResource': 'SapCloudForCustomerResourceDataset', 'SalesforceObject': 'SalesforceObjectDataset', 'RelationalTable': 'RelationalTableDataset', 'AzureMySqlTable': 'AzureMySqlTableDataset', 'OracleTable': 'OracleTableDataset', 'ODataResource': 'ODataResourceDataset', 'MongoDbCollection': 'MongoDbCollectionDataset', 'FileShare': 'FileShareDataset', 'AzureDataLakeStoreFile': 'AzureDataLakeStoreDataset', 'DynamicsEntity': 'DynamicsEntityDataset', 'DocumentDbCollection': 'DocumentDbCollectionDataset', 'CustomDataset': 'CustomDataset', 'CassandraTable': 'CassandraTableDataset', 'AzureSqlDWTable': 'AzureSqlDWTableDataset', 'AzureSqlTable': 'AzureSqlTableDataset', 'AzureTable': 'AzureTableDataset', 'AzureBlob': 'AzureBlobDataset', 'AmazonS3Object': 'AmazonS3Dataset'} } def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, **kwargs) -> None: diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_resource_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_resource_py3.py index 1e82ef161d47..6eb099dcb884 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_resource_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .sub_resource import SubResource +from .sub_resource_py3 import SubResource class DatasetResource(SubResource): @@ -49,5 +49,5 @@ class DatasetResource(SubResource): } def __init__(self, *, properties, **kwargs) -> None: - super(DatasetResource, self).__init__(, **kwargs) + super(DatasetResource, self).__init__(**kwargs) self.properties = properties diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_zip_deflate_compression_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_zip_deflate_compression_py3.py index c6b0bae79f0c..74fbb92ce1ab 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_zip_deflate_compression_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dataset_zip_deflate_compression_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_compression import DatasetCompression +from .dataset_compression_py3 import DatasetCompression class DatasetZipDeflateCompression(DatasetCompression): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py index a3349c5b7ab2..9349bbcba5e0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service.py @@ -39,9 +39,6 @@ class Db2LinkedService(LinkedService): :param database: Required. Database name for connection. Type: string (or Expression with resultType string). :type database: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object :param authentication_type: AuthenticationType to be used for connection. Possible values include: 'Basic' :type authentication_type: str or @@ -72,7 +69,6 @@ class Db2LinkedService(LinkedService): 'type': {'key': 'type', 'type': 'str'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'database': {'key': 'typeProperties.database', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, @@ -83,7 +79,6 @@ def __init__(self, **kwargs): super(Db2LinkedService, self).__init__(**kwargs) self.server = kwargs.get('server', None) self.database = kwargs.get('database', None) - self.schema = kwargs.get('schema', None) self.authentication_type = kwargs.get('authentication_type', None) self.username = kwargs.get('username', None) self.password = kwargs.get('password', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service_py3.py index ff86655a9386..d339860c3229 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/db2_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class Db2LinkedService(LinkedService): @@ -39,9 +39,6 @@ class Db2LinkedService(LinkedService): :param database: Required. Database name for connection. Type: string (or Expression with resultType string). :type database: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object :param authentication_type: AuthenticationType to be used for connection. Possible values include: 'Basic' :type authentication_type: str or @@ -72,18 +69,16 @@ class Db2LinkedService(LinkedService): 'type': {'key': 'type', 'type': 'str'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, 'database': {'key': 'typeProperties.database', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, server, database, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, server, database, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, authentication_type=None, username=None, password=None, encrypted_credential=None, **kwargs) -> None: super(Db2LinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.server = server self.database = database - self.schema = schema self.authentication_type = authentication_type self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset_py3.py index e05756941c1c..e30288172785 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class DocumentDbCollectionDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_sink_py3.py index be10d5704bb4..5377d4ed5aa5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class DocumentDbCollectionSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_source_py3.py index 7e72aa6f9800..9c20bfbfa132 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/document_db_collection_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class DocumentDbCollectionSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py index 2cd19dd6fdd8..0ece6ef6ad05 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service.py @@ -33,8 +33,9 @@ class DrillLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class DrillLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service_py3.py index 7deba2b1e73d..7e6a7a64bde2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class DrillLinkedService(LinkedService): @@ -33,8 +33,9 @@ class DrillLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class DrillLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_source_py3.py index a68ea79a5238..ea67bbef64fb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class DrillSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset_py3.py index 325085161353..cdff7f8360ca 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/drill_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class DrillTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset_py3.py index 50c02ae54167..4a5e6f3f542b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_entity_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class DynamicsEntityDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service_py3.py index f5349731c817..4971dabfba16 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class DynamicsLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_sink_py3.py index 6b301a3f75d7..2e2a64169797 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class DynamicsSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_source_py3.py index a01986da60db..9c921cf40f3a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/dynamics_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class DynamicsSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service_py3.py index ec0af56a9dd1..1c6bd97ecf9d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class EloquaLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset_py3.py index 4150adf6e7ad..fe8be1261fcd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class EloquaObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_source_py3.py index f613b9a0e905..c9d96711743f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/eloqua_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class EloquaSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py index 72fd5fa3015e..2550875243b6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_pipeline_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .control_activity import ControlActivity +from .control_activity_py3 import ControlActivity class ExecutePipelineActivity(ControlActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py index 9c1de33e7433..6b58bf34b57b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execute_ssis_package_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class ExecuteSSISPackageActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py index 2d9e3324ffd0..0617ad31da47 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/execution_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .activity import Activity +from .activity_py3 import Activity class ExecutionActivity(Activity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py index 3c1fdbada034..eaeaa060605e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory.py @@ -39,6 +39,9 @@ class Factory(Resource): :vartype create_time: datetime :ivar version: Version of the factory. :vartype version: str + :param vsts_configuration: VSTS repo information of the factory. + :type vsts_configuration: + ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration """ _validation = { @@ -61,6 +64,7 @@ class Factory(Resource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'create_time': {'key': 'properties.createTime', 'type': 'iso-8601'}, 'version': {'key': 'properties.version', 'type': 'str'}, + 'vsts_configuration': {'key': 'properties.vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, } def __init__(self, **kwargs): @@ -70,3 +74,4 @@ def __init__(self, **kwargs): self.provisioning_state = None self.create_time = None self.version = None + self.vsts_configuration = kwargs.get('vsts_configuration', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py index 57bc1be61aae..b718282c585a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class Factory(Resource): @@ -39,6 +39,9 @@ class Factory(Resource): :vartype create_time: datetime :ivar version: Version of the factory. :vartype version: str + :param vsts_configuration: VSTS repo information of the factory. + :type vsts_configuration: + ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration """ _validation = { @@ -61,12 +64,14 @@ class Factory(Resource): 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'create_time': {'key': 'properties.createTime', 'type': 'iso-8601'}, 'version': {'key': 'properties.version', 'type': 'str'}, + 'vsts_configuration': {'key': 'properties.vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, } - def __init__(self, *, location: str=None, tags=None, additional_properties=None, identity=None, **kwargs) -> None: + def __init__(self, *, location: str=None, tags=None, additional_properties=None, identity=None, vsts_configuration=None, **kwargs) -> None: super(Factory, self).__init__(location=location, tags=tags, **kwargs) self.additional_properties = additional_properties self.identity = identity self.provisioning_state = None self.create_time = None self.version = None + self.vsts_configuration = vsts_configuration diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py new file mode 100644 index 000000000000..7651442cd45c --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FactoryRepoUpdate(Model): + """Factory's VSTS repo information. + + :param factory_resource_id: The factory resource id. + :type factory_resource_id: str + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param vsts_configuration: VSTS repo information of the factory. + :type vsts_configuration: + ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration + """ + + _attribute_map = { + 'factory_resource_id': {'key': 'factoryResourceId', 'type': 'str'}, + 'resource_group_name': {'key': 'resourceGroupName', 'type': 'str'}, + 'vsts_configuration': {'key': 'vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, + } + + def __init__(self, **kwargs): + super(FactoryRepoUpdate, self).__init__(**kwargs) + self.factory_resource_id = kwargs.get('factory_resource_id', None) + self.resource_group_name = kwargs.get('resource_group_name', None) + self.vsts_configuration = kwargs.get('vsts_configuration', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py new file mode 100644 index 000000000000..160f3f80ea28 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_repo_update_py3.py @@ -0,0 +1,37 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FactoryRepoUpdate(Model): + """Factory's VSTS repo information. + + :param factory_resource_id: The factory resource id. + :type factory_resource_id: str + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param vsts_configuration: VSTS repo information of the factory. + :type vsts_configuration: + ~azure.mgmt.datafactory.models.FactoryVSTSConfiguration + """ + + _attribute_map = { + 'factory_resource_id': {'key': 'factoryResourceId', 'type': 'str'}, + 'resource_group_name': {'key': 'resourceGroupName', 'type': 'str'}, + 'vsts_configuration': {'key': 'vstsConfiguration', 'type': 'FactoryVSTSConfiguration'}, + } + + def __init__(self, *, factory_resource_id: str=None, resource_group_name: str=None, vsts_configuration=None, **kwargs) -> None: + super(FactoryRepoUpdate, self).__init__(**kwargs) + self.factory_resource_id = factory_resource_id + self.resource_group_name = resource_group_name + self.vsts_configuration = vsts_configuration diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py new file mode 100644 index 000000000000..c2c017197398 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FactoryVSTSConfiguration(Model): + """Factory's VSTS repo information. + + :param account_name: VSTS account name. + :type account_name: str + :param project_name: VSTS project name. + :type project_name: str + :param repository_name: VSTS repository name. + :type repository_name: str + :param collaboration_branch: VSTS collaboration branch. + :type collaboration_branch: str + :param root_folder: VSTS root folder. + :type root_folder: str + :param last_commit_id: VSTS last commit id. + :type last_commit_id: str + :param tenant_id: VSTS tenant id. + :type tenant_id: str + """ + + _attribute_map = { + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'project_name': {'key': 'projectName', 'type': 'str'}, + 'repository_name': {'key': 'repositoryName', 'type': 'str'}, + 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, + 'root_folder': {'key': 'rootFolder', 'type': 'str'}, + 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(FactoryVSTSConfiguration, self).__init__(**kwargs) + self.account_name = kwargs.get('account_name', None) + self.project_name = kwargs.get('project_name', None) + self.repository_name = kwargs.get('repository_name', None) + self.collaboration_branch = kwargs.get('collaboration_branch', None) + self.root_folder = kwargs.get('root_folder', None) + self.last_commit_id = kwargs.get('last_commit_id', None) + self.tenant_id = kwargs.get('tenant_id', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py new file mode 100644 index 000000000000..49d6fe8b7a29 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/factory_vsts_configuration_py3.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FactoryVSTSConfiguration(Model): + """Factory's VSTS repo information. + + :param account_name: VSTS account name. + :type account_name: str + :param project_name: VSTS project name. + :type project_name: str + :param repository_name: VSTS repository name. + :type repository_name: str + :param collaboration_branch: VSTS collaboration branch. + :type collaboration_branch: str + :param root_folder: VSTS root folder. + :type root_folder: str + :param last_commit_id: VSTS last commit id. + :type last_commit_id: str + :param tenant_id: VSTS tenant id. + :type tenant_id: str + """ + + _attribute_map = { + 'account_name': {'key': 'accountName', 'type': 'str'}, + 'project_name': {'key': 'projectName', 'type': 'str'}, + 'repository_name': {'key': 'repositoryName', 'type': 'str'}, + 'collaboration_branch': {'key': 'collaborationBranch', 'type': 'str'}, + 'root_folder': {'key': 'rootFolder', 'type': 'str'}, + 'last_commit_id': {'key': 'lastCommitId', 'type': 'str'}, + 'tenant_id': {'key': 'tenantId', 'type': 'str'}, + } + + def __init__(self, *, account_name: str=None, project_name: str=None, repository_name: str=None, collaboration_branch: str=None, root_folder: str=None, last_commit_id: str=None, tenant_id: str=None, **kwargs) -> None: + super(FactoryVSTSConfiguration, self).__init__(**kwargs) + self.account_name = account_name + self.project_name = project_name + self.repository_name = repository_name + self.collaboration_branch = collaboration_branch + self.root_folder = root_folder + self.last_commit_id = last_commit_id + self.tenant_id = tenant_id diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service_py3.py index 705927000617..a9793d5b44fc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_server_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class FileServerLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset_py3.py index ff76331de81a..08524cbc2a4b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_share_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class FileShareDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_sink_py3.py index 59bd6ec12f41..a940e39878f8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class FileSystemSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_source_py3.py index bf6eeb2e7fd5..6db0072329d4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/file_system_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class FileSystemSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py index 87b0d1ccdeb7..acc4617a3f72 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/filter_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .control_activity import ControlActivity +from .control_activity_py3 import ControlActivity class FilterActivity(ControlActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py index 88d75bc00f3b..e1ebd7ff426b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/for_each_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .control_activity import ControlActivity +from .control_activity_py3 import ControlActivity class ForEachActivity(ControlActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service_py3.py index b80223faf92f..21fd1168165f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/ftp_server_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class FtpServerLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py index 2db128a4dc7f..79e16f1a8c14 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/get_metadata_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class GetMetadataActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service_py3.py index 549dcb7abf1b..a8582aca98b5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class GoogleBigQueryLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset_py3.py index 1bd794bc719c..d51dfe5de0f9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class GoogleBigQueryObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_source_py3.py index 7bd1a5256c19..eb5727bd43a5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/google_big_query_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class GoogleBigQuerySource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py index cedb1a371923..d7507545f9e5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service.py @@ -33,8 +33,9 @@ class GreenplumLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class GreenplumLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service_py3.py index bf0d5a8f9150..ea15aa2690dd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class GreenplumLinkedService(LinkedService): @@ -33,8 +33,9 @@ class GreenplumLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class GreenplumLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_source_py3.py index 9adb06fb16ce..6a373bf9d6ae 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class GreenplumSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset_py3.py index e68a07b2d05b..a266e22dae9c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/greenplum_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class GreenplumTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service_py3.py index e8bc89f401b7..7963b3fc643c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HBaseLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset_py3.py index 30c2ed7de587..a4386af6240f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class HBaseObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_source_py3.py index a6834f23afec..c17d8cf07003 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hbase_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class HBaseSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py index 2bcb4b1c5df4..0d3e900a4398 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_hive_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class HDInsightHiveActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service_py3.py index 0b5374553827..e7e60b5c8333 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HDInsightLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py index 1b781fd08bd9..2ac97c2e8453 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_map_reduce_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class HDInsightMapReduceActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service_py3.py index 8bb2cfdb1e91..75f601f6a97b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_on_demand_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HDInsightOnDemandLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py index a2cbf90ac518..b57d8da7b682 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_pig_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class HDInsightPigActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py index 118772db8539..322d99f7c063 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_spark_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class HDInsightSparkActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py index e42e543bebac..10756ecd093d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hd_insight_streaming_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class HDInsightStreamingActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service_py3.py index 550b4824c181..3b854d945e27 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HdfsLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_source_py3.py index e7125240a2ac..34b194f92d64 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hdfs_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class HdfsSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service_py3.py index d6e1a46cbe7e..2f742d72594c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HiveLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset_py3.py index 5b245c3543f8..d4bebbbcfe7b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class HiveObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_source_py3.py index aa52f335d530..7dc54994b25a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hive_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class HiveSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset_py3.py index a3e7a17b95d3..05c340ab447a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class HttpDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service_py3.py index 044ab5352683..bd4f03006513 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HttpLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_source_py3.py index 53fd82025b11..78bfe7216da6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/http_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class HttpSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service_py3.py index 216adb7fe228..5c92b45e0252 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class HubspotLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset_py3.py index b8591962805b..f0e8d1a74809 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class HubspotObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_source_py3.py index 3efc8e70fdd1..4162be4216a6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/hubspot_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class HubspotSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py index 8f63f627ed98..cbef9a900284 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/if_condition_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .control_activity import ControlActivity +from .control_activity_py3 import ControlActivity class IfConditionActivity(ControlActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service_py3.py index 3605a3443e04..9d79f13b9708 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class ImpalaLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset_py3.py index 840e4082b726..964bfbd71748 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class ImpalaObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_source_py3.py index 63c3e8a3492d..5bdb3391c2fc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/impala_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class ImpalaSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_resource_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_resource_py3.py index acf162de2562..9239f54166f9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_resource_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/integration_runtime_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .sub_resource import SubResource +from .sub_resource_py3 import SubResource class IntegrationRuntimeResource(SubResource): @@ -49,5 +49,5 @@ class IntegrationRuntimeResource(SubResource): } def __init__(self, *, properties, **kwargs) -> None: - super(IntegrationRuntimeResource, self).__init__(, **kwargs) + super(IntegrationRuntimeResource, self).__init__(**kwargs) self.properties = properties diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service_py3.py index 824a30ea1b2b..327ce4d0793e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class JiraLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset_py3.py index d1f5a34f516d..e0c3007bca89 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class JiraObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_source_py3.py index 80e3e50a062d..5835c7eceef4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/jira_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class JiraSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/json_format_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/json_format_py3.py index 5213a17d8e4c..a9a7f20ea103 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/json_format_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/json_format_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_storage_format import DatasetStorageFormat +from .dataset_storage_format_py3 import DatasetStorageFormat class JsonFormat(DatasetStorageFormat): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py index 3e8f4dca2051..c223b18281cd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_key_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties +from .linked_integration_runtime_properties_py3 import LinkedIntegrationRuntimeProperties class LinkedIntegrationRuntimeKey(LinkedIntegrationRuntimeProperties): @@ -34,6 +34,6 @@ class LinkedIntegrationRuntimeKey(LinkedIntegrationRuntimeProperties): } def __init__(self, *, key, **kwargs) -> None: - super(LinkedIntegrationRuntimeKey, self).__init__(, **kwargs) + super(LinkedIntegrationRuntimeKey, self).__init__(**kwargs) self.key = key self.authorization_type = 'Key' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py index 16c070d71c47..24d2b946d97e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_integration_runtime_rbac_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_integration_runtime_properties import LinkedIntegrationRuntimeProperties +from .linked_integration_runtime_properties_py3 import LinkedIntegrationRuntimeProperties class LinkedIntegrationRuntimeRbac(LinkedIntegrationRuntimeProperties): @@ -35,6 +35,6 @@ class LinkedIntegrationRuntimeRbac(LinkedIntegrationRuntimeProperties): } def __init__(self, *, resource_id: str, **kwargs) -> None: - super(LinkedIntegrationRuntimeRbac, self).__init__(, **kwargs) + super(LinkedIntegrationRuntimeRbac, self).__init__(**kwargs) self.resource_id = resource_id self.authorization_type = 'RBAC' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py index efb89ee0eacd..ecb6b42e145a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service.py @@ -18,7 +18,7 @@ class LinkedService(Model): resource. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: AzureDatabricksLinkedService, + sub-classes are: ResponsysLinkedService, AzureDatabricksLinkedService, AzureDataLakeAnalyticsLinkedService, HDInsightOnDemandLinkedService, SalesforceMarketingCloudLinkedService, NetezzaLinkedService, VerticaLinkedService, ZohoLinkedService, XeroLinkedService, @@ -79,7 +79,7 @@ class LinkedService(Model): } _subtype_map = { - 'type': {'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'Salesforce': 'SalesforceLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} + 'type': {'Responsys': 'ResponsysLinkedService', 'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'Salesforce': 'SalesforceLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_py3.py index 202165ec4982..39119635cba5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_py3.py @@ -18,7 +18,7 @@ class LinkedService(Model): resource. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: AzureDatabricksLinkedService, + sub-classes are: ResponsysLinkedService, AzureDatabricksLinkedService, AzureDataLakeAnalyticsLinkedService, HDInsightOnDemandLinkedService, SalesforceMarketingCloudLinkedService, NetezzaLinkedService, VerticaLinkedService, ZohoLinkedService, XeroLinkedService, @@ -79,7 +79,7 @@ class LinkedService(Model): } _subtype_map = { - 'type': {'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'Salesforce': 'SalesforceLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} + 'type': {'Responsys': 'ResponsysLinkedService', 'AzureDatabricks': 'AzureDatabricksLinkedService', 'AzureDataLakeAnalytics': 'AzureDataLakeAnalyticsLinkedService', 'HDInsightOnDemand': 'HDInsightOnDemandLinkedService', 'SalesforceMarketingCloud': 'SalesforceMarketingCloudLinkedService', 'Netezza': 'NetezzaLinkedService', 'Vertica': 'VerticaLinkedService', 'Zoho': 'ZohoLinkedService', 'Xero': 'XeroLinkedService', 'Square': 'SquareLinkedService', 'Spark': 'SparkLinkedService', 'Shopify': 'ShopifyLinkedService', 'ServiceNow': 'ServiceNowLinkedService', 'QuickBooks': 'QuickBooksLinkedService', 'Presto': 'PrestoLinkedService', 'Phoenix': 'PhoenixLinkedService', 'Paypal': 'PaypalLinkedService', 'Marketo': 'MarketoLinkedService', 'MariaDB': 'MariaDBLinkedService', 'Magento': 'MagentoLinkedService', 'Jira': 'JiraLinkedService', 'Impala': 'ImpalaLinkedService', 'Hubspot': 'HubspotLinkedService', 'Hive': 'HiveLinkedService', 'HBase': 'HBaseLinkedService', 'Greenplum': 'GreenplumLinkedService', 'GoogleBigQuery': 'GoogleBigQueryLinkedService', 'Eloqua': 'EloquaLinkedService', 'Drill': 'DrillLinkedService', 'Couchbase': 'CouchbaseLinkedService', 'Concur': 'ConcurLinkedService', 'AzurePostgreSql': 'AzurePostgreSqlLinkedService', 'AmazonMWS': 'AmazonMWSLinkedService', 'SapHana': 'SapHanaLinkedService', 'SapBW': 'SapBWLinkedService', 'Sftp': 'SftpServerLinkedService', 'FtpServer': 'FtpServerLinkedService', 'HttpServer': 'HttpLinkedService', 'AzureSearch': 'AzureSearchLinkedService', 'CustomDataSource': 'CustomDataSourceLinkedService', 'AmazonRedshift': 'AmazonRedshiftLinkedService', 'AmazonS3': 'AmazonS3LinkedService', 'SapEcc': 'SapEccLinkedService', 'SapCloudForCustomer': 'SapCloudForCustomerLinkedService', 'Salesforce': 'SalesforceLinkedService', 'AzureDataLakeStore': 'AzureDataLakeStoreLinkedService', 'MongoDb': 'MongoDbLinkedService', 'Cassandra': 'CassandraLinkedService', 'Web': 'WebLinkedService', 'OData': 'ODataLinkedService', 'Hdfs': 'HdfsLinkedService', 'Odbc': 'OdbcLinkedService', 'AzureML': 'AzureMLLinkedService', 'Teradata': 'TeradataLinkedService', 'Db2': 'Db2LinkedService', 'Sybase': 'SybaseLinkedService', 'PostgreSql': 'PostgreSqlLinkedService', 'MySql': 'MySqlLinkedService', 'AzureMySql': 'AzureMySqlLinkedService', 'Oracle': 'OracleLinkedService', 'FileServer': 'FileServerLinkedService', 'HDInsight': 'HDInsightLinkedService', 'Dynamics': 'DynamicsLinkedService', 'CosmosDb': 'CosmosDbLinkedService', 'AzureKeyVault': 'AzureKeyVaultLinkedService', 'AzureBatch': 'AzureBatchLinkedService', 'AzureSqlDatabase': 'AzureSqlDatabaseLinkedService', 'SqlServer': 'SqlServerLinkedService', 'AzureSqlDW': 'AzureSqlDWLinkedService', 'AzureStorage': 'AzureStorageLinkedService'} } def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, **kwargs) -> None: diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_resource_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_resource_py3.py index c3a20944a87d..1fa964b51f57 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_resource_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/linked_service_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .sub_resource import SubResource +from .sub_resource_py3 import SubResource class LinkedServiceResource(SubResource): @@ -49,5 +49,5 @@ class LinkedServiceResource(SubResource): } def __init__(self, *, properties, **kwargs) -> None: - super(LinkedServiceResource, self).__init__(, **kwargs) + super(LinkedServiceResource, self).__init__(**kwargs) self.properties = properties diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py index d0ab996d6f3b..fdbcebcd0164 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/lookup_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class LookupActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service_py3.py index ef85812fa1e1..420656103983 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class MagentoLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset_py3.py index 4386f3704d13..ab3c0bf4f39c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class MagentoObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_source_py3.py index 3ce50a3ed452..a01cf80a969a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/magento_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class MagentoSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_py3.py index d2e2468aa741..741564e6e531 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .integration_runtime import IntegrationRuntime +from .integration_runtime_py3 import IntegrationRuntime class ManagedIntegrationRuntime(IntegrationRuntime): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status_py3.py index 9944628a9997..873c885e7c5d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/managed_integration_runtime_status_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .integration_runtime_status import IntegrationRuntimeStatus +from .integration_runtime_status_py3 import IntegrationRuntimeStatus class ManagedIntegrationRuntimeStatus(IntegrationRuntimeStatus): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py index 24c0b0eef87d..853df4dbd376 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service.py @@ -33,8 +33,9 @@ class MariaDBLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class MariaDBLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service_py3.py index 7a428d54120b..b0bbd9c4f733 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class MariaDBLinkedService(LinkedService): @@ -33,8 +33,9 @@ class MariaDBLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class MariaDBLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_source_py3.py index 99fd864e7e62..1dbb6f327d04 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class MariaDBSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset_py3.py index d9a30f2deccc..e557822e5fca 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/maria_db_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class MariaDBTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service_py3.py index 6ee722e1577c..b4e360931809 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class MarketoLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset_py3.py index 3add966719c6..dfb08a716949 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class MarketoObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_source_py3.py index 34a97998f96e..52c16eae0437 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/marketo_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class MarketoSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset_py3.py index db839b82af25..dac4b49da87a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_collection_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class MongoDbCollectionDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service_py3.py index 4f260bf37e90..c1d96a5465b9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class MongoDbLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_source_py3.py index 4313cac8c921..b4f01d8d7ffb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/mongo_db_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class MongoDbSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger.py index ba053baee118..dd279ab6baa3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger.py @@ -17,7 +17,7 @@ class MultiplePipelineTrigger(Trigger): pipeline. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: BlobTrigger, ScheduleTrigger + sub-classes are: BlobEventsTrigger, BlobTrigger, ScheduleTrigger Variables are only populated by the server, and will be ignored when sending a request. @@ -55,7 +55,7 @@ class MultiplePipelineTrigger(Trigger): } _subtype_map = { - 'type': {'BlobTrigger': 'BlobTrigger', 'ScheduleTrigger': 'ScheduleTrigger'} + 'type': {'BlobEventsTrigger': 'BlobEventsTrigger', 'BlobTrigger': 'BlobTrigger', 'ScheduleTrigger': 'ScheduleTrigger'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger_py3.py index 8724414f4e0b..3400431e49e2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/multiple_pipeline_trigger_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .trigger import Trigger +from .trigger_py3 import Trigger class MultiplePipelineTrigger(Trigger): @@ -17,7 +17,7 @@ class MultiplePipelineTrigger(Trigger): pipeline. You probably want to use the sub-classes and not this class directly. Known - sub-classes are: BlobTrigger, ScheduleTrigger + sub-classes are: BlobEventsTrigger, BlobTrigger, ScheduleTrigger Variables are only populated by the server, and will be ignored when sending a request. @@ -55,7 +55,7 @@ class MultiplePipelineTrigger(Trigger): } _subtype_map = { - 'type': {'BlobTrigger': 'BlobTrigger', 'ScheduleTrigger': 'ScheduleTrigger'} + 'type': {'BlobEventsTrigger': 'BlobEventsTrigger', 'BlobTrigger': 'BlobTrigger', 'ScheduleTrigger': 'ScheduleTrigger'} } def __init__(self, *, additional_properties=None, description: str=None, pipelines=None, **kwargs) -> None: diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py index bc5d7e820333..b643e1c7266b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service.py @@ -33,20 +33,8 @@ class MySqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param server: Required. Server name for connection. Type: string (or - Expression with resultType string). - :type server: object - :param database: Required. Database name for connection. Type: string (or - Expression with resultType string). - :type database: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object - :param username: Username for authentication. Type: string (or Expression - with resultType string). - :type username: object - :param password: Password for authentication. - :type password: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. + :type connection_string: ~azure.mgmt.datafactory.models.SecretBase :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -55,8 +43,7 @@ class MySqlLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'server': {'required': True}, - 'database': {'required': True}, + 'connection_string': {'required': True}, } _attribute_map = { @@ -66,20 +53,12 @@ class MySqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'server': {'key': 'typeProperties.server', 'type': 'object'}, - 'database': {'key': 'typeProperties.database', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, - 'username': {'key': 'typeProperties.username', 'type': 'object'}, - 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } def __init__(self, **kwargs): super(MySqlLinkedService, self).__init__(**kwargs) - self.server = kwargs.get('server', None) - self.database = kwargs.get('database', None) - self.schema = kwargs.get('schema', None) - self.username = kwargs.get('username', None) - self.password = kwargs.get('password', None) + self.connection_string = kwargs.get('connection_string', None) self.encrypted_credential = kwargs.get('encrypted_credential', None) self.type = 'MySql' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service_py3.py index 44170220fdfe..38cf9b34198a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/my_sql_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class MySqlLinkedService(LinkedService): @@ -33,20 +33,8 @@ class MySqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param server: Required. Server name for connection. Type: string (or - Expression with resultType string). - :type server: object - :param database: Required. Database name for connection. Type: string (or - Expression with resultType string). - :type database: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object - :param username: Username for authentication. Type: string (or Expression - with resultType string). - :type username: object - :param password: Password for authentication. - :type password: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. + :type connection_string: ~azure.mgmt.datafactory.models.SecretBase :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -55,8 +43,7 @@ class MySqlLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'server': {'required': True}, - 'database': {'required': True}, + 'connection_string': {'required': True}, } _attribute_map = { @@ -66,20 +53,12 @@ class MySqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'server': {'key': 'typeProperties.server', 'type': 'object'}, - 'database': {'key': 'typeProperties.database', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, - 'username': {'key': 'typeProperties.username', 'type': 'object'}, - 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, server, database, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, schema=None, username=None, password=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, connection_string, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, encrypted_credential=None, **kwargs) -> None: super(MySqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) - self.server = server - self.database = database - self.schema = schema - self.username = username - self.password = password + self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'MySql' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py index a848845b448e..1d7b72403b54 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service.py @@ -33,8 +33,9 @@ class NetezzaLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class NetezzaLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service_py3.py index 52b3cc6932a0..b6576954e26b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class NetezzaLinkedService(LinkedService): @@ -33,8 +33,9 @@ class NetezzaLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class NetezzaLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source_py3.py index 393dedf4dc55..2b4c38f708ee 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class NetezzaSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset_py3.py index 4acbace2398e..28de2143add2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/netezza_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class NetezzaTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service_py3.py index abb4fedf5adf..688bb4e4ffda 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class ODataLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset_py3.py index 03227b214202..9cd01c414218 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odata_resource_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class ODataResourceDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py index 4f04d86f8f8f..43559b76e0e0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service.py @@ -34,8 +34,9 @@ class OdbcLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param connection_string: Required. The non-access credential portion of - the connection string as well as an optional encrypted credential. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + the connection string as well as an optional encrypted credential. Type: + string, SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param authentication_type: Type of authentication used to connect to the ODBC data store. Possible values are: Anonymous and Basic. Type: string (or Expression with resultType string). @@ -66,7 +67,7 @@ class OdbcLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'object'}, 'credential': {'key': 'typeProperties.credential', 'type': 'SecretBase'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service_py3.py index 3d30c01d7397..e0147881f3d0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class OdbcLinkedService(LinkedService): @@ -34,8 +34,9 @@ class OdbcLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param connection_string: Required. The non-access credential portion of - the connection string as well as an optional encrypted credential. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + the connection string as well as an optional encrypted credential. Type: + string, SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param authentication_type: Type of authentication used to connect to the ODBC data store. Possible values are: Anonymous and Basic. Type: string (or Expression with resultType string). @@ -66,7 +67,7 @@ class OdbcLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'object'}, 'credential': {'key': 'typeProperties.credential', 'type': 'SecretBase'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_sink_py3.py index 8d098f6a96a8..430329bdf2b9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/odbc_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class OdbcSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py index 9e78c4ef42c0..2aca7d0a7215 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service.py @@ -33,8 +33,9 @@ class OracleLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -53,7 +54,7 @@ class OracleLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service_py3.py index 4072d25d329c..bc4765e0b2e2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class OracleLinkedService(LinkedService): @@ -33,8 +33,9 @@ class OracleLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -53,7 +54,7 @@ class OracleLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_sink_py3.py index 07bd11f38775..a6b666d31ed7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class OracleSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_source_py3.py index 24af230164c5..89252615e6e5 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class OracleSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset_py3.py index 2737f7df09a3..0c12187802c9 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/oracle_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class OracleTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/orc_format_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/orc_format_py3.py index 17db530edc64..40a0e389ccc3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/orc_format_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/orc_format_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_storage_format import DatasetStorageFormat +from .dataset_storage_format_py3 import DatasetStorageFormat class OrcFormat(DatasetStorageFormat): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parquet_format_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parquet_format_py3.py index ba2b2428f140..36a6f5c88c4d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parquet_format_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/parquet_format_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_storage_format import DatasetStorageFormat +from .dataset_storage_format_py3 import DatasetStorageFormat class ParquetFormat(DatasetStorageFormat): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service_py3.py index 39c83d422068..41fdb52595ab 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class PaypalLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset_py3.py index 475c579602a7..cb0e92035dfd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class PaypalObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_source_py3.py index 9d6d7e6f30fa..347b0e3e550e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/paypal_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class PaypalSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service_py3.py index fe18934da90a..aeb89e4fdd4a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class PhoenixLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset_py3.py index a279a7763bd6..73cb4ee2184d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class PhoenixObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_source_py3.py index 6497d3dfc80e..619e7220dd09 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/phoenix_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class PhoenixSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource_py3.py index 4da049f1f3b5..2b3bf380782a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/pipeline_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .sub_resource import SubResource +from .sub_resource_py3 import SubResource class PipelineResource(SubResource): @@ -65,7 +65,7 @@ class PipelineResource(SubResource): } def __init__(self, *, additional_properties=None, description: str=None, activities=None, parameters=None, concurrency: int=None, annotations=None, **kwargs) -> None: - super(PipelineResource, self).__init__(, **kwargs) + super(PipelineResource, self).__init__(**kwargs) self.additional_properties = additional_properties self.description = description self.activities = activities diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py index 7a96d59e87e1..6a572c24c1cd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service.py @@ -33,20 +33,8 @@ class PostgreSqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param server: Required. Server name for connection. Type: string (or - Expression with resultType string). - :type server: object - :param database: Required. Database name for connection. Type: string (or - Expression with resultType string). - :type database: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object - :param username: Username for authentication. Type: string (or Expression - with resultType string). - :type username: object - :param password: Password for authentication. - :type password: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. + :type connection_string: ~azure.mgmt.datafactory.models.SecretBase :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -55,8 +43,7 @@ class PostgreSqlLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'server': {'required': True}, - 'database': {'required': True}, + 'connection_string': {'required': True}, } _attribute_map = { @@ -66,20 +53,12 @@ class PostgreSqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'server': {'key': 'typeProperties.server', 'type': 'object'}, - 'database': {'key': 'typeProperties.database', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, - 'username': {'key': 'typeProperties.username', 'type': 'object'}, - 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } def __init__(self, **kwargs): super(PostgreSqlLinkedService, self).__init__(**kwargs) - self.server = kwargs.get('server', None) - self.database = kwargs.get('database', None) - self.schema = kwargs.get('schema', None) - self.username = kwargs.get('username', None) - self.password = kwargs.get('password', None) + self.connection_string = kwargs.get('connection_string', None) self.encrypted_credential = kwargs.get('encrypted_credential', None) self.type = 'PostgreSql' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service_py3.py index 976e29aebbde..ae16efbbfdad 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/postgre_sql_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class PostgreSqlLinkedService(LinkedService): @@ -33,20 +33,8 @@ class PostgreSqlLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param server: Required. Server name for connection. Type: string (or - Expression with resultType string). - :type server: object - :param database: Required. Database name for connection. Type: string (or - Expression with resultType string). - :type database: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object - :param username: Username for authentication. Type: string (or Expression - with resultType string). - :type username: object - :param password: Password for authentication. - :type password: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. + :type connection_string: ~azure.mgmt.datafactory.models.SecretBase :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -55,8 +43,7 @@ class PostgreSqlLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'server': {'required': True}, - 'database': {'required': True}, + 'connection_string': {'required': True}, } _attribute_map = { @@ -66,20 +53,12 @@ class PostgreSqlLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'server': {'key': 'typeProperties.server', 'type': 'object'}, - 'database': {'key': 'typeProperties.database', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, - 'username': {'key': 'typeProperties.username', 'type': 'object'}, - 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, server, database, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, schema=None, username=None, password=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, connection_string, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, encrypted_credential=None, **kwargs) -> None: super(PostgreSqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) - self.server = server - self.database = database - self.schema = schema - self.username = username - self.password = password + self.connection_string = connection_string self.encrypted_credential = encrypted_credential self.type = 'PostgreSql' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service_py3.py index e9721fcba562..fe178f62df4f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class PrestoLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset_py3.py index a0dce3cd789b..dfb69ded9c4c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class PrestoObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_source_py3.py index be957bd2bfcd..ad16115ef8f3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/presto_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class PrestoSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py index a199f9763f70..c2ca123e5409 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service.py @@ -39,10 +39,17 @@ class QuickBooksLinkedService(LinkedService): :param company_id: Required. The company ID of the QuickBooks company to authorize. :type company_id: object - :param access_token: The access token for OAuth 1.0 authentication. - :type access_token: ~azure.mgmt.datafactory.models.SecretBase - :param access_token_secret: The access token secret for OAuth 1.0 + :param consumer_key: Required. The consumer key for OAuth 1.0 + authentication. + :type consumer_key: object + :param consumer_secret: Required. The consumer secret for OAuth 1.0 authentication. + :type consumer_secret: ~azure.mgmt.datafactory.models.SecretBase + :param access_token: Required. The access token for OAuth 1.0 + authentication. + :type access_token: ~azure.mgmt.datafactory.models.SecretBase + :param access_token_secret: Required. The access token secret for OAuth + 1.0 authentication. :type access_token_secret: ~azure.mgmt.datafactory.models.SecretBase :param use_encrypted_endpoints: Specifies whether the data source endpoints are encrypted using HTTPS. The default value is true. @@ -57,6 +64,10 @@ class QuickBooksLinkedService(LinkedService): 'type': {'required': True}, 'endpoint': {'required': True}, 'company_id': {'required': True}, + 'consumer_key': {'required': True}, + 'consumer_secret': {'required': True}, + 'access_token': {'required': True}, + 'access_token_secret': {'required': True}, } _attribute_map = { @@ -68,6 +79,8 @@ class QuickBooksLinkedService(LinkedService): 'type': {'key': 'type', 'type': 'str'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'company_id': {'key': 'typeProperties.companyId', 'type': 'object'}, + 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'object'}, + 'consumer_secret': {'key': 'typeProperties.consumerSecret', 'type': 'SecretBase'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, 'access_token_secret': {'key': 'typeProperties.accessTokenSecret', 'type': 'SecretBase'}, 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, @@ -78,6 +91,8 @@ def __init__(self, **kwargs): super(QuickBooksLinkedService, self).__init__(**kwargs) self.endpoint = kwargs.get('endpoint', None) self.company_id = kwargs.get('company_id', None) + self.consumer_key = kwargs.get('consumer_key', None) + self.consumer_secret = kwargs.get('consumer_secret', None) self.access_token = kwargs.get('access_token', None) self.access_token_secret = kwargs.get('access_token_secret', None) self.use_encrypted_endpoints = kwargs.get('use_encrypted_endpoints', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service_py3.py index b56e34367553..7ba9f145c26e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class QuickBooksLinkedService(LinkedService): @@ -39,10 +39,17 @@ class QuickBooksLinkedService(LinkedService): :param company_id: Required. The company ID of the QuickBooks company to authorize. :type company_id: object - :param access_token: The access token for OAuth 1.0 authentication. - :type access_token: ~azure.mgmt.datafactory.models.SecretBase - :param access_token_secret: The access token secret for OAuth 1.0 + :param consumer_key: Required. The consumer key for OAuth 1.0 + authentication. + :type consumer_key: object + :param consumer_secret: Required. The consumer secret for OAuth 1.0 authentication. + :type consumer_secret: ~azure.mgmt.datafactory.models.SecretBase + :param access_token: Required. The access token for OAuth 1.0 + authentication. + :type access_token: ~azure.mgmt.datafactory.models.SecretBase + :param access_token_secret: Required. The access token secret for OAuth + 1.0 authentication. :type access_token_secret: ~azure.mgmt.datafactory.models.SecretBase :param use_encrypted_endpoints: Specifies whether the data source endpoints are encrypted using HTTPS. The default value is true. @@ -57,6 +64,10 @@ class QuickBooksLinkedService(LinkedService): 'type': {'required': True}, 'endpoint': {'required': True}, 'company_id': {'required': True}, + 'consumer_key': {'required': True}, + 'consumer_secret': {'required': True}, + 'access_token': {'required': True}, + 'access_token_secret': {'required': True}, } _attribute_map = { @@ -68,16 +79,20 @@ class QuickBooksLinkedService(LinkedService): 'type': {'key': 'type', 'type': 'str'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'company_id': {'key': 'typeProperties.companyId', 'type': 'object'}, + 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'object'}, + 'consumer_secret': {'key': 'typeProperties.consumerSecret', 'type': 'SecretBase'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, 'access_token_secret': {'key': 'typeProperties.accessTokenSecret', 'type': 'SecretBase'}, 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, endpoint, company_id, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, access_token=None, access_token_secret=None, use_encrypted_endpoints=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, endpoint, company_id, consumer_key, consumer_secret, access_token, access_token_secret, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, use_encrypted_endpoints=None, encrypted_credential=None, **kwargs) -> None: super(QuickBooksLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.endpoint = endpoint self.company_id = company_id + self.consumer_key = consumer_key + self.consumer_secret = consumer_secret self.access_token = access_token self.access_token_secret = access_token_secret self.use_encrypted_endpoints = use_encrypted_endpoints diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset_py3.py index e852f5bcd624..7897881b5cbb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class QuickBooksObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_source_py3.py index e2ecafefc3bf..b6bb7a260d1d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/quick_books_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class QuickBooksSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_source_py3.py index efac5c7b9050..9e7a75043b8c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class RelationalSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset_py3.py index 908ca1d8657d..0b492686356d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/relational_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class RelationalTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_linked_service.py new file mode 100644 index 000000000000..9c1b8e4c3cbd --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_linked_service.py @@ -0,0 +1,94 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .linked_service import LinkedService + + +class ResponsysLinkedService(LinkedService): + """Responsys linked service. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param connect_via: The integration runtime reference. + :type connect_via: + ~azure.mgmt.datafactory.models.IntegrationRuntimeReference + :param description: Linked service description. + :type description: str + :param parameters: Parameters for linked service. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] + :param type: Required. Constant filled by server. + :type type: str + :param endpoint: Required. The endpoint of the Responsys server. + :type endpoint: object + :param client_id: Required. The client ID associated with the Responsys + application. Type: string (or Expression with resultType string). + :type client_id: object + :param client_secret: The client secret associated with the Responsys + application. Type: string (or Expression with resultType string). + :type client_secret: ~azure.mgmt.datafactory.models.SecretBase + :param use_encrypted_endpoints: Specifies whether the data source + endpoints are encrypted using HTTPS. The default value is true. Type: + boolean (or Expression with resultType boolean). + :type use_encrypted_endpoints: object + :param use_host_verification: Specifies whether to require the host name + in the server's certificate to match the host name of the server when + connecting over SSL. The default value is true. Type: boolean (or + Expression with resultType boolean). + :type use_host_verification: object + :param use_peer_verification: Specifies whether to verify the identity of + the server when connecting over SSL. The default value is true. Type: + boolean (or Expression with resultType boolean). + :type use_peer_verification: object + :param encrypted_credential: The encrypted credential used for + authentication. Credentials are encrypted using the integration runtime + credential manager. Type: string (or Expression with resultType string). + :type encrypted_credential: object + """ + + _validation = { + 'type': {'required': True}, + 'endpoint': {'required': True}, + 'client_id': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, + 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, + 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, + 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, + 'use_host_verification': {'key': 'typeProperties.useHostVerification', 'type': 'object'}, + 'use_peer_verification': {'key': 'typeProperties.usePeerVerification', 'type': 'object'}, + 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + } + + def __init__(self, **kwargs): + super(ResponsysLinkedService, self).__init__(**kwargs) + self.endpoint = kwargs.get('endpoint', None) + self.client_id = kwargs.get('client_id', None) + self.client_secret = kwargs.get('client_secret', None) + self.use_encrypted_endpoints = kwargs.get('use_encrypted_endpoints', None) + self.use_host_verification = kwargs.get('use_host_verification', None) + self.use_peer_verification = kwargs.get('use_peer_verification', None) + self.encrypted_credential = kwargs.get('encrypted_credential', None) + self.type = 'Responsys' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_linked_service_py3.py new file mode 100644 index 000000000000..4c1997e6ab26 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_linked_service_py3.py @@ -0,0 +1,94 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .linked_service_py3 import LinkedService + + +class ResponsysLinkedService(LinkedService): + """Responsys linked service. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param connect_via: The integration runtime reference. + :type connect_via: + ~azure.mgmt.datafactory.models.IntegrationRuntimeReference + :param description: Linked service description. + :type description: str + :param parameters: Parameters for linked service. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] + :param type: Required. Constant filled by server. + :type type: str + :param endpoint: Required. The endpoint of the Responsys server. + :type endpoint: object + :param client_id: Required. The client ID associated with the Responsys + application. Type: string (or Expression with resultType string). + :type client_id: object + :param client_secret: The client secret associated with the Responsys + application. Type: string (or Expression with resultType string). + :type client_secret: ~azure.mgmt.datafactory.models.SecretBase + :param use_encrypted_endpoints: Specifies whether the data source + endpoints are encrypted using HTTPS. The default value is true. Type: + boolean (or Expression with resultType boolean). + :type use_encrypted_endpoints: object + :param use_host_verification: Specifies whether to require the host name + in the server's certificate to match the host name of the server when + connecting over SSL. The default value is true. Type: boolean (or + Expression with resultType boolean). + :type use_host_verification: object + :param use_peer_verification: Specifies whether to verify the identity of + the server when connecting over SSL. The default value is true. Type: + boolean (or Expression with resultType boolean). + :type use_peer_verification: object + :param encrypted_credential: The encrypted credential used for + authentication. Credentials are encrypted using the integration runtime + credential manager. Type: string (or Expression with resultType string). + :type encrypted_credential: object + """ + + _validation = { + 'type': {'required': True}, + 'endpoint': {'required': True}, + 'client_id': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'connect_via': {'key': 'connectVia', 'type': 'IntegrationRuntimeReference'}, + 'description': {'key': 'description', 'type': 'str'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, + 'type': {'key': 'type', 'type': 'str'}, + 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, + 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, + 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, + 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, + 'use_host_verification': {'key': 'typeProperties.useHostVerification', 'type': 'object'}, + 'use_peer_verification': {'key': 'typeProperties.usePeerVerification', 'type': 'object'}, + 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, + } + + def __init__(self, *, endpoint, client_id, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: + super(ResponsysLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) + self.endpoint = endpoint + self.client_id = client_id + self.client_secret = client_secret + self.use_encrypted_endpoints = use_encrypted_endpoints + self.use_host_verification = use_host_verification + self.use_peer_verification = use_peer_verification + self.encrypted_credential = encrypted_credential + self.type = 'Responsys' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_object_dataset.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_object_dataset.py new file mode 100644 index 000000000000..eef47fbf10a8 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_object_dataset.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .dataset import Dataset + + +class ResponsysObjectDataset(Dataset): + """Responsys dataset. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param description: Dataset description. + :type description: str + :param structure: Columns that define the structure of the dataset. Type: + array (or Expression with resultType array), itemType: DatasetDataElement. + :type structure: object + :param linked_service_name: Required. Linked service reference. + :type linked_service_name: + ~azure.mgmt.datafactory.models.LinkedServiceReference + :param parameters: Parameters for dataset. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] + :param type: Required. Constant filled by server. + :type type: str + """ + + _validation = { + 'linked_service_name': {'required': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'description': {'key': 'description', 'type': 'str'}, + 'structure': {'key': 'structure', 'type': 'object'}, + 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ResponsysObjectDataset, self).__init__(**kwargs) + self.type = 'ResponsysObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_object_dataset_py3.py new file mode 100644 index 000000000000..ffdd38dea188 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_object_dataset_py3.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .dataset_py3 import Dataset + + +class ResponsysObjectDataset(Dataset): + """Responsys dataset. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param description: Dataset description. + :type description: str + :param structure: Columns that define the structure of the dataset. Type: + array (or Expression with resultType array), itemType: DatasetDataElement. + :type structure: object + :param linked_service_name: Required. Linked service reference. + :type linked_service_name: + ~azure.mgmt.datafactory.models.LinkedServiceReference + :param parameters: Parameters for dataset. + :type parameters: dict[str, + ~azure.mgmt.datafactory.models.ParameterSpecification] + :param annotations: List of tags that can be used for describing the + Dataset. + :type annotations: list[object] + :param type: Required. Constant filled by server. + :type type: str + """ + + _validation = { + 'linked_service_name': {'required': True}, + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'description': {'key': 'description', 'type': 'str'}, + 'structure': {'key': 'structure', 'type': 'object'}, + 'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'}, + 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, + 'annotations': {'key': 'annotations', 'type': '[object]'}, + 'type': {'key': 'type', 'type': 'str'}, + } + + def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, **kwargs) -> None: + super(ResponsysObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, **kwargs) + self.type = 'ResponsysObject' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_source.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_source.py new file mode 100644 index 000000000000..1e1a9397a6ba --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_source.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .copy_source import CopySource + + +class ResponsysSource(CopySource): + """A copy activity Responsys source. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param source_retry_count: Source retry count. Type: integer (or + Expression with resultType integer). + :type source_retry_count: object + :param source_retry_wait: Source retry wait. Type: string (or Expression + with resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type source_retry_wait: object + :param type: Required. Constant filled by server. + :type type: str + :param query: A query to retrieve data from source. Type: string (or + Expression with resultType string). + :type query: object + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'source_retry_count': {'key': 'sourceRetryCount', 'type': 'object'}, + 'source_retry_wait': {'key': 'sourceRetryWait', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'query': {'key': 'query', 'type': 'object'}, + } + + def __init__(self, **kwargs): + super(ResponsysSource, self).__init__(**kwargs) + self.query = kwargs.get('query', None) + self.type = 'ResponsysSource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_source_py3.py new file mode 100644 index 000000000000..3bfb9c19a2a7 --- /dev/null +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/responsys_source_py3.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .copy_source_py3 import CopySource + + +class ResponsysSource(CopySource): + """A copy activity Responsys source. + + All required parameters must be populated in order to send to Azure. + + :param additional_properties: Unmatched properties from the message are + deserialized this collection + :type additional_properties: dict[str, object] + :param source_retry_count: Source retry count. Type: integer (or + Expression with resultType integer). + :type source_retry_count: object + :param source_retry_wait: Source retry wait. Type: string (or Expression + with resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type source_retry_wait: object + :param type: Required. Constant filled by server. + :type type: str + :param query: A query to retrieve data from source. Type: string (or + Expression with resultType string). + :type query: object + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'source_retry_count': {'key': 'sourceRetryCount', 'type': 'object'}, + 'source_retry_wait': {'key': 'sourceRetryWait', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'query': {'key': 'query', 'type': 'object'}, + } + + def __init__(self, *, additional_properties=None, source_retry_count=None, source_retry_wait=None, query=None, **kwargs) -> None: + super(ResponsysSource, self).__init__(additional_properties=additional_properties, source_retry_count=source_retry_count, source_retry_wait=source_retry_wait, **kwargs) + self.query = query + self.type = 'ResponsysSource' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service_py3.py index 2668ed113708..9fa5287aa3b4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SalesforceLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service_py3.py index 2cf5a947413e..863b679398e1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SalesforceMarketingCloudLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset_py3.py index 08b243e3c826..3180cbd37ea1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SalesforceMarketingCloudObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source_py3.py index 4a7e17da4f06..0a3d26cfb43b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_marketing_cloud_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SalesforceMarketingCloudSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset_py3.py index ccebb62fd5b3..d31a9754f738 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SalesforceObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_sink_py3.py index 10f9aea9c69d..6db44ebb4228 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class SalesforceSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_source_py3.py index 729c342b37f7..9ebc65ddeec8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/salesforce_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SalesforceSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service_py3.py index a3e686b16405..a1f6133e558d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_bw_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SapBWLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service_py3.py index 319a5f31e99a..85c1100d01eb 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SapCloudForCustomerLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset_py3.py index 4a7c19252dd1..fc52d1b3bdaf 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_resource_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SapCloudForCustomerResourceDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_sink_py3.py index c366c6c00a4c..f3cd45263f3e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class SapCloudForCustomerSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_source_py3.py index 8edc564d0b8d..ab5bddf21be3 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_cloud_for_customer_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SapCloudForCustomerSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service_py3.py index ef2fe2e60573..24490fb39a9a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SapEccLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset_py3.py index 321d4d85bc9a..6836e6206041 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_resource_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SapEccResourceDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source_py3.py index e7ec1d6b495b..f8993720428c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_ecc_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SapEccSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service_py3.py index 60c8d0283d61..c906d74d0c2b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sap_hana_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SapHanaLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/schedule_trigger_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/schedule_trigger_py3.py index 217195a5930f..1fc148a81b29 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/schedule_trigger_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/schedule_trigger_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .multiple_pipeline_trigger import MultiplePipelineTrigger +from .multiple_pipeline_trigger_py3 import MultiplePipelineTrigger class ScheduleTrigger(MultiplePipelineTrigger): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/secure_string_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/secure_string_py3.py index 1ca20053acd1..d7ebd5e13e78 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/secure_string_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/secure_string_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .secret_base import SecretBase +from .secret_base_py3 import SecretBase class SecureString(SecretBase): @@ -35,6 +35,6 @@ class SecureString(SecretBase): } def __init__(self, *, value: str, **kwargs) -> None: - super(SecureString, self).__init__(, **kwargs) + super(SecureString, self).__init__(**kwargs) self.value = value self.type = 'SecureString' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py index 3715401fa8dd..2a6929ecdd15 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .integration_runtime import IntegrationRuntime +from .integration_runtime_py3 import IntegrationRuntime class SelfHostedIntegrationRuntime(IntegrationRuntime): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py index e88fa5fa019d..07362ed1835a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/self_hosted_integration_runtime_status_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .integration_runtime_status import IntegrationRuntimeStatus +from .integration_runtime_status_py3 import IntegrationRuntimeStatus class SelfHostedIntegrationRuntimeStatus(IntegrationRuntimeStatus): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py index 0e180ce83506..c433366826b8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service.py @@ -34,7 +34,7 @@ class ServiceNowLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param endpoint: Required. The endpoint of the ServiceNow server. (i.e. - ServiceNowData.com) + .service-now.com) :type endpoint: object :param authentication_type: Required. The authentication type to use. Possible values include: 'Basic', 'OAuth2' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service_py3.py index 5aed5a07e4fc..cdd9e8ebb718 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class ServiceNowLinkedService(LinkedService): @@ -34,7 +34,7 @@ class ServiceNowLinkedService(LinkedService): :param type: Required. Constant filled by server. :type type: str :param endpoint: Required. The endpoint of the ServiceNow server. (i.e. - ServiceNowData.com) + .service-now.com) :type endpoint: object :param authentication_type: Required. The authentication type to use. Possible values include: 'Basic', 'OAuth2' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset_py3.py index 8d2abba32ec6..97a484fb8826 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class ServiceNowObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_source_py3.py index 8010f2aea2fb..ffe72cb426e7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/service_now_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class ServiceNowSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service_py3.py index 2c2fcca6f001..581e8f2a0f8e 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sftp_server_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SftpServerLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service_py3.py index 4d1ac17b1ebe..8d7d659bebe1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class ShopifyLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset_py3.py index b3ccec372e44..f83ac708a93d 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class ShopifyObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_source_py3.py index 1170ae521d47..953d9246d9a2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/shopify_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class ShopifySource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service_py3.py index 832b8cb0c7da..c5e20deef8e8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SparkLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset_py3.py index cee1552ac9ee..c12d454f68a7 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SparkObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_source_py3.py index 8fd55d21d579..ede7f9ed5e2b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/spark_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SparkSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_sink_py3.py index 5380b32f61d7..2b2d44cf16c6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class SqlDWSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_source_py3.py index 3fb991a7bc64..b74c004141d1 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_dw_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SqlDWSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py index 5e6a25007f3f..36230c046278 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service.py @@ -33,8 +33,9 @@ class SqlServerLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param user_name: The on-premises Windows authentication user name. Type: string (or Expression with resultType string). :type user_name: object @@ -58,7 +59,7 @@ class SqlServerLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service_py3.py index de0bb00b1cbd..fb446a12f601 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SqlServerLinkedService(LinkedService): @@ -33,8 +33,9 @@ class SqlServerLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: Required. The connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: Required. The connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param user_name: The on-premises Windows authentication user name. Type: string (or Expression with resultType string). :type user_name: object @@ -58,7 +59,7 @@ class SqlServerLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py index a03d1500425a..b1166e0de545 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_stored_procedure_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class SqlServerStoredProcedureActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset_py3.py index fe75db9ab096..4a2f80144cda 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_server_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SqlServerTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_sink_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_sink_py3.py index e12a17c18ece..5aa68f696f16 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_sink_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_sink_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_sink import CopySink +from .copy_sink_py3 import CopySink class SqlSink(CopySink): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_source_py3.py index 34be7054e4e8..ff39b6768a9f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sql_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SqlSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service_py3.py index 08cb36e5a54f..ffbe49d74ee8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SquareLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset_py3.py index 0fd0dd4abbfd..879b34c83620 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class SquareObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_source_py3.py index 81fbbeb9c150..a87b924949de 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/square_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class SquareSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service_py3.py index b5c9c8788f25..59b20a5f73cd 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/sybase_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class SybaseLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator.py index ec499cceee24..fdd098ae9659 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator.py @@ -22,9 +22,15 @@ class TabularTranslator(CopyTranslator): :type additional_properties: dict[str, object] :param type: Required. Constant filled by server. :type type: str - :param column_mappings: Column mappings. Type: string (or Expression with - resultType string). + :param column_mappings: Column mappings. Example: "UserId: MyUserId, + Group: MyGroup, Name: MyName" Type: string (or Expression with resultType + string). :type column_mappings: object + :param schema_mapping: The schema mapping to map between tabular data and + hierarchical data. Example: {"Column1": "$.Column1", "Column2": + "$.Column2.Property1", "Column3": "$.Column2.Property2"}. Type: object (or + Expression with resultType object). + :type schema_mapping: object """ _validation = { @@ -35,9 +41,11 @@ class TabularTranslator(CopyTranslator): 'additional_properties': {'key': '', 'type': '{object}'}, 'type': {'key': 'type', 'type': 'str'}, 'column_mappings': {'key': 'columnMappings', 'type': 'object'}, + 'schema_mapping': {'key': 'schemaMapping', 'type': 'object'}, } def __init__(self, **kwargs): super(TabularTranslator, self).__init__(**kwargs) self.column_mappings = kwargs.get('column_mappings', None) + self.schema_mapping = kwargs.get('schema_mapping', None) self.type = 'TabularTranslator' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator_py3.py index eddbf396c0d6..0bd2ce51a0f0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tabular_translator_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_translator import CopyTranslator +from .copy_translator_py3 import CopyTranslator class TabularTranslator(CopyTranslator): @@ -22,9 +22,15 @@ class TabularTranslator(CopyTranslator): :type additional_properties: dict[str, object] :param type: Required. Constant filled by server. :type type: str - :param column_mappings: Column mappings. Type: string (or Expression with - resultType string). + :param column_mappings: Column mappings. Example: "UserId: MyUserId, + Group: MyGroup, Name: MyName" Type: string (or Expression with resultType + string). :type column_mappings: object + :param schema_mapping: The schema mapping to map between tabular data and + hierarchical data. Example: {"Column1": "$.Column1", "Column2": + "$.Column2.Property1", "Column3": "$.Column2.Property2"}. Type: object (or + Expression with resultType object). + :type schema_mapping: object """ _validation = { @@ -35,9 +41,11 @@ class TabularTranslator(CopyTranslator): 'additional_properties': {'key': '', 'type': '{object}'}, 'type': {'key': 'type', 'type': 'str'}, 'column_mappings': {'key': 'columnMappings', 'type': 'object'}, + 'schema_mapping': {'key': 'schemaMapping', 'type': 'object'}, } - def __init__(self, *, additional_properties=None, column_mappings=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, column_mappings=None, schema_mapping=None, **kwargs) -> None: super(TabularTranslator, self).__init__(additional_properties=additional_properties, **kwargs) self.column_mappings = column_mappings + self.schema_mapping = schema_mapping self.type = 'TabularTranslator' diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py index 0df87c4f1487..b3847d7dd9f4 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service.py @@ -36,9 +36,6 @@ class TeradataLinkedService(LinkedService): :param server: Required. Server name for connection. Type: string (or Expression with resultType string). :type server: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object :param authentication_type: AuthenticationType to be used for connection. Possible values include: 'Basic', 'Windows' :type authentication_type: str or @@ -67,7 +64,6 @@ class TeradataLinkedService(LinkedService): 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, @@ -77,7 +73,6 @@ class TeradataLinkedService(LinkedService): def __init__(self, **kwargs): super(TeradataLinkedService, self).__init__(**kwargs) self.server = kwargs.get('server', None) - self.schema = kwargs.get('schema', None) self.authentication_type = kwargs.get('authentication_type', None) self.username = kwargs.get('username', None) self.password = kwargs.get('password', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service_py3.py index 1fecbababcb2..236741422023 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/teradata_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class TeradataLinkedService(LinkedService): @@ -36,9 +36,6 @@ class TeradataLinkedService(LinkedService): :param server: Required. Server name for connection. Type: string (or Expression with resultType string). :type server: object - :param schema: Schema name for connection. Type: string (or Expression - with resultType string). - :type schema: object :param authentication_type: AuthenticationType to be used for connection. Possible values include: 'Basic', 'Windows' :type authentication_type: str or @@ -67,17 +64,15 @@ class TeradataLinkedService(LinkedService): 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, 'server': {'key': 'typeProperties.server', 'type': 'object'}, - 'schema': {'key': 'typeProperties.schema', 'type': 'object'}, 'authentication_type': {'key': 'typeProperties.authenticationType', 'type': 'str'}, 'username': {'key': 'typeProperties.username', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, server, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, schema=None, authentication_type=None, username=None, password=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, server, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, authentication_type=None, username=None, password=None, encrypted_credential=None, **kwargs) -> None: super(TeradataLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.server = server - self.schema = schema self.authentication_type = authentication_type self.username = username self.password = password diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/text_format_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/text_format_py3.py index 17a7b55327c4..0d876f62b112 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/text_format_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/text_format_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset_storage_format import DatasetStorageFormat +from .dataset_storage_format_py3 import DatasetStorageFormat class TextFormat(DatasetStorageFormat): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_resource_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_resource_py3.py index e90d1a8010fb..ae6a04ac3128 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_resource_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/trigger_resource_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .sub_resource import SubResource +from .sub_resource_py3 import SubResource class TriggerResource(SubResource): @@ -49,5 +49,5 @@ class TriggerResource(SubResource): } def __init__(self, *, properties, **kwargs) -> None: - super(TriggerResource, self).__init__(, **kwargs) + super(TriggerResource, self).__init__(**kwargs) self.properties = properties diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tumbling_window_trigger_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tumbling_window_trigger_py3.py index a436cc6fa2b4..9db68bc272d0 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tumbling_window_trigger_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/tumbling_window_trigger_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .trigger import Trigger +from .trigger_py3 import Trigger class TumblingWindowTrigger(Trigger): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py index 5d3c2739feef..a73467b7123b 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/until_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .control_activity import ControlActivity +from .control_activity_py3 import ControlActivity class UntilActivity(ControlActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py index b6bb2c2d389d..d872a0d547cc 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service.py @@ -33,8 +33,9 @@ class VerticaLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class VerticaLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service_py3.py index 8162656a5e20..1f8d8d570205 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class VerticaLinkedService(LinkedService): @@ -33,8 +33,9 @@ class VerticaLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param connection_string: An ODBC connection string. - :type connection_string: ~azure.mgmt.datafactory.models.SecretBase + :param connection_string: An ODBC connection string. Type: string, + SecureString or AzureKeyVaultSecretReference. + :type connection_string: object :param encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string). @@ -52,7 +53,7 @@ class VerticaLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, - 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'SecretBase'}, + 'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source_py3.py index 25eb02039b81..6be2edd35218 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class VerticaSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset_py3.py index 6681fca04f33..1dd56dfd46ee 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/vertica_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class VerticaTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py index 7c7dc1d1f30f..ee3da26e5b83 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/wait_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .control_activity import ControlActivity +from .control_activity_py3 import ControlActivity class WaitActivity(ControlActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py index 5b3220509c34..c84a8e4d31d2 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_activity_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .execution_activity import ExecutionActivity +from .execution_activity_py3 import ExecutionActivity class WebActivity(ExecutionActivity): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_anonymous_authentication_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_anonymous_authentication_py3.py index c889c410c585..ee7a4e780a1f 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_anonymous_authentication_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_anonymous_authentication_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .web_linked_service_type_properties import WebLinkedServiceTypeProperties +from .web_linked_service_type_properties_py3 import WebLinkedServiceTypeProperties class WebAnonymousAuthentication(WebLinkedServiceTypeProperties): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication_py3.py index a6ba3cc384cf..71577ec86565 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_basic_authentication_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .web_linked_service_type_properties import WebLinkedServiceTypeProperties +from .web_linked_service_type_properties_py3 import WebLinkedServiceTypeProperties class WebBasicAuthentication(WebLinkedServiceTypeProperties): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication_py3.py index 16d41490e2c2..7ac859b677a8 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_client_certificate_authentication_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .web_linked_service_type_properties import WebLinkedServiceTypeProperties +from .web_linked_service_type_properties_py3 import WebLinkedServiceTypeProperties class WebClientCertificateAuthentication(WebLinkedServiceTypeProperties): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service_py3.py index 0e49f955d436..3afa3a1bcb05 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class WebLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_source_py3.py index 97571eb096f8..7c5ce29d3d26 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class WebSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset_py3.py index a5780a7e480a..7a361289553c 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/web_table_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class WebTableDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service_py3.py index 104af987bddc..7a8a08d0bb22 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class XeroLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset_py3.py index 80a74d953589..685be7b0dffa 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class XeroObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_source_py3.py index 4a1c2d2bdbc3..e8c8e954eda6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/xero_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class XeroSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service_py3.py index 4e5d0f5f31f3..c05d018146d6 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_linked_service_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .linked_service import LinkedService +from .linked_service_py3 import LinkedService class ZohoLinkedService(LinkedService): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset_py3.py index 112d3bbd3952..40a579665206 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_object_dataset_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .dataset import Dataset +from .dataset_py3 import Dataset class ZohoObjectDataset(Dataset): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_source_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_source_py3.py index 8533b239ae13..5f0547d9465a 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_source_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/zoho_source_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .copy_source import CopySource +from .copy_source_py3 import CopySource class ZohoSource(CopySource): diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py index 2714690eda35..0a64dbac9083 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/factories_operations.py @@ -100,6 +100,71 @@ def internal_paging(next_link=None, raw=False): return deserialized list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/factories'} + def configure_factory_repo( + self, location_id, factory_repo_update, custom_headers=None, raw=False, **operation_config): + """Updates a factory's repo information. + + :param location_id: The location identifier. + :type location_id: str + :param factory_repo_update: Update factory repo request definition. + :type factory_repo_update: + ~azure.mgmt.datafactory.models.FactoryRepoUpdate + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: Factory or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.datafactory.models.Factory or + ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorResponseException` + """ + # Construct URL + url = self.configure_factory_repo.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'locationId': self._serialize.url("location_id", location_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(factory_repo_update, 'FactoryRepoUpdate') + + # Construct and send request + request = self._client.post(url, query_parameters) + response = self._client.send( + request, header_parameters, body_content, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('Factory', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + configure_factory_repo.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.DataFactory/locations/{locationId}/configureFactoryRepo'} + def list_by_resource_group( self, resource_group_name, custom_headers=None, raw=False, **operation_config): """Lists factories. diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py index a410d4adb270..5a7feab42d26 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "2017-09-01-preview" +VERSION = "0.6.0"