[DataFactory] Support providing Salesforce passwords and security tokens as SecureStrings or as secrets in Azure Key Vault

azure-mgmt-datafactory/azure/mgmt/datafactory/data_factory_management_client.py

@@ -45,8 +45,6 @@ def __init__(
             raise ValueError("Parameter 'credentials' must not be None.")
         if subscription_id is None:
             raise ValueError("Parameter 'subscription_id' must not be None.")
-        if not isinstance(subscription_id, str):
-            raise TypeError("Parameter 'subscription_id' must be str.")
         if not base_url:
             base_url = 'https://management.azure.com'
 

azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py

@@ -13,6 +13,9 @@
 from .sub_resource import SubResource
 from .expression import Expression
 from .secure_string import SecureString
+from .linked_service_reference import LinkedServiceReference
+from .azure_key_vault_secret_reference import AzureKeyVaultSecretReference
+from .secret_base import SecretBase
 from .factory_identity import FactoryIdentity
 from .factory import Factory
 from .integration_runtime import IntegrationRuntime
@@ -23,7 +26,6 @@
 from .integration_runtime_status_list_response import IntegrationRuntimeStatusListResponse
 from .linked_service import LinkedService
 from .linked_service_resource import LinkedServiceResource
-from .linked_service_reference import LinkedServiceReference
 from .parameter_specification import ParameterSpecification
 from .dataset import Dataset
 from .dataset_resource import DatasetResource
@@ -85,8 +87,6 @@
 from .oracle_linked_service import OracleLinkedService
 from .file_server_linked_service import FileServerLinkedService
 from .hd_insight_linked_service import HDInsightLinkedService
-from .azure_key_vault_secret_reference import AzureKeyVaultSecretReference
-from .azure_key_vault_reference import AzureKeyVaultReference
 from .dynamics_linked_service import DynamicsLinkedService
 from .cosmos_db_linked_service import CosmosDbLinkedService
 from .azure_key_vault_linked_service import AzureKeyVaultLinkedService
@@ -173,6 +173,7 @@
 from .staging_settings import StagingSettings
 from .tabular_translator import TabularTranslator
 from .copy_translator import CopyTranslator
+from .dynamics_sink import DynamicsSink
 from .odbc_sink import OdbcSink
 from .azure_search_index_sink import AzureSearchIndexSink
 from .azure_data_lake_store_sink import AzureDataLakeStoreSink
@@ -265,6 +266,9 @@
     'SubResource',
     'Expression',
     'SecureString',
+    'LinkedServiceReference',
+    'AzureKeyVaultSecretReference',
+    'SecretBase',
     'FactoryIdentity',
     'Factory',
     'IntegrationRuntime',
@@ -275,7 +279,6 @@
     'IntegrationRuntimeStatusListResponse',
     'LinkedService',
     'LinkedServiceResource',
-    'LinkedServiceReference',
     'ParameterSpecification',
     'Dataset',
     'DatasetResource',
@@ -337,8 +340,6 @@
     'OracleLinkedService',
     'FileServerLinkedService',
     'HDInsightLinkedService',
-    'AzureKeyVaultSecretReference',
-    'AzureKeyVaultReference',
     'DynamicsLinkedService',
     'CosmosDbLinkedService',
     'AzureKeyVaultLinkedService',
@@ -425,6 +426,7 @@
     'StagingSettings',
     'TabularTranslator',
     'CopyTranslator',
+    'DynamicsSink',
     'OdbcSink',
     'AzureSearchIndexSink',
     'AzureDataLakeStoreSink',

azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity.py

@@ -15,14 +15,16 @@
 class Activity(Model):
     """A pipeline activity.
 
+    You probably want to use the sub-classes and not this class directly. Known
+    sub-classes are: ExecutionActivity, ControlActivity
+
     :param name: Activity name.
     :type name: str
     :param description: Activity description.
     :type description: str
     :param depends_on: Activity depends on condition.
-    :type depends_on: list of :class:`ActivityDependency
-     <azure.mgmt.datafactory.models.ActivityDependency>`
-    :param type: Polymorphic Discriminator
+    :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency]
+    :param type: Constant filled by server.
     :type type: str
     """
 

azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_dependency.py

@@ -18,8 +18,8 @@ class ActivityDependency(Model):
     :param activity: Activity name.
     :type activity: str
     :param dependency_conditions: Match-Condition for the dependency.
-    :type dependency_conditions: list of str or :class:`DependencyCondition
-     <azure.mgmt.datafactory.models.DependencyCondition>`
+    :type dependency_conditions: list[str or
+     ~azure.mgmt.datafactory.models.DependencyCondition]
     """
 
     _validation = {

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_linked_service.py

@@ -16,11 +16,11 @@ class AmazonRedshiftLinkedService(LinkedService):
     """Linked service for Amazon Redshift.
 
     :param connect_via: The integration runtime reference.
-    :type connect_via: :class:`IntegrationRuntimeReference
-     <azure.mgmt.datafactory.models.IntegrationRuntimeReference>`
+    :type connect_via:
+     ~azure.mgmt.datafactory.models.IntegrationRuntimeReference
     :param description: Linked service description.
     :type description: str
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param server: The name of the Amazon Redshift server. Type: string (or
      Expression with resultType string).
@@ -29,8 +29,7 @@ class AmazonRedshiftLinkedService(LinkedService):
      (or Expression with resultType string).
     :type username: object
     :param password: The password of the Amazon Redshift source.
-    :type password: :class:`SecureString
-     <azure.mgmt.datafactory.models.SecureString>`
+    :type password: ~azure.mgmt.datafactory.models.SecureString
     :param database: The database name of the Amazon Redshift source. Type:
      string (or Expression with resultType string).
     :type database: object

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_redshift_source.py

@@ -22,7 +22,7 @@ class AmazonRedshiftSource(CopySource):
      with resultType string), pattern:
      ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
     :type source_retry_wait: object
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param query: Database query. Type: string (or Expression with resultType
      string).
@@ -31,8 +31,8 @@ class AmazonRedshiftSource(CopySource):
      interim Amazon S3 when copying from Amazon Redshift with unload. With
      this, data from Amazon Redshift source will be unloaded into S3 first and
      then copied into the targeted sink from the interim S3.
-    :type redshift_unload_settings: :class:`RedshiftUnloadSettings
-     <azure.mgmt.datafactory.models.RedshiftUnloadSettings>`
+    :type redshift_unload_settings:
+     ~azure.mgmt.datafactory.models.RedshiftUnloadSettings
     """
 
     _validation = {

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_dataset.py

@@ -21,11 +21,12 @@ class AmazonS3Dataset(Dataset):
      array (or Expression with resultType array), itemType: DatasetDataElement.
     :type structure: object
     :param linked_service_name: Linked service reference.
-    :type linked_service_name: :class:`LinkedServiceReference
-     <azure.mgmt.datafactory.models.LinkedServiceReference>`
+    :type linked_service_name:
+     ~azure.mgmt.datafactory.models.LinkedServiceReference
     :param parameters: Parameters for dataset.
-    :type parameters: dict
-    :param type: Polymorphic Discriminator
+    :type parameters: dict[str,
+     ~azure.mgmt.datafactory.models.ParameterSpecification]
+    :param type: Constant filled by server.
     :type type: str
     :param bucket_name: The name of the Amazon S3 bucket. Type: string (or
      Expression with resultType string).
@@ -40,12 +41,10 @@ class AmazonS3Dataset(Dataset):
      with resultType string).
     :type version: object
     :param format: The format of files.
-    :type format: :class:`DatasetStorageFormat
-     <azure.mgmt.datafactory.models.DatasetStorageFormat>`
+    :type format: ~azure.mgmt.datafactory.models.DatasetStorageFormat
     :param compression: The data compression method used for the Amazon S3
      object.
-    :type compression: :class:`DatasetCompression
-     <azure.mgmt.datafactory.models.DatasetCompression>`
+    :type compression: ~azure.mgmt.datafactory.models.DatasetCompression
     """
 
     _validation = {

azure-mgmt-datafactory/azure/mgmt/datafactory/models/amazon_s3_linked_service.py

@@ -16,20 +16,19 @@ class AmazonS3LinkedService(LinkedService):
     """Linked service for Amazon S3.
 
     :param connect_via: The integration runtime reference.
-    :type connect_via: :class:`IntegrationRuntimeReference
-     <azure.mgmt.datafactory.models.IntegrationRuntimeReference>`
+    :type connect_via:
+     ~azure.mgmt.datafactory.models.IntegrationRuntimeReference
     :param description: Linked service description.
     :type description: str
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param access_key_id: The access key identifier of the Amazon S3 Identity
      and Access Management (IAM) user. Type: string (or Expression with
      resultType string).
     :type access_key_id: object
     :param secret_access_key: The secret access key of the Amazon S3 Identity
      and Access Management (IAM) user.
-    :type secret_access_key: :class:`SecureString
-     <azure.mgmt.datafactory.models.SecureString>`
+    :type secret_access_key: ~azure.mgmt.datafactory.models.SecureString
     :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).

azure-mgmt-datafactory/azure/mgmt/datafactory/models/avro_format.py

@@ -21,7 +21,7 @@ class AvroFormat(DatasetStorageFormat):
     :param deserializer: Deserializer. Type: string (or Expression with
      resultType string).
     :type deserializer: object
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     """
 

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_batch_linked_service.py

@@ -16,27 +16,26 @@ class AzureBatchLinkedService(LinkedService):
     """Azure Batch linked service.
 
     :param connect_via: The integration runtime reference.
-    :type connect_via: :class:`IntegrationRuntimeReference
-     <azure.mgmt.datafactory.models.IntegrationRuntimeReference>`
+    :type connect_via:
+     ~azure.mgmt.datafactory.models.IntegrationRuntimeReference
     :param description: Linked service description.
     :type description: str
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param account_name: The Azure Batch account name. Type: string (or
      Expression with resultType string).
     :type account_name: object
     :param access_key: The Azure Batch account access key.
-    :type access_key: :class:`SecureString
-     <azure.mgmt.datafactory.models.SecureString>`
+    :type access_key: ~azure.mgmt.datafactory.models.SecureString
     :param batch_uri: The Azure Batch URI. Type: string (or Expression with
      resultType string).
     :type batch_uri: object
     :param pool_name: The Azure Batch pool name. Type: string (or Expression
      with resultType string).
     :type pool_name: object
     :param linked_service_name: The Azure Storage linked service reference.
-    :type linked_service_name: :class:`LinkedServiceReference
-     <azure.mgmt.datafactory.models.LinkedServiceReference>`
+    :type linked_service_name:
+     ~azure.mgmt.datafactory.models.LinkedServiceReference
     :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).

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_blob_dataset.py

@@ -21,11 +21,12 @@ class AzureBlobDataset(Dataset):
      array (or Expression with resultType array), itemType: DatasetDataElement.
     :type structure: object
     :param linked_service_name: Linked service reference.
-    :type linked_service_name: :class:`LinkedServiceReference
-     <azure.mgmt.datafactory.models.LinkedServiceReference>`
+    :type linked_service_name:
+     ~azure.mgmt.datafactory.models.LinkedServiceReference
     :param parameters: Parameters for dataset.
-    :type parameters: dict
-    :param type: Polymorphic Discriminator
+    :type parameters: dict[str,
+     ~azure.mgmt.datafactory.models.ParameterSpecification]
+    :param type: Constant filled by server.
     :type type: str
     :param folder_path: The path of the Azure Blob storage. Type: string (or
      Expression with resultType string).
@@ -37,11 +38,9 @@ class AzureBlobDataset(Dataset):
      with resultType string).
     :type file_name: object
     :param format: The format of the Azure Blob storage.
-    :type format: :class:`DatasetStorageFormat
-     <azure.mgmt.datafactory.models.DatasetStorageFormat>`
+    :type format: ~azure.mgmt.datafactory.models.DatasetStorageFormat
     :param compression: The data compression method used for the blob storage.
-    :type compression: :class:`DatasetCompression
-     <azure.mgmt.datafactory.models.DatasetCompression>`
+    :type compression: ~azure.mgmt.datafactory.models.DatasetCompression
     """
 
     _validation = {

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_analytics_linked_service.py

@@ -16,11 +16,11 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService):
     """Azure Data Lake Analytics linked service.
 
     :param connect_via: The integration runtime reference.
-    :type connect_via: :class:`IntegrationRuntimeReference
-     <azure.mgmt.datafactory.models.IntegrationRuntimeReference>`
+    :type connect_via:
+     ~azure.mgmt.datafactory.models.IntegrationRuntimeReference
     :param description: Linked service description.
     :type description: str
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param account_name: The Azure Data Lake Analytics account name. Type:
      string (or Expression with resultType string).
@@ -31,8 +31,7 @@ class AzureDataLakeAnalyticsLinkedService(LinkedService):
     :type service_principal_id: object
     :param service_principal_key: The Key of the application used to
      authenticate against the Azure Data Lake Analytics account.
-    :type service_principal_key: :class:`SecureString
-     <azure.mgmt.datafactory.models.SecureString>`
+    :type service_principal_key: ~azure.mgmt.datafactory.models.SecureString
     :param tenant: The name or ID of the tenant to which the service principal
      belongs. Type: string (or Expression with resultType string).
     :type tenant: object

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_dataset.py

@@ -21,11 +21,12 @@ class AzureDataLakeStoreDataset(Dataset):
      array (or Expression with resultType array), itemType: DatasetDataElement.
     :type structure: object
     :param linked_service_name: Linked service reference.
-    :type linked_service_name: :class:`LinkedServiceReference
-     <azure.mgmt.datafactory.models.LinkedServiceReference>`
+    :type linked_service_name:
+     ~azure.mgmt.datafactory.models.LinkedServiceReference
     :param parameters: Parameters for dataset.
-    :type parameters: dict
-    :param type: Polymorphic Discriminator
+    :type parameters: dict[str,
+     ~azure.mgmt.datafactory.models.ParameterSpecification]
+    :param type: Constant filled by server.
     :type type: str
     :param folder_path: Path to the folder in the Azure Data Lake Store. Type:
      string (or Expression with resultType string).
@@ -34,16 +35,14 @@ class AzureDataLakeStoreDataset(Dataset):
      string (or Expression with resultType string).
     :type file_name: object
     :param format: The format of the Data Lake Store.
-    :type format: :class:`DatasetStorageFormat
-     <azure.mgmt.datafactory.models.DatasetStorageFormat>`
+    :type format: ~azure.mgmt.datafactory.models.DatasetStorageFormat
     :param compression: The data compression method used for the item(s) in
      the Azure Data Lake Store.
-    :type compression: :class:`DatasetCompression
-     <azure.mgmt.datafactory.models.DatasetCompression>`
+    :type compression: ~azure.mgmt.datafactory.models.DatasetCompression
     :param partitioned_by: Specify a dynamic path and filename for time series
      data.
-    :type partitioned_by: list of :class:`DatasetPartition
-     <azure.mgmt.datafactory.models.DatasetPartition>`
+    :type partitioned_by:
+     list[~azure.mgmt.datafactory.models.DatasetPartition]
     """
 
     _validation = {

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_linked_service.py

@@ -16,11 +16,11 @@ class AzureDataLakeStoreLinkedService(LinkedService):
     """Azure Data Lake Store linked service.
 
     :param connect_via: The integration runtime reference.
-    :type connect_via: :class:`IntegrationRuntimeReference
-     <azure.mgmt.datafactory.models.IntegrationRuntimeReference>`
+    :type connect_via:
+     ~azure.mgmt.datafactory.models.IntegrationRuntimeReference
     :param description: Linked service description.
     :type description: str
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param data_lake_store_uri: Data Lake Store service URI. Type: string (or
      Expression with resultType string).
@@ -31,8 +31,7 @@ class AzureDataLakeStoreLinkedService(LinkedService):
     :type service_principal_id: object
     :param service_principal_key: The Key of the application used to
      authenticate against the Azure Data Lake Store account.
-    :type service_principal_key: :class:`SecureString
-     <azure.mgmt.datafactory.models.SecureString>`
+    :type service_principal_key: ~azure.mgmt.datafactory.models.SecureString
     :param tenant: The name or ID of the tenant to which the service principal
      belongs. Type: string (or Expression with resultType string).
     :type tenant: object

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_sink.py

@@ -29,12 +29,12 @@ class AzureDataLakeStoreSink(CopySink):
      resultType string), pattern:
      ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
     :type sink_retry_wait: object
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param copy_behavior: The type of copy behavior for copy sink. Possible
      values include: 'PreserveHierarchy', 'FlattenHierarchy', 'MergeFiles'
-    :type copy_behavior: str or :class:`CopyBehaviorType
-     <azure.mgmt.datafactory.models.CopyBehaviorType>`
+    :type copy_behavior: str or
+     ~azure.mgmt.datafactory.models.CopyBehaviorType
     """
 
     _validation = {

azure-mgmt-datafactory/azure/mgmt/datafactory/models/azure_data_lake_store_source.py

@@ -22,7 +22,7 @@ class AzureDataLakeStoreSource(CopySource):
      with resultType string), pattern:
      ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])).
     :type source_retry_wait: object
-    :param type: Polymorphic Discriminator
+    :param type: Constant filled by server.
     :type type: str
     :param recursive: If true, files under the folder path will be read
      recursively. Default is true. Type: boolean (or Expression with resultType