Generated from 6effad585c2bd2f1de30e2c6e5467750384a3d0b

Refactor delete activity content

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

@@ -50,8 +50,6 @@
     from .factory_repo_update_py3 import FactoryRepoUpdate
     from .git_hub_access_token_request_py3 import GitHubAccessTokenRequest
     from .git_hub_access_token_response_py3 import GitHubAccessTokenResponse
-    from .user_access_policy_py3 import UserAccessPolicy
-    from .access_policy_response_py3 import AccessPolicyResponse
     from .pipeline_reference_py3 import PipelineReference
     from .trigger_pipeline_reference_py3 import TriggerPipelineReference
     from .factory_update_parameters_py3 import FactoryUpdateParameters
@@ -297,6 +295,7 @@
     from .azure_table_source_py3 import AzureTableSource
     from .copy_source_py3 import CopySource
     from .lookup_activity_py3 import LookupActivity
+    from .log_storage_settings_py3 import LogStorageSettings
     from .delete_activity_py3 import DeleteActivity
     from .sql_server_stored_procedure_activity_py3 import SqlServerStoredProcedureActivity
     from .custom_activity_reference_object_py3 import CustomActivityReferenceObject
@@ -405,8 +404,6 @@
     from .factory_repo_update import FactoryRepoUpdate
     from .git_hub_access_token_request import GitHubAccessTokenRequest
     from .git_hub_access_token_response import GitHubAccessTokenResponse
-    from .user_access_policy import UserAccessPolicy
-    from .access_policy_response import AccessPolicyResponse
     from .pipeline_reference import PipelineReference
     from .trigger_pipeline_reference import TriggerPipelineReference
     from .factory_update_parameters import FactoryUpdateParameters
@@ -652,6 +649,7 @@
     from .azure_table_source import AzureTableSource
     from .copy_source import CopySource
     from .lookup_activity import LookupActivity
+    from .log_storage_settings import LogStorageSettings
     from .delete_activity import DeleteActivity
     from .sql_server_stored_procedure_activity import SqlServerStoredProcedureActivity
     from .custom_activity_reference_object import CustomActivityReferenceObject
@@ -830,8 +828,6 @@
     'FactoryRepoUpdate',
     'GitHubAccessTokenRequest',
     'GitHubAccessTokenResponse',
-    'UserAccessPolicy',
-    'AccessPolicyResponse',
     'PipelineReference',
     'TriggerPipelineReference',
     'FactoryUpdateParameters',
@@ -1077,6 +1073,7 @@
     'AzureTableSource',
     'CopySource',
     'LookupActivity',
+    'LogStorageSettings',
     'DeleteActivity',
     'SqlServerStoredProcedureActivity',
     'CustomActivityReferenceObject',

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

@@ -37,8 +37,8 @@ class AmazonMWSLinkedService(LinkedService):
      mws.amazonservices.com)
     :type endpoint: object
     :param marketplace_id: Required. The Amazon Marketplace ID you want to
-     retrieve data from. To retrieve data from multiple Marketplace IDs,
-     separate them with a comma (,). (i.e. A2EUQ1WTGCTBG2)
+     retrieve data from. To retrive data from multiple Marketplace IDs,
+     seperate them with a comma (,). (i.e. A2EUQ1WTGCTBG2)
     :type marketplace_id: object
     :param seller_id: Required. The Amazon seller ID.
     :type seller_id: object

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

@@ -37,8 +37,8 @@ class AmazonMWSLinkedService(LinkedService):
      mws.amazonservices.com)
     :type endpoint: object
     :param marketplace_id: Required. The Amazon Marketplace ID you want to
-     retrieve data from. To retrieve data from multiple Marketplace IDs,
-     separate them with a comma (,). (i.e. A2EUQ1WTGCTBG2)
+     retrieve data from. To retrive data from multiple Marketplace IDs,
+     seperate them with a comma (,). (i.e. A2EUQ1WTGCTBG2)
     :type marketplace_id: object
     :param seller_id: Required. The Amazon seller ID.
     :type seller_id: object

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

@@ -39,9 +39,6 @@ class AmazonMWSObjectDataset(Dataset):
     :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
-    :param table_name: The table name. Type: string (or Expression with
-     resultType string).
-    :type table_name: object
     """
 
     _validation = {
@@ -58,10 +55,8 @@ class AmazonMWSObjectDataset(Dataset):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
-        'table_name': {'key': 'typeProperties.tableName', 'type': 'object'},
     }
 
     def __init__(self, **kwargs):
         super(AmazonMWSObjectDataset, self).__init__(**kwargs)
-        self.table_name = kwargs.get('table_name', None)
         self.type = 'AmazonMWSObject'

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

@@ -39,9 +39,6 @@ class AmazonMWSObjectDataset(Dataset):
     :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
-    :param table_name: The table name. Type: string (or Expression with
-     resultType string).
-    :type table_name: object
     """
 
     _validation = {
@@ -58,10 +55,8 @@ class AmazonMWSObjectDataset(Dataset):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
-        'table_name': {'key': 'typeProperties.tableName', 'type': 'object'},
     }
 
-    def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, folder=None, table_name=None, **kwargs) -> None:
+    def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, folder=None, **kwargs) -> None:
         super(AmazonMWSObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, folder=folder, **kwargs)
-        self.table_name = table_name
         self.type = 'AmazonMWSObject'

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

@@ -37,18 +37,9 @@ class AzureBlobStorageLinkedService(LinkedService):
      with sasUri, serviceEndpoint property. Type: string, SecureString or
      AzureKeyVaultSecretReference.
     :type connection_string: object
-    :param account_key: The Azure key vault secret reference of accountKey in
-     connection string.
-    :type account_key:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
     :param sas_uri: SAS URI of the Azure Blob Storage resource. It is mutually
-     exclusive with connectionString, serviceEndpoint property. Type: string,
-     SecureString or AzureKeyVaultSecretReference.
-    :type sas_uri: object
-    :param sas_token: The Azure key vault secret reference of sasToken in sas
-     uri.
-    :type sas_token:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
+     exclusive with connectionString, serviceEndpoint property.
+    :type sas_uri: ~azure.mgmt.datafactory.models.SecretBase
     :param service_endpoint: Blob service endpoint of the Azure Blob Storage
      resource. It is mutually exclusive with connectionString, sasUri property.
     :type service_endpoint: str
@@ -80,9 +71,7 @@ class AzureBlobStorageLinkedService(LinkedService):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'type': {'key': 'type', 'type': 'str'},
         'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
-        'account_key': {'key': 'typeProperties.accountKey', 'type': 'AzureKeyVaultSecretReference'},
-        'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'object'},
-        'sas_token': {'key': 'typeProperties.sasToken', 'type': 'AzureKeyVaultSecretReference'},
+        'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'},
         'service_endpoint': {'key': 'typeProperties.serviceEndpoint', 'type': 'str'},
         'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
         'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
@@ -93,9 +82,7 @@ class AzureBlobStorageLinkedService(LinkedService):
     def __init__(self, **kwargs):
         super(AzureBlobStorageLinkedService, self).__init__(**kwargs)
         self.connection_string = kwargs.get('connection_string', None)
-        self.account_key = kwargs.get('account_key', None)
         self.sas_uri = kwargs.get('sas_uri', None)
-        self.sas_token = kwargs.get('sas_token', None)
         self.service_endpoint = kwargs.get('service_endpoint', None)
         self.service_principal_id = kwargs.get('service_principal_id', None)
         self.service_principal_key = kwargs.get('service_principal_key', None)

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

@@ -37,18 +37,9 @@ class AzureBlobStorageLinkedService(LinkedService):
      with sasUri, serviceEndpoint property. Type: string, SecureString or
      AzureKeyVaultSecretReference.
     :type connection_string: object
-    :param account_key: The Azure key vault secret reference of accountKey in
-     connection string.
-    :type account_key:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
     :param sas_uri: SAS URI of the Azure Blob Storage resource. It is mutually
-     exclusive with connectionString, serviceEndpoint property. Type: string,
-     SecureString or AzureKeyVaultSecretReference.
-    :type sas_uri: object
-    :param sas_token: The Azure key vault secret reference of sasToken in sas
-     uri.
-    :type sas_token:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
+     exclusive with connectionString, serviceEndpoint property.
+    :type sas_uri: ~azure.mgmt.datafactory.models.SecretBase
     :param service_endpoint: Blob service endpoint of the Azure Blob Storage
      resource. It is mutually exclusive with connectionString, sasUri property.
     :type service_endpoint: str
@@ -80,22 +71,18 @@ class AzureBlobStorageLinkedService(LinkedService):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'type': {'key': 'type', 'type': 'str'},
         'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
-        'account_key': {'key': 'typeProperties.accountKey', 'type': 'AzureKeyVaultSecretReference'},
-        'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'object'},
-        'sas_token': {'key': 'typeProperties.sasToken', 'type': 'AzureKeyVaultSecretReference'},
+        'sas_uri': {'key': 'typeProperties.sasUri', 'type': 'SecretBase'},
         'service_endpoint': {'key': 'typeProperties.serviceEndpoint', 'type': 'str'},
         'service_principal_id': {'key': 'typeProperties.servicePrincipalId', 'type': 'object'},
         'service_principal_key': {'key': 'typeProperties.servicePrincipalKey', 'type': 'SecretBase'},
         'tenant': {'key': 'typeProperties.tenant', 'type': 'object'},
         'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'str'},
     }
 
-    def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_string=None, account_key=None, sas_uri=None, sas_token=None, service_endpoint: str=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential: str=None, **kwargs) -> None:
+    def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_string=None, sas_uri=None, service_endpoint: str=None, service_principal_id=None, service_principal_key=None, tenant=None, encrypted_credential: str=None, **kwargs) -> None:
         super(AzureBlobStorageLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs)
         self.connection_string = connection_string
-        self.account_key = account_key
         self.sas_uri = sas_uri
-        self.sas_token = sas_token
         self.service_endpoint = service_endpoint
         self.service_principal_id = service_principal_id
         self.service_principal_key = service_principal_key

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

@@ -36,10 +36,6 @@ class AzureMySqlLinkedService(LinkedService):
     :param connection_string: Required. The connection string. Type: string,
      SecureString or AzureKeyVaultSecretReference.
     :type connection_string: object
-    :param password: The Azure key vault secret reference of password in
-     connection string.
-    :type password:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
     :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).
@@ -59,13 +55,11 @@ class AzureMySqlLinkedService(LinkedService):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'type': {'key': 'type', 'type': 'str'},
         'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
-        'password': {'key': 'typeProperties.password', 'type': 'AzureKeyVaultSecretReference'},
         'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
     }
 
     def __init__(self, **kwargs):
         super(AzureMySqlLinkedService, self).__init__(**kwargs)
         self.connection_string = kwargs.get('connection_string', None)
-        self.password = kwargs.get('password', None)
         self.encrypted_credential = kwargs.get('encrypted_credential', None)
         self.type = 'AzureMySql'

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

@@ -36,10 +36,6 @@ class AzureMySqlLinkedService(LinkedService):
     :param connection_string: Required. The connection string. Type: string,
      SecureString or AzureKeyVaultSecretReference.
     :type connection_string: object
-    :param password: The Azure key vault secret reference of password in
-     connection string.
-    :type password:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
     :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).
@@ -59,13 +55,11 @@ class AzureMySqlLinkedService(LinkedService):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'type': {'key': 'type', 'type': 'str'},
         'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
-        'password': {'key': 'typeProperties.password', 'type': 'AzureKeyVaultSecretReference'},
         'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
     }
 
-    def __init__(self, *, connection_string, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=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(AzureMySqlLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs)
         self.connection_string = connection_string
-        self.password = password
         self.encrypted_credential = encrypted_credential
         self.type = 'AzureMySql'

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

@@ -36,10 +36,6 @@ class AzurePostgreSqlLinkedService(LinkedService):
     :param connection_string: An ODBC connection string. Type: string,
      SecureString or AzureKeyVaultSecretReference.
     :type connection_string: object
-    :param password: The Azure key vault secret reference of password in
-     connection string.
-    :type password:
-     ~azure.mgmt.datafactory.models.AzureKeyVaultSecretReference
     :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).
@@ -58,13 +54,11 @@ class AzurePostgreSqlLinkedService(LinkedService):
         'annotations': {'key': 'annotations', 'type': '[object]'},
         'type': {'key': 'type', 'type': 'str'},
         'connection_string': {'key': 'typeProperties.connectionString', 'type': 'object'},
-        'password': {'key': 'typeProperties.password', 'type': 'AzureKeyVaultSecretReference'},
         'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'},
     }
 
     def __init__(self, **kwargs):
         super(AzurePostgreSqlLinkedService, self).__init__(**kwargs)
         self.connection_string = kwargs.get('connection_string', None)
-        self.password = kwargs.get('password', None)
         self.encrypted_credential = kwargs.get('encrypted_credential', None)
         self.type = 'AzurePostgreSql'