[AutoPR datafactory/resource-manager] revert tumbling window dependsOn property under preview, and apply sa…

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

@@ -29,13 +29,17 @@
     from .update_integration_runtime_request_py3 import UpdateIntegrationRuntimeRequest
     from .update_integration_runtime_node_request_py3 import UpdateIntegrationRuntimeNodeRequest
     from .linked_integration_runtime_request_py3 import LinkedIntegrationRuntimeRequest
+    from .create_linked_integration_runtime_request_py3 import CreateLinkedIntegrationRuntimeRequest
     from .parameter_specification_py3 import ParameterSpecification
     from .linked_service_py3 import LinkedService
     from .linked_service_resource_py3 import LinkedServiceResource
+    from .dataset_folder_py3 import DatasetFolder
     from .dataset_py3 import Dataset
     from .dataset_resource_py3 import DatasetResource
     from .activity_dependency_py3 import ActivityDependency
+    from .user_property_py3 import UserProperty
     from .activity_py3 import Activity
+    from .pipeline_folder_py3 import PipelineFolder
     from .pipeline_resource_py3 import PipelineResource
     from .trigger_py3 import Trigger
     from .trigger_resource_py3 import TriggerResource
@@ -137,6 +141,8 @@
     from .azure_sql_database_linked_service_py3 import AzureSqlDatabaseLinkedService
     from .sql_server_linked_service_py3 import SqlServerLinkedService
     from .azure_sql_dw_linked_service_py3 import AzureSqlDWLinkedService
+    from .azure_table_storage_linked_service_py3 import AzureTableStorageLinkedService
+    from .azure_blob_storage_linked_service_py3 import AzureBlobStorageLinkedService
     from .azure_storage_linked_service_py3 import AzureStorageLinkedService
     from .responsys_object_dataset_py3 import ResponsysObjectDataset
     from .salesforce_marketing_cloud_object_dataset_py3 import SalesforceMarketingCloudObjectDataset
@@ -202,6 +208,11 @@
     from .azure_table_dataset_py3 import AzureTableDataset
     from .azure_blob_dataset_py3 import AzureBlobDataset
     from .amazon_s3_dataset_py3 import AmazonS3Dataset
+    from .self_dependency_tumbling_window_trigger_reference_py3 import SelfDependencyTumblingWindowTriggerReference
+    from .trigger_reference_py3 import TriggerReference
+    from .tumbling_window_trigger_dependency_reference_py3 import TumblingWindowTriggerDependencyReference
+    from .trigger_dependency_reference_py3 import TriggerDependencyReference
+    from .dependency_reference_py3 import DependencyReference
     from .retry_policy_py3 import RetryPolicy
     from .tumbling_window_trigger_py3 import TumblingWindowTrigger
     from .blob_events_trigger_py3 import BlobEventsTrigger
@@ -361,13 +372,17 @@
     from .update_integration_runtime_request import UpdateIntegrationRuntimeRequest
     from .update_integration_runtime_node_request import UpdateIntegrationRuntimeNodeRequest
     from .linked_integration_runtime_request import LinkedIntegrationRuntimeRequest
+    from .create_linked_integration_runtime_request import CreateLinkedIntegrationRuntimeRequest
     from .parameter_specification import ParameterSpecification
     from .linked_service import LinkedService
     from .linked_service_resource import LinkedServiceResource
+    from .dataset_folder import DatasetFolder
     from .dataset import Dataset
     from .dataset_resource import DatasetResource
     from .activity_dependency import ActivityDependency
+    from .user_property import UserProperty
     from .activity import Activity
+    from .pipeline_folder import PipelineFolder
     from .pipeline_resource import PipelineResource
     from .trigger import Trigger
     from .trigger_resource import TriggerResource
@@ -469,6 +484,8 @@
     from .azure_sql_database_linked_service import AzureSqlDatabaseLinkedService
     from .sql_server_linked_service import SqlServerLinkedService
     from .azure_sql_dw_linked_service import AzureSqlDWLinkedService
+    from .azure_table_storage_linked_service import AzureTableStorageLinkedService
+    from .azure_blob_storage_linked_service import AzureBlobStorageLinkedService
     from .azure_storage_linked_service import AzureStorageLinkedService
     from .responsys_object_dataset import ResponsysObjectDataset
     from .salesforce_marketing_cloud_object_dataset import SalesforceMarketingCloudObjectDataset
@@ -534,6 +551,11 @@
     from .azure_table_dataset import AzureTableDataset
     from .azure_blob_dataset import AzureBlobDataset
     from .amazon_s3_dataset import AmazonS3Dataset
+    from .self_dependency_tumbling_window_trigger_reference import SelfDependencyTumblingWindowTriggerReference
+    from .trigger_reference import TriggerReference
+    from .tumbling_window_trigger_dependency_reference import TumblingWindowTriggerDependencyReference
+    from .trigger_dependency_reference import TriggerDependencyReference
+    from .dependency_reference import DependencyReference
     from .retry_policy import RetryPolicy
     from .tumbling_window_trigger import TumblingWindowTrigger
     from .blob_events_trigger import BlobEventsTrigger
@@ -761,13 +783,17 @@
     'UpdateIntegrationRuntimeRequest',
     'UpdateIntegrationRuntimeNodeRequest',
     'LinkedIntegrationRuntimeRequest',
+    'CreateLinkedIntegrationRuntimeRequest',
     'ParameterSpecification',
     'LinkedService',
     'LinkedServiceResource',
+    'DatasetFolder',
     'Dataset',
     'DatasetResource',
     'ActivityDependency',
+    'UserProperty',
     'Activity',
+    'PipelineFolder',
     'PipelineResource',
     'Trigger',
     'TriggerResource',
@@ -869,6 +895,8 @@
     'AzureSqlDatabaseLinkedService',
     'SqlServerLinkedService',
     'AzureSqlDWLinkedService',
+    'AzureTableStorageLinkedService',
+    'AzureBlobStorageLinkedService',
     'AzureStorageLinkedService',
     'ResponsysObjectDataset',
     'SalesforceMarketingCloudObjectDataset',
@@ -934,6 +962,11 @@
     'AzureTableDataset',
     'AzureBlobDataset',
     'AmazonS3Dataset',
+    'SelfDependencyTumblingWindowTriggerReference',
+    'TriggerReference',
+    'TumblingWindowTriggerDependencyReference',
+    'TriggerDependencyReference',
+    'DependencyReference',
     'RetryPolicy',
     'TumblingWindowTrigger',
     'BlobEventsTrigger',

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

@@ -30,7 +30,7 @@ class Activity(Model):
     :param depends_on: Activity depends on condition.
     :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency]
     :param user_properties: Activity user properties.
-    :type user_properties: dict[str, str]
+    :type user_properties: list[~azure.mgmt.datafactory.models.UserProperty]
     :param type: Required. Constant filled by server.
     :type type: str
     """
@@ -45,7 +45,7 @@ class Activity(Model):
         'name': {'key': 'name', 'type': 'str'},
         'description': {'key': 'description', 'type': 'str'},
         'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'},
-        'user_properties': {'key': 'userProperties', 'type': '{str}'},
+        'user_properties': {'key': 'userProperties', 'type': '[UserProperty]'},
         'type': {'key': 'type', 'type': 'str'},
     }
 

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

@@ -30,7 +30,7 @@ class Activity(Model):
     :param depends_on: Activity depends on condition.
     :type depends_on: list[~azure.mgmt.datafactory.models.ActivityDependency]
     :param user_properties: Activity user properties.
-    :type user_properties: dict[str, str]
+    :type user_properties: list[~azure.mgmt.datafactory.models.UserProperty]
     :param type: Required. Constant filled by server.
     :type type: str
     """
@@ -45,7 +45,7 @@ class Activity(Model):
         'name': {'key': 'name', 'type': 'str'},
         'description': {'key': 'description', 'type': 'str'},
         'depends_on': {'key': 'dependsOn', 'type': '[ActivityDependency]'},
-        'user_properties': {'key': 'userProperties', 'type': '{str}'},
+        'user_properties': {'key': 'userProperties', 'type': '[UserProperty]'},
         'type': {'key': 'type', 'type': 'str'},
     }
 

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

@@ -34,6 +34,9 @@ class AmazonMWSObjectDataset(Dataset):
     :param annotations: List of tags that can be used for describing the
      Dataset.
     :type annotations: list[object]
+    :param folder: The folder that this Dataset is in. If not specified,
+     Dataset will appear at the root level.
+    :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
     """
@@ -50,6 +53,7 @@ class AmazonMWSObjectDataset(Dataset):
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
         'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
         'annotations': {'key': 'annotations', 'type': '[object]'},
+        'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
     }
 

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

@@ -34,6 +34,9 @@ class AmazonMWSObjectDataset(Dataset):
     :param annotations: List of tags that can be used for describing the
      Dataset.
     :type annotations: list[object]
+    :param folder: The folder that this Dataset is in. If not specified,
+     Dataset will appear at the root level.
+    :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
     """
@@ -50,9 +53,10 @@ class AmazonMWSObjectDataset(Dataset):
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
         'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
         'annotations': {'key': 'annotations', 'type': '[object]'},
+        'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         '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(AmazonMWSObjectDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, **kwargs)
+    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.type = 'AmazonMWSObject'

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

@@ -34,6 +34,9 @@ class AmazonS3Dataset(Dataset):
     :param annotations: List of tags that can be used for describing the
      Dataset.
     :type annotations: list[object]
+    :param folder: The folder that this Dataset is in. If not specified,
+     Dataset will appear at the root level.
+    :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
     :param bucket_name: Required. The name of the Amazon S3 bucket. Type:
@@ -68,6 +71,7 @@ class AmazonS3Dataset(Dataset):
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
         'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
         'annotations': {'key': 'annotations', 'type': '[object]'},
+        'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
         'bucket_name': {'key': 'typeProperties.bucketName', 'type': 'object'},
         'key': {'key': 'typeProperties.key', 'type': 'object'},

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

@@ -34,6 +34,9 @@ class AmazonS3Dataset(Dataset):
     :param annotations: List of tags that can be used for describing the
      Dataset.
     :type annotations: list[object]
+    :param folder: The folder that this Dataset is in. If not specified,
+     Dataset will appear at the root level.
+    :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
     :param bucket_name: Required. The name of the Amazon S3 bucket. Type:
@@ -68,6 +71,7 @@ class AmazonS3Dataset(Dataset):
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
         'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
         'annotations': {'key': 'annotations', 'type': '[object]'},
+        'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
         'bucket_name': {'key': 'typeProperties.bucketName', 'type': 'object'},
         'key': {'key': 'typeProperties.key', 'type': 'object'},
@@ -77,8 +81,8 @@ class AmazonS3Dataset(Dataset):
         'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'},
     }
 
-    def __init__(self, *, linked_service_name, bucket_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, key=None, prefix=None, version=None, format=None, compression=None, **kwargs) -> None:
-        super(AmazonS3Dataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, **kwargs)
+    def __init__(self, *, linked_service_name, bucket_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, folder=None, key=None, prefix=None, version=None, format=None, compression=None, **kwargs) -> None:
+        super(AmazonS3Dataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, folder=folder, **kwargs)
         self.bucket_name = bucket_name
         self.key = key
         self.prefix = prefix

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

@@ -34,6 +34,9 @@ class AzureBlobDataset(Dataset):
     :param annotations: List of tags that can be used for describing the
      Dataset.
     :type annotations: list[object]
+    :param folder: The folder that this Dataset is in. If not specified,
+     Dataset will appear at the root level.
+    :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
     :param folder_path: The path of the Azure Blob storage. Type: string (or
@@ -63,6 +66,7 @@ class AzureBlobDataset(Dataset):
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
         'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
         'annotations': {'key': 'annotations', 'type': '[object]'},
+        'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
         'folder_path': {'key': 'typeProperties.folderPath', 'type': 'object'},
         'table_root_location': {'key': 'typeProperties.tableRootLocation', 'type': 'object'},

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

@@ -34,6 +34,9 @@ class AzureBlobDataset(Dataset):
     :param annotations: List of tags that can be used for describing the
      Dataset.
     :type annotations: list[object]
+    :param folder: The folder that this Dataset is in. If not specified,
+     Dataset will appear at the root level.
+    :type folder: ~azure.mgmt.datafactory.models.DatasetFolder
     :param type: Required. Constant filled by server.
     :type type: str
     :param folder_path: The path of the Azure Blob storage. Type: string (or
@@ -63,6 +66,7 @@ class AzureBlobDataset(Dataset):
         'linked_service_name': {'key': 'linkedServiceName', 'type': 'LinkedServiceReference'},
         'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'},
         'annotations': {'key': 'annotations', 'type': '[object]'},
+        'folder': {'key': 'folder', 'type': 'DatasetFolder'},
         'type': {'key': 'type', 'type': 'str'},
         'folder_path': {'key': 'typeProperties.folderPath', 'type': 'object'},
         'table_root_location': {'key': 'typeProperties.tableRootLocation', 'type': 'object'},
@@ -71,8 +75,8 @@ class AzureBlobDataset(Dataset):
         'compression': {'key': 'typeProperties.compression', 'type': 'DatasetCompression'},
     }
 
-    def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, folder_path=None, table_root_location=None, file_name=None, format=None, compression=None, **kwargs) -> None:
-        super(AzureBlobDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, **kwargs)
+    def __init__(self, *, linked_service_name, additional_properties=None, description: str=None, structure=None, parameters=None, annotations=None, folder=None, folder_path=None, table_root_location=None, file_name=None, format=None, compression=None, **kwargs) -> None:
+        super(AzureBlobDataset, self).__init__(additional_properties=additional_properties, description=description, structure=structure, linked_service_name=linked_service_name, parameters=parameters, annotations=annotations, folder=folder, **kwargs)
         self.folder_path = folder_path
         self.table_root_location = table_root_location
         self.file_name = file_name