From 1e3d11902ef7cb22b577fb154670710e200f9919 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Thu, 23 Jul 2020 05:13:07 +0000 Subject: [PATCH 1/2] Generated from c349c36683124ba79d8b2bc8c7dd501a46df83c1 merge with master --- .../azure/mgmt/datafactory/models/__init__.py | 6 + .../azure/mgmt/datafactory/models/_models.py | 308 ++++++++++++----- .../mgmt/datafactory/models/_models_py3.py | 324 +++++++++++++----- 3 files changed, 468 insertions(+), 170 deletions(-) diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py index 4fd0ccab3ec2..0c5031e135bc 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/__init__.py @@ -34,6 +34,7 @@ from ._models_py3 import AvroSink from ._models_py3 import AvroSource from ._models_py3 import AvroWriteSettings + from ._models_py3 import AzPowerShellSetup from ._models_py3 import AzureBatchLinkedService from ._models_py3 import AzureBlobDataset from ._models_py3 import AzureBlobFSDataset @@ -443,6 +444,7 @@ from ._models_py3 import ResponsysSource from ._models_py3 import RestResourceDataset from ._models_py3 import RestServiceLinkedService + from ._models_py3 import RestSink from ._models_py3 import RestSource from ._models_py3 import RetryPolicy from ._models_py3 import RunFilterParameters @@ -631,6 +633,7 @@ from ._models import AvroSink from ._models import AvroSource from ._models import AvroWriteSettings + from ._models import AzPowerShellSetup from ._models import AzureBatchLinkedService from ._models import AzureBlobDataset from ._models import AzureBlobFSDataset @@ -1040,6 +1043,7 @@ from ._models import ResponsysSource from ._models import RestResourceDataset from ._models import RestServiceLinkedService + from ._models import RestSink from ._models import RestSource from ._models import RetryPolicy from ._models import RunFilterParameters @@ -1318,6 +1322,7 @@ 'AvroSink', 'AvroSource', 'AvroWriteSettings', + 'AzPowerShellSetup', 'AzureBatchLinkedService', 'AzureBlobDataset', 'AzureBlobFSDataset', @@ -1727,6 +1732,7 @@ 'ResponsysSource', 'RestResourceDataset', 'RestServiceLinkedService', + 'RestSink', 'RestSource', 'RetryPolicy', 'RunFilterParameters', diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py index 16e78a8404e8..4b1362ef9f2b 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py @@ -1708,8 +1708,8 @@ class CopySink(Model): SnowflakeSink, SqlDWSink, SqlMISink, AzureSqlSink, SqlServerSink, SqlSink, CosmosDbSqlApiSink, DocumentDbCollectionSink, FileSystemSink, BlobSink, BinarySink, ParquetSink, AvroSink, AzureTableSink, AzureQueueSink, - SapCloudForCustomerSink, AzureMySqlSink, AzurePostgreSqlSink, OrcSink, - JsonSink, DelimitedTextSink + SapCloudForCustomerSink, AzureMySqlSink, AzurePostgreSqlSink, RestSink, + OrcSink, JsonSink, DelimitedTextSink All required parameters must be populated in order to send to Azure. @@ -1753,7 +1753,7 @@ class CopySink(Model): } _subtype_map = { - 'type': {'CosmosDbMongoDbApiSink': 'CosmosDbMongoDbApiSink', 'SalesforceServiceCloudSink': 'SalesforceServiceCloudSink', 'SalesforceSink': 'SalesforceSink', 'AzureDataExplorerSink': 'AzureDataExplorerSink', 'CommonDataServiceForAppsSink': 'CommonDataServiceForAppsSink', 'DynamicsCrmSink': 'DynamicsCrmSink', 'DynamicsSink': 'DynamicsSink', 'MicrosoftAccessSink': 'MicrosoftAccessSink', 'InformixSink': 'InformixSink', 'OdbcSink': 'OdbcSink', 'AzureSearchIndexSink': 'AzureSearchIndexSink', 'AzureBlobFSSink': 'AzureBlobFSSink', 'AzureDataLakeStoreSink': 'AzureDataLakeStoreSink', 'OracleSink': 'OracleSink', 'SnowflakeSink': 'SnowflakeSink', 'SqlDWSink': 'SqlDWSink', 'SqlMISink': 'SqlMISink', 'AzureSqlSink': 'AzureSqlSink', 'SqlServerSink': 'SqlServerSink', 'SqlSink': 'SqlSink', 'CosmosDbSqlApiSink': 'CosmosDbSqlApiSink', 'DocumentDbCollectionSink': 'DocumentDbCollectionSink', 'FileSystemSink': 'FileSystemSink', 'BlobSink': 'BlobSink', 'BinarySink': 'BinarySink', 'ParquetSink': 'ParquetSink', 'AvroSink': 'AvroSink', 'AzureTableSink': 'AzureTableSink', 'AzureQueueSink': 'AzureQueueSink', 'SapCloudForCustomerSink': 'SapCloudForCustomerSink', 'AzureMySqlSink': 'AzureMySqlSink', 'AzurePostgreSqlSink': 'AzurePostgreSqlSink', 'OrcSink': 'OrcSink', 'JsonSink': 'JsonSink', 'DelimitedTextSink': 'DelimitedTextSink'} + 'type': {'CosmosDbMongoDbApiSink': 'CosmosDbMongoDbApiSink', 'SalesforceServiceCloudSink': 'SalesforceServiceCloudSink', 'SalesforceSink': 'SalesforceSink', 'AzureDataExplorerSink': 'AzureDataExplorerSink', 'CommonDataServiceForAppsSink': 'CommonDataServiceForAppsSink', 'DynamicsCrmSink': 'DynamicsCrmSink', 'DynamicsSink': 'DynamicsSink', 'MicrosoftAccessSink': 'MicrosoftAccessSink', 'InformixSink': 'InformixSink', 'OdbcSink': 'OdbcSink', 'AzureSearchIndexSink': 'AzureSearchIndexSink', 'AzureBlobFSSink': 'AzureBlobFSSink', 'AzureDataLakeStoreSink': 'AzureDataLakeStoreSink', 'OracleSink': 'OracleSink', 'SnowflakeSink': 'SnowflakeSink', 'SqlDWSink': 'SqlDWSink', 'SqlMISink': 'SqlMISink', 'AzureSqlSink': 'AzureSqlSink', 'SqlServerSink': 'SqlServerSink', 'SqlSink': 'SqlSink', 'CosmosDbSqlApiSink': 'CosmosDbSqlApiSink', 'DocumentDbCollectionSink': 'DocumentDbCollectionSink', 'FileSystemSink': 'FileSystemSink', 'BlobSink': 'BlobSink', 'BinarySink': 'BinarySink', 'ParquetSink': 'ParquetSink', 'AvroSink': 'AvroSink', 'AzureTableSink': 'AzureTableSink', 'AzureQueueSink': 'AzureQueueSink', 'SapCloudForCustomerSink': 'SapCloudForCustomerSink', 'AzureMySqlSink': 'AzureMySqlSink', 'AzurePostgreSqlSink': 'AzurePostgreSqlSink', 'RestSink': 'RestSink', 'OrcSink': 'OrcSink', 'JsonSink': 'JsonSink', 'DelimitedTextSink': 'DelimitedTextSink'} } def __init__(self, **kwargs): @@ -1945,6 +1945,64 @@ def __init__(self, **kwargs): self.type = 'AvroWriteSettings' +class CustomSetupBase(Model): + """The base definition of the custom setup. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: AzPowerShellSetup, ComponentSetup, + EnvironmentVariableSetup, CmdkeySetup + + All required parameters must be populated in order to send to Azure. + + :param type: Required. Constant filled by server. + :type type: str + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + } + + _subtype_map = { + 'type': {'AzPowerShellSetup': 'AzPowerShellSetup', 'ComponentSetup': 'ComponentSetup', 'EnvironmentVariableSetup': 'EnvironmentVariableSetup', 'CmdkeySetup': 'CmdkeySetup'} + } + + def __init__(self, **kwargs): + super(CustomSetupBase, self).__init__(**kwargs) + self.type = None + + +class AzPowerShellSetup(CustomSetupBase): + """The express custom setup of installing Azure PowerShell. + + All required parameters must be populated in order to send to Azure. + + :param type: Required. Constant filled by server. + :type type: str + :param version: Required. The required version of Azure PowerShell to + install. + :type version: str + """ + + _validation = { + 'type': {'required': True}, + 'version': {'required': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'version': {'key': 'typeProperties.version', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(AzPowerShellSetup, self).__init__(**kwargs) + self.version = kwargs.get('version', None) + self.type = 'AzPowerShellSetup' + + class AzureBatchLinkedService(LinkedService): """Azure Batch linked service. @@ -2888,6 +2946,10 @@ class AzureDatabricksLinkedService(LinkedService): :param new_cluster_custom_tags: Additional tags for cluster resources. This property is ignored in instance pool configurations. :type new_cluster_custom_tags: dict[str, object] + :param new_cluster_log_destination: Specify a location to deliver Spark + driver, worker, and event logs. Type: string (or Expression with + resultType string). + :type new_cluster_log_destination: object :param new_cluster_driver_node_type: The driver node type for the new job cluster. This property is ignored in instance pool configurations. Type: string (or Expression with resultType string). @@ -2930,6 +2992,7 @@ class AzureDatabricksLinkedService(LinkedService): 'new_cluster_spark_conf': {'key': 'typeProperties.newClusterSparkConf', 'type': '{object}'}, 'new_cluster_spark_env_vars': {'key': 'typeProperties.newClusterSparkEnvVars', 'type': '{object}'}, 'new_cluster_custom_tags': {'key': 'typeProperties.newClusterCustomTags', 'type': '{object}'}, + 'new_cluster_log_destination': {'key': 'typeProperties.newClusterLogDestination', 'type': 'object'}, 'new_cluster_driver_node_type': {'key': 'typeProperties.newClusterDriverNodeType', 'type': 'object'}, 'new_cluster_init_scripts': {'key': 'typeProperties.newClusterInitScripts', 'type': 'object'}, 'new_cluster_enable_elastic_disk': {'key': 'typeProperties.newClusterEnableElasticDisk', 'type': 'object'}, @@ -2948,6 +3011,7 @@ def __init__(self, **kwargs): self.new_cluster_spark_conf = kwargs.get('new_cluster_spark_conf', None) self.new_cluster_spark_env_vars = kwargs.get('new_cluster_spark_env_vars', None) self.new_cluster_custom_tags = kwargs.get('new_cluster_custom_tags', None) + self.new_cluster_log_destination = kwargs.get('new_cluster_log_destination', None) self.new_cluster_driver_node_type = kwargs.get('new_cluster_driver_node_type', None) self.new_cluster_init_scripts = kwargs.get('new_cluster_init_scripts', None) self.new_cluster_enable_elastic_disk = kwargs.get('new_cluster_enable_elastic_disk', None) @@ -7468,35 +7532,6 @@ def __init__(self, deserialize, response, *args): super(CloudErrorException, self).__init__(deserialize, response, 'CloudError', *args) -class CustomSetupBase(Model): - """The base definition of the custom setup. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: ComponentSetup, EnvironmentVariableSetup, CmdkeySetup - - All required parameters must be populated in order to send to Azure. - - :param type: Required. Constant filled by server. - :type type: str - """ - - _validation = { - 'type': {'required': True}, - } - - _attribute_map = { - 'type': {'key': 'type', 'type': 'str'}, - } - - _subtype_map = { - 'type': {'ComponentSetup': 'ComponentSetup', 'EnvironmentVariableSetup': 'EnvironmentVariableSetup', 'CmdkeySetup': 'CmdkeySetup'} - } - - def __init__(self, **kwargs): - super(CustomSetupBase, self).__init__(**kwargs) - self.type = None - - class CmdkeySetup(CustomSetupBase): """The custom setup of running cmdkey commands. @@ -9958,13 +9993,14 @@ class DataFlowStagingInfo(Model): :param linked_service: Staging linked service reference. :type linked_service: ~azure.mgmt.datafactory.models.LinkedServiceReference - :param folder_path: Folder path for staging blob. - :type folder_path: str + :param folder_path: Folder path for staging blob. Type: string (or + Expression with resultType string) + :type folder_path: object """ _attribute_map = { 'linked_service': {'key': 'linkedService', 'type': 'LinkedServiceReference'}, - 'folder_path': {'key': 'folderPath', 'type': 'str'}, + 'folder_path': {'key': 'folderPath', 'type': 'object'}, } def __init__(self, **kwargs): @@ -24233,23 +24269,23 @@ class QuickBooksLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param endpoint: Required. The endpoint of the QuickBooks server. (i.e. + :param connection_properties: Properties used to connect to QuickBooks. It + is mutually exclusive with any other properties in the linked service. + Type: object. + :type connection_properties: object + :param endpoint: The endpoint of the QuickBooks server. (i.e. quickbooks.api.intuit.com) :type endpoint: object - :param company_id: Required. The company ID of the QuickBooks company to - authorize. + :param company_id: The company ID of the QuickBooks company to authorize. :type company_id: object - :param consumer_key: Required. The consumer key for OAuth 1.0 - authentication. + :param consumer_key: The consumer key for OAuth 1.0 authentication. :type consumer_key: object - :param consumer_secret: Required. The consumer secret for OAuth 1.0 - authentication. + :param consumer_secret: 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. + :param access_token: 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. + :param access_token_secret: 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. @@ -24262,12 +24298,6 @@ class QuickBooksLinkedService(LinkedService): _validation = { '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 = { @@ -24277,6 +24307,7 @@ class QuickBooksLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'company_id': {'key': 'typeProperties.companyId', 'type': 'object'}, 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'object'}, @@ -24289,6 +24320,7 @@ class QuickBooksLinkedService(LinkedService): def __init__(self, **kwargs): super(QuickBooksLinkedService, self).__init__(**kwargs) + self.connection_properties = kwargs.get('connection_properties', None) self.endpoint = kwargs.get('endpoint', None) self.company_id = kwargs.get('company_id', None) self.consumer_key = kwargs.get('consumer_key', None) @@ -25104,6 +25136,90 @@ def __init__(self, **kwargs): self.type = 'RestService' +class RestSink(CopySink): + """A copy activity Rest service Sink. + + 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 write_batch_size: Write batch size. Type: integer (or Expression + with resultType integer), minimum: 0. + :type write_batch_size: object + :param write_batch_timeout: Write batch timeout. Type: string (or + Expression with resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type write_batch_timeout: object + :param sink_retry_count: Sink retry count. Type: integer (or Expression + with resultType integer). + :type sink_retry_count: object + :param sink_retry_wait: Sink retry wait. Type: string (or Expression with + resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type sink_retry_wait: object + :param max_concurrent_connections: The maximum concurrent connection count + for the sink data store. Type: integer (or Expression with resultType + integer). + :type max_concurrent_connections: object + :param type: Required. Constant filled by server. + :type type: str + :param request_method: The HTTP method used to call the RESTful API. The + default is POST. Type: string (or Expression with resultType string). + :type request_method: object + :param additional_headers: The additional HTTP headers in the request to + the RESTful API. Type: string (or Expression with resultType string). + :type additional_headers: object + :param http_request_timeout: The timeout (TimeSpan) to get an HTTP + response. It is the timeout to get a response, not the timeout to read + response data. Default value: 00:01:40. Type: string (or Expression with + resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type http_request_timeout: object + :param request_interval: The time to await before sending next request, in + milliseconds + :type request_interval: object + :param compression_type: Compression Type to Send data in compressed + format with Optimal Compression Level, Default is None. And The Only + Supported option is Gzip. + :type compression_type: object + :param wrap_request_json_in_an_object: Wraps Request Array Json into an + Object before calling the rest endpoint , Default is false. ex: if true + request content sample format is { rows:[]} else the format is [] + :type wrap_request_json_in_an_object: object + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'write_batch_size': {'key': 'writeBatchSize', 'type': 'object'}, + 'write_batch_timeout': {'key': 'writeBatchTimeout', 'type': 'object'}, + 'sink_retry_count': {'key': 'sinkRetryCount', 'type': 'object'}, + 'sink_retry_wait': {'key': 'sinkRetryWait', 'type': 'object'}, + 'max_concurrent_connections': {'key': 'maxConcurrentConnections', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'request_method': {'key': 'requestMethod', 'type': 'object'}, + 'additional_headers': {'key': 'additionalHeaders', 'type': 'object'}, + 'http_request_timeout': {'key': 'httpRequestTimeout', 'type': 'object'}, + 'request_interval': {'key': 'requestInterval', 'type': 'object'}, + 'compression_type': {'key': 'compressionType', 'type': 'object'}, + 'wrap_request_json_in_an_object': {'key': 'wrapRequestJsonInAnObject', 'type': 'object'}, + } + + def __init__(self, **kwargs): + super(RestSink, self).__init__(**kwargs) + self.request_method = kwargs.get('request_method', None) + self.additional_headers = kwargs.get('additional_headers', None) + self.http_request_timeout = kwargs.get('http_request_timeout', None) + self.request_interval = kwargs.get('request_interval', None) + self.compression_type = kwargs.get('compression_type', None) + self.wrap_request_json_in_an_object = kwargs.get('wrap_request_json_in_an_object', None) + self.type = 'RestSink' + + class RestSource(CopySource): """A copy activity Rest service source. @@ -25424,9 +25540,12 @@ class SalesforceMarketingCloudLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param client_id: Required. The client ID associated with the Salesforce - Marketing Cloud application. Type: string (or Expression with resultType - string). + :param connection_properties: Properties used to connect to Salesforce + Marketing Cloud. It is mutually exclusive with any other properties in the + linked service. Type: object. + :type connection_properties: object + :param client_id: The client ID associated with the Salesforce Marketing + Cloud application. Type: string (or Expression with resultType string). :type client_id: object :param client_secret: The client secret associated with the Salesforce Marketing Cloud application. Type: string (or Expression with resultType @@ -25453,7 +25572,6 @@ class SalesforceMarketingCloudLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'client_id': {'required': True}, } _attribute_map = { @@ -25463,6 +25581,7 @@ class SalesforceMarketingCloudLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, @@ -25473,6 +25592,7 @@ class SalesforceMarketingCloudLinkedService(LinkedService): def __init__(self, **kwargs): super(SalesforceMarketingCloudLinkedService, self).__init__(**kwargs) + self.connection_properties = kwargs.get('connection_properties', 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) @@ -26940,17 +27060,16 @@ class SapOpenHubLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param server: Required. Host name of the SAP BW instance where the open - hub destination is located. Type: string (or Expression with resultType + :param server: Host name of the SAP BW instance where the open hub + destination is located. Type: string (or Expression with resultType string). :type server: object - :param system_number: Required. System number of the BW system where the - open hub destination is located. (Usually a two-digit decimal number - represented as a string.) Type: string (or Expression with resultType - string). + :param system_number: System number of the BW system where the open hub + destination is located. (Usually a two-digit decimal number represented as + a string.) Type: string (or Expression with resultType string). :type system_number: object - :param client_id: Required. Client ID of the client on the BW system where - the open hub destination is located. (Usually a three-digit decimal number + :param client_id: Client ID of the client on the BW system where the open + hub destination is located. (Usually a three-digit decimal number represented as a string) Type: string (or Expression with resultType string). :type client_id: object @@ -26958,6 +27077,9 @@ class SapOpenHubLinkedService(LinkedService): is located. The default value is EN. Type: string (or Expression with resultType string). :type language: object + :param system_id: SystemID of the SAP system where the table is located. + Type: string (or Expression with resultType string). + :type system_id: object :param user_name: Username to access the SAP BW server where the open hub destination is located. Type: string (or Expression with resultType string). @@ -26965,6 +27087,15 @@ class SapOpenHubLinkedService(LinkedService): :param password: Password to access the SAP BW server where the open hub destination is located. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param message_server: The hostname of the SAP Message Server. Type: + string (or Expression with resultType string). + :type message_server: object + :param message_server_service: The service name or port number of the + Message Server. Type: string (or Expression with resultType string). + :type message_server_service: object + :param logon_group: The Logon Group for the SAP System. Type: string (or + Expression with resultType string). + :type logon_group: 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). @@ -26973,9 +27104,6 @@ class SapOpenHubLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'server': {'required': True}, - 'system_number': {'required': True}, - 'client_id': {'required': True}, } _attribute_map = { @@ -26989,8 +27117,12 @@ class SapOpenHubLinkedService(LinkedService): 'system_number': {'key': 'typeProperties.systemNumber', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'language': {'key': 'typeProperties.language', 'type': 'object'}, + 'system_id': {'key': 'typeProperties.systemId', 'type': 'object'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'message_server': {'key': 'typeProperties.messageServer', 'type': 'object'}, + 'message_server_service': {'key': 'typeProperties.messageServerService', 'type': 'object'}, + 'logon_group': {'key': 'typeProperties.logonGroup', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } @@ -27000,8 +27132,12 @@ def __init__(self, **kwargs): self.system_number = kwargs.get('system_number', None) self.client_id = kwargs.get('client_id', None) self.language = kwargs.get('language', None) + self.system_id = kwargs.get('system_id', None) self.user_name = kwargs.get('user_name', None) self.password = kwargs.get('password', None) + self.message_server = kwargs.get('message_server', None) + self.message_server_service = kwargs.get('message_server_service', None) + self.logon_group = kwargs.get('logon_group', None) self.encrypted_credential = kwargs.get('encrypted_credential', None) self.type = 'SapOpenHub' @@ -30357,17 +30493,19 @@ class SquareLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param host: Required. The URL of the Square instance. (i.e. - mystore.mysquare.com) + :param connection_properties: Properties used to connect to Square. It is + mutually exclusive with any other properties in the linked service. Type: + object. + :type connection_properties: object + :param host: The URL of the Square instance. (i.e. mystore.mysquare.com) :type host: object - :param client_id: Required. The client ID associated with your Square - application. + :param client_id: The client ID associated with your Square application. :type client_id: object :param client_secret: The client secret associated with your Square application. :type client_secret: ~azure.mgmt.datafactory.models.SecretBase - :param redirect_uri: Required. The redirect URL assigned in the Square - application dashboard. (i.e. http://localhost:2500) + :param redirect_uri: The redirect URL assigned in the Square application + dashboard. (i.e. http://localhost:2500) :type redirect_uri: object :param use_encrypted_endpoints: Specifies whether the data source endpoints are encrypted using HTTPS. The default value is true. @@ -30387,9 +30525,6 @@ class SquareLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'host': {'required': True}, - 'client_id': {'required': True}, - 'redirect_uri': {'required': True}, } _attribute_map = { @@ -30399,6 +30534,7 @@ class SquareLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, @@ -30411,6 +30547,7 @@ class SquareLinkedService(LinkedService): def __init__(self, **kwargs): super(SquareLinkedService, self).__init__(**kwargs) + self.connection_properties = kwargs.get('connection_properties', None) self.host = kwargs.get('host', None) self.client_id = kwargs.get('client_id', None) self.client_secret = kwargs.get('client_secret', None) @@ -33336,8 +33473,11 @@ class XeroLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param host: Required. The endpoint of the Xero server. (i.e. - api.xero.com) + :param connection_properties: Properties used to connect to Xero. It is + mutually exclusive with any other properties in the linked service. Type: + object. + :type connection_properties: object + :param host: The endpoint of the Xero server. (i.e. api.xero.com) :type host: object :param consumer_key: The consumer key associated with the Xero application. @@ -33365,7 +33505,6 @@ class XeroLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'host': {'required': True}, } _attribute_map = { @@ -33375,6 +33514,7 @@ class XeroLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'SecretBase'}, 'private_key': {'key': 'typeProperties.privateKey', 'type': 'SecretBase'}, @@ -33386,6 +33526,7 @@ class XeroLinkedService(LinkedService): def __init__(self, **kwargs): super(XeroLinkedService, self).__init__(**kwargs) + self.connection_properties = kwargs.get('connection_properties', None) self.host = kwargs.get('host', None) self.consumer_key = kwargs.get('consumer_key', None) self.private_key = kwargs.get('private_key', None) @@ -33743,7 +33884,11 @@ class ZohoLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param endpoint: Required. The endpoint of the Zoho server. (i.e. + :param connection_properties: Properties used to connect to Zoho. It is + mutually exclusive with any other properties in the linked service. Type: + object. + :type connection_properties: object + :param endpoint: The endpoint of the Zoho server. (i.e. crm.zoho.com/crm/private) :type endpoint: object :param access_token: The access token for Zoho authentication. @@ -33766,7 +33911,6 @@ class ZohoLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'endpoint': {'required': True}, } _attribute_map = { @@ -33776,6 +33920,7 @@ class ZohoLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, @@ -33786,6 +33931,7 @@ class ZohoLinkedService(LinkedService): def __init__(self, **kwargs): super(ZohoLinkedService, self).__init__(**kwargs) + self.connection_properties = kwargs.get('connection_properties', None) self.endpoint = kwargs.get('endpoint', None) self.access_token = kwargs.get('access_token', None) self.use_encrypted_endpoints = kwargs.get('use_encrypted_endpoints', None) diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py index c17d845f6e7e..fc71393090f1 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py @@ -1708,8 +1708,8 @@ class CopySink(Model): SnowflakeSink, SqlDWSink, SqlMISink, AzureSqlSink, SqlServerSink, SqlSink, CosmosDbSqlApiSink, DocumentDbCollectionSink, FileSystemSink, BlobSink, BinarySink, ParquetSink, AvroSink, AzureTableSink, AzureQueueSink, - SapCloudForCustomerSink, AzureMySqlSink, AzurePostgreSqlSink, OrcSink, - JsonSink, DelimitedTextSink + SapCloudForCustomerSink, AzureMySqlSink, AzurePostgreSqlSink, RestSink, + OrcSink, JsonSink, DelimitedTextSink All required parameters must be populated in order to send to Azure. @@ -1753,7 +1753,7 @@ class CopySink(Model): } _subtype_map = { - 'type': {'CosmosDbMongoDbApiSink': 'CosmosDbMongoDbApiSink', 'SalesforceServiceCloudSink': 'SalesforceServiceCloudSink', 'SalesforceSink': 'SalesforceSink', 'AzureDataExplorerSink': 'AzureDataExplorerSink', 'CommonDataServiceForAppsSink': 'CommonDataServiceForAppsSink', 'DynamicsCrmSink': 'DynamicsCrmSink', 'DynamicsSink': 'DynamicsSink', 'MicrosoftAccessSink': 'MicrosoftAccessSink', 'InformixSink': 'InformixSink', 'OdbcSink': 'OdbcSink', 'AzureSearchIndexSink': 'AzureSearchIndexSink', 'AzureBlobFSSink': 'AzureBlobFSSink', 'AzureDataLakeStoreSink': 'AzureDataLakeStoreSink', 'OracleSink': 'OracleSink', 'SnowflakeSink': 'SnowflakeSink', 'SqlDWSink': 'SqlDWSink', 'SqlMISink': 'SqlMISink', 'AzureSqlSink': 'AzureSqlSink', 'SqlServerSink': 'SqlServerSink', 'SqlSink': 'SqlSink', 'CosmosDbSqlApiSink': 'CosmosDbSqlApiSink', 'DocumentDbCollectionSink': 'DocumentDbCollectionSink', 'FileSystemSink': 'FileSystemSink', 'BlobSink': 'BlobSink', 'BinarySink': 'BinarySink', 'ParquetSink': 'ParquetSink', 'AvroSink': 'AvroSink', 'AzureTableSink': 'AzureTableSink', 'AzureQueueSink': 'AzureQueueSink', 'SapCloudForCustomerSink': 'SapCloudForCustomerSink', 'AzureMySqlSink': 'AzureMySqlSink', 'AzurePostgreSqlSink': 'AzurePostgreSqlSink', 'OrcSink': 'OrcSink', 'JsonSink': 'JsonSink', 'DelimitedTextSink': 'DelimitedTextSink'} + 'type': {'CosmosDbMongoDbApiSink': 'CosmosDbMongoDbApiSink', 'SalesforceServiceCloudSink': 'SalesforceServiceCloudSink', 'SalesforceSink': 'SalesforceSink', 'AzureDataExplorerSink': 'AzureDataExplorerSink', 'CommonDataServiceForAppsSink': 'CommonDataServiceForAppsSink', 'DynamicsCrmSink': 'DynamicsCrmSink', 'DynamicsSink': 'DynamicsSink', 'MicrosoftAccessSink': 'MicrosoftAccessSink', 'InformixSink': 'InformixSink', 'OdbcSink': 'OdbcSink', 'AzureSearchIndexSink': 'AzureSearchIndexSink', 'AzureBlobFSSink': 'AzureBlobFSSink', 'AzureDataLakeStoreSink': 'AzureDataLakeStoreSink', 'OracleSink': 'OracleSink', 'SnowflakeSink': 'SnowflakeSink', 'SqlDWSink': 'SqlDWSink', 'SqlMISink': 'SqlMISink', 'AzureSqlSink': 'AzureSqlSink', 'SqlServerSink': 'SqlServerSink', 'SqlSink': 'SqlSink', 'CosmosDbSqlApiSink': 'CosmosDbSqlApiSink', 'DocumentDbCollectionSink': 'DocumentDbCollectionSink', 'FileSystemSink': 'FileSystemSink', 'BlobSink': 'BlobSink', 'BinarySink': 'BinarySink', 'ParquetSink': 'ParquetSink', 'AvroSink': 'AvroSink', 'AzureTableSink': 'AzureTableSink', 'AzureQueueSink': 'AzureQueueSink', 'SapCloudForCustomerSink': 'SapCloudForCustomerSink', 'AzureMySqlSink': 'AzureMySqlSink', 'AzurePostgreSqlSink': 'AzurePostgreSqlSink', 'RestSink': 'RestSink', 'OrcSink': 'OrcSink', 'JsonSink': 'JsonSink', 'DelimitedTextSink': 'DelimitedTextSink'} } def __init__(self, *, additional_properties=None, write_batch_size=None, write_batch_timeout=None, sink_retry_count=None, sink_retry_wait=None, max_concurrent_connections=None, **kwargs) -> None: @@ -1945,6 +1945,64 @@ def __init__(self, *, additional_properties=None, record_name: str=None, record_ self.type = 'AvroWriteSettings' +class CustomSetupBase(Model): + """The base definition of the custom setup. + + You probably want to use the sub-classes and not this class directly. Known + sub-classes are: AzPowerShellSetup, ComponentSetup, + EnvironmentVariableSetup, CmdkeySetup + + All required parameters must be populated in order to send to Azure. + + :param type: Required. Constant filled by server. + :type type: str + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + } + + _subtype_map = { + 'type': {'AzPowerShellSetup': 'AzPowerShellSetup', 'ComponentSetup': 'ComponentSetup', 'EnvironmentVariableSetup': 'EnvironmentVariableSetup', 'CmdkeySetup': 'CmdkeySetup'} + } + + def __init__(self, **kwargs) -> None: + super(CustomSetupBase, self).__init__(**kwargs) + self.type = None + + +class AzPowerShellSetup(CustomSetupBase): + """The express custom setup of installing Azure PowerShell. + + All required parameters must be populated in order to send to Azure. + + :param type: Required. Constant filled by server. + :type type: str + :param version: Required. The required version of Azure PowerShell to + install. + :type version: str + """ + + _validation = { + 'type': {'required': True}, + 'version': {'required': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'version': {'key': 'typeProperties.version', 'type': 'str'}, + } + + def __init__(self, *, version: str, **kwargs) -> None: + super(AzPowerShellSetup, self).__init__(**kwargs) + self.version = version + self.type = 'AzPowerShellSetup' + + class AzureBatchLinkedService(LinkedService): """Azure Batch linked service. @@ -2888,6 +2946,10 @@ class AzureDatabricksLinkedService(LinkedService): :param new_cluster_custom_tags: Additional tags for cluster resources. This property is ignored in instance pool configurations. :type new_cluster_custom_tags: dict[str, object] + :param new_cluster_log_destination: Specify a location to deliver Spark + driver, worker, and event logs. Type: string (or Expression with + resultType string). + :type new_cluster_log_destination: object :param new_cluster_driver_node_type: The driver node type for the new job cluster. This property is ignored in instance pool configurations. Type: string (or Expression with resultType string). @@ -2930,13 +2992,14 @@ class AzureDatabricksLinkedService(LinkedService): 'new_cluster_spark_conf': {'key': 'typeProperties.newClusterSparkConf', 'type': '{object}'}, 'new_cluster_spark_env_vars': {'key': 'typeProperties.newClusterSparkEnvVars', 'type': '{object}'}, 'new_cluster_custom_tags': {'key': 'typeProperties.newClusterCustomTags', 'type': '{object}'}, + 'new_cluster_log_destination': {'key': 'typeProperties.newClusterLogDestination', 'type': 'object'}, 'new_cluster_driver_node_type': {'key': 'typeProperties.newClusterDriverNodeType', 'type': 'object'}, 'new_cluster_init_scripts': {'key': 'typeProperties.newClusterInitScripts', 'type': 'object'}, 'new_cluster_enable_elastic_disk': {'key': 'typeProperties.newClusterEnableElasticDisk', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, domain, access_token, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, existing_cluster_id=None, instance_pool_id=None, new_cluster_version=None, new_cluster_num_of_worker=None, new_cluster_node_type=None, new_cluster_spark_conf=None, new_cluster_spark_env_vars=None, new_cluster_custom_tags=None, new_cluster_driver_node_type=None, new_cluster_init_scripts=None, new_cluster_enable_elastic_disk=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, domain, access_token, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, existing_cluster_id=None, instance_pool_id=None, new_cluster_version=None, new_cluster_num_of_worker=None, new_cluster_node_type=None, new_cluster_spark_conf=None, new_cluster_spark_env_vars=None, new_cluster_custom_tags=None, new_cluster_log_destination=None, new_cluster_driver_node_type=None, new_cluster_init_scripts=None, new_cluster_enable_elastic_disk=None, encrypted_credential=None, **kwargs) -> None: super(AzureDatabricksLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.domain = domain self.access_token = access_token @@ -2948,6 +3011,7 @@ def __init__(self, *, domain, access_token, additional_properties=None, connect_ self.new_cluster_spark_conf = new_cluster_spark_conf self.new_cluster_spark_env_vars = new_cluster_spark_env_vars self.new_cluster_custom_tags = new_cluster_custom_tags + self.new_cluster_log_destination = new_cluster_log_destination self.new_cluster_driver_node_type = new_cluster_driver_node_type self.new_cluster_init_scripts = new_cluster_init_scripts self.new_cluster_enable_elastic_disk = new_cluster_enable_elastic_disk @@ -7468,35 +7532,6 @@ def __init__(self, deserialize, response, *args): super(CloudErrorException, self).__init__(deserialize, response, 'CloudError', *args) -class CustomSetupBase(Model): - """The base definition of the custom setup. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: ComponentSetup, EnvironmentVariableSetup, CmdkeySetup - - All required parameters must be populated in order to send to Azure. - - :param type: Required. Constant filled by server. - :type type: str - """ - - _validation = { - 'type': {'required': True}, - } - - _attribute_map = { - 'type': {'key': 'type', 'type': 'str'}, - } - - _subtype_map = { - 'type': {'ComponentSetup': 'ComponentSetup', 'EnvironmentVariableSetup': 'EnvironmentVariableSetup', 'CmdkeySetup': 'CmdkeySetup'} - } - - def __init__(self, **kwargs) -> None: - super(CustomSetupBase, self).__init__(**kwargs) - self.type = None - - class CmdkeySetup(CustomSetupBase): """The custom setup of running cmdkey commands. @@ -9958,16 +9993,17 @@ class DataFlowStagingInfo(Model): :param linked_service: Staging linked service reference. :type linked_service: ~azure.mgmt.datafactory.models.LinkedServiceReference - :param folder_path: Folder path for staging blob. - :type folder_path: str + :param folder_path: Folder path for staging blob. Type: string (or + Expression with resultType string) + :type folder_path: object """ _attribute_map = { 'linked_service': {'key': 'linkedService', 'type': 'LinkedServiceReference'}, - 'folder_path': {'key': 'folderPath', 'type': 'str'}, + 'folder_path': {'key': 'folderPath', 'type': 'object'}, } - def __init__(self, *, linked_service=None, folder_path: str=None, **kwargs) -> None: + def __init__(self, *, linked_service=None, folder_path=None, **kwargs) -> None: super(DataFlowStagingInfo, self).__init__(**kwargs) self.linked_service = linked_service self.folder_path = folder_path @@ -24233,23 +24269,23 @@ class QuickBooksLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param endpoint: Required. The endpoint of the QuickBooks server. (i.e. + :param connection_properties: Properties used to connect to QuickBooks. It + is mutually exclusive with any other properties in the linked service. + Type: object. + :type connection_properties: object + :param endpoint: The endpoint of the QuickBooks server. (i.e. quickbooks.api.intuit.com) :type endpoint: object - :param company_id: Required. The company ID of the QuickBooks company to - authorize. + :param company_id: The company ID of the QuickBooks company to authorize. :type company_id: object - :param consumer_key: Required. The consumer key for OAuth 1.0 - authentication. + :param consumer_key: The consumer key for OAuth 1.0 authentication. :type consumer_key: object - :param consumer_secret: Required. The consumer secret for OAuth 1.0 - authentication. + :param consumer_secret: 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. + :param access_token: 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. + :param access_token_secret: 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. @@ -24262,12 +24298,6 @@ class QuickBooksLinkedService(LinkedService): _validation = { '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 = { @@ -24277,6 +24307,7 @@ class QuickBooksLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'company_id': {'key': 'typeProperties.companyId', 'type': 'object'}, 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'object'}, @@ -24287,8 +24318,9 @@ class QuickBooksLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - 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: + def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_properties=None, endpoint=None, company_id=None, consumer_key=None, consumer_secret=None, access_token=None, access_token_secret=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.connection_properties = connection_properties self.endpoint = endpoint self.company_id = company_id self.consumer_key = consumer_key @@ -25104,6 +25136,90 @@ def __init__(self, *, url, authentication_type, additional_properties=None, conn self.type = 'RestService' +class RestSink(CopySink): + """A copy activity Rest service Sink. + + 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 write_batch_size: Write batch size. Type: integer (or Expression + with resultType integer), minimum: 0. + :type write_batch_size: object + :param write_batch_timeout: Write batch timeout. Type: string (or + Expression with resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type write_batch_timeout: object + :param sink_retry_count: Sink retry count. Type: integer (or Expression + with resultType integer). + :type sink_retry_count: object + :param sink_retry_wait: Sink retry wait. Type: string (or Expression with + resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type sink_retry_wait: object + :param max_concurrent_connections: The maximum concurrent connection count + for the sink data store. Type: integer (or Expression with resultType + integer). + :type max_concurrent_connections: object + :param type: Required. Constant filled by server. + :type type: str + :param request_method: The HTTP method used to call the RESTful API. The + default is POST. Type: string (or Expression with resultType string). + :type request_method: object + :param additional_headers: The additional HTTP headers in the request to + the RESTful API. Type: string (or Expression with resultType string). + :type additional_headers: object + :param http_request_timeout: The timeout (TimeSpan) to get an HTTP + response. It is the timeout to get a response, not the timeout to read + response data. Default value: 00:01:40. Type: string (or Expression with + resultType string), pattern: + ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9])). + :type http_request_timeout: object + :param request_interval: The time to await before sending next request, in + milliseconds + :type request_interval: object + :param compression_type: Compression Type to Send data in compressed + format with Optimal Compression Level, Default is None. And The Only + Supported option is Gzip. + :type compression_type: object + :param wrap_request_json_in_an_object: Wraps Request Array Json into an + Object before calling the rest endpoint , Default is false. ex: if true + request content sample format is { rows:[]} else the format is [] + :type wrap_request_json_in_an_object: object + """ + + _validation = { + 'type': {'required': True}, + } + + _attribute_map = { + 'additional_properties': {'key': '', 'type': '{object}'}, + 'write_batch_size': {'key': 'writeBatchSize', 'type': 'object'}, + 'write_batch_timeout': {'key': 'writeBatchTimeout', 'type': 'object'}, + 'sink_retry_count': {'key': 'sinkRetryCount', 'type': 'object'}, + 'sink_retry_wait': {'key': 'sinkRetryWait', 'type': 'object'}, + 'max_concurrent_connections': {'key': 'maxConcurrentConnections', 'type': 'object'}, + 'type': {'key': 'type', 'type': 'str'}, + 'request_method': {'key': 'requestMethod', 'type': 'object'}, + 'additional_headers': {'key': 'additionalHeaders', 'type': 'object'}, + 'http_request_timeout': {'key': 'httpRequestTimeout', 'type': 'object'}, + 'request_interval': {'key': 'requestInterval', 'type': 'object'}, + 'compression_type': {'key': 'compressionType', 'type': 'object'}, + 'wrap_request_json_in_an_object': {'key': 'wrapRequestJsonInAnObject', 'type': 'object'}, + } + + def __init__(self, *, additional_properties=None, write_batch_size=None, write_batch_timeout=None, sink_retry_count=None, sink_retry_wait=None, max_concurrent_connections=None, request_method=None, additional_headers=None, http_request_timeout=None, request_interval=None, compression_type=None, wrap_request_json_in_an_object=None, **kwargs) -> None: + super(RestSink, self).__init__(additional_properties=additional_properties, write_batch_size=write_batch_size, write_batch_timeout=write_batch_timeout, sink_retry_count=sink_retry_count, sink_retry_wait=sink_retry_wait, max_concurrent_connections=max_concurrent_connections, **kwargs) + self.request_method = request_method + self.additional_headers = additional_headers + self.http_request_timeout = http_request_timeout + self.request_interval = request_interval + self.compression_type = compression_type + self.wrap_request_json_in_an_object = wrap_request_json_in_an_object + self.type = 'RestSink' + + class RestSource(CopySource): """A copy activity Rest service source. @@ -25424,9 +25540,12 @@ class SalesforceMarketingCloudLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param client_id: Required. The client ID associated with the Salesforce - Marketing Cloud application. Type: string (or Expression with resultType - string). + :param connection_properties: Properties used to connect to Salesforce + Marketing Cloud. It is mutually exclusive with any other properties in the + linked service. Type: object. + :type connection_properties: object + :param client_id: The client ID associated with the Salesforce Marketing + Cloud application. Type: string (or Expression with resultType string). :type client_id: object :param client_secret: The client secret associated with the Salesforce Marketing Cloud application. Type: string (or Expression with resultType @@ -25453,7 +25572,6 @@ class SalesforceMarketingCloudLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'client_id': {'required': True}, } _attribute_map = { @@ -25463,6 +25581,7 @@ class SalesforceMarketingCloudLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, @@ -25471,8 +25590,9 @@ class SalesforceMarketingCloudLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, 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: + def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_properties=None, client_id=None, client_secret=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: super(SalesforceMarketingCloudLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) + self.connection_properties = connection_properties self.client_id = client_id self.client_secret = client_secret self.use_encrypted_endpoints = use_encrypted_endpoints @@ -26940,17 +27060,16 @@ class SapOpenHubLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param server: Required. Host name of the SAP BW instance where the open - hub destination is located. Type: string (or Expression with resultType + :param server: Host name of the SAP BW instance where the open hub + destination is located. Type: string (or Expression with resultType string). :type server: object - :param system_number: Required. System number of the BW system where the - open hub destination is located. (Usually a two-digit decimal number - represented as a string.) Type: string (or Expression with resultType - string). + :param system_number: System number of the BW system where the open hub + destination is located. (Usually a two-digit decimal number represented as + a string.) Type: string (or Expression with resultType string). :type system_number: object - :param client_id: Required. Client ID of the client on the BW system where - the open hub destination is located. (Usually a three-digit decimal number + :param client_id: Client ID of the client on the BW system where the open + hub destination is located. (Usually a three-digit decimal number represented as a string) Type: string (or Expression with resultType string). :type client_id: object @@ -26958,6 +27077,9 @@ class SapOpenHubLinkedService(LinkedService): is located. The default value is EN. Type: string (or Expression with resultType string). :type language: object + :param system_id: SystemID of the SAP system where the table is located. + Type: string (or Expression with resultType string). + :type system_id: object :param user_name: Username to access the SAP BW server where the open hub destination is located. Type: string (or Expression with resultType string). @@ -26965,6 +27087,15 @@ class SapOpenHubLinkedService(LinkedService): :param password: Password to access the SAP BW server where the open hub destination is located. :type password: ~azure.mgmt.datafactory.models.SecretBase + :param message_server: The hostname of the SAP Message Server. Type: + string (or Expression with resultType string). + :type message_server: object + :param message_server_service: The service name or port number of the + Message Server. Type: string (or Expression with resultType string). + :type message_server_service: object + :param logon_group: The Logon Group for the SAP System. Type: string (or + Expression with resultType string). + :type logon_group: 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). @@ -26973,9 +27104,6 @@ class SapOpenHubLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'server': {'required': True}, - 'system_number': {'required': True}, - 'client_id': {'required': True}, } _attribute_map = { @@ -26989,19 +27117,27 @@ class SapOpenHubLinkedService(LinkedService): 'system_number': {'key': 'typeProperties.systemNumber', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'language': {'key': 'typeProperties.language', 'type': 'object'}, + 'system_id': {'key': 'typeProperties.systemId', 'type': 'object'}, 'user_name': {'key': 'typeProperties.userName', 'type': 'object'}, 'password': {'key': 'typeProperties.password', 'type': 'SecretBase'}, + 'message_server': {'key': 'typeProperties.messageServer', 'type': 'object'}, + 'message_server_service': {'key': 'typeProperties.messageServerService', 'type': 'object'}, + 'logon_group': {'key': 'typeProperties.logonGroup', 'type': 'object'}, 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, server, system_number, client_id, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, language=None, user_name=None, password=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, server=None, system_number=None, client_id=None, language=None, system_id=None, user_name=None, password=None, message_server=None, message_server_service=None, logon_group=None, encrypted_credential=None, **kwargs) -> None: super(SapOpenHubLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) self.server = server self.system_number = system_number self.client_id = client_id self.language = language + self.system_id = system_id self.user_name = user_name self.password = password + self.message_server = message_server + self.message_server_service = message_server_service + self.logon_group = logon_group self.encrypted_credential = encrypted_credential self.type = 'SapOpenHub' @@ -30357,17 +30493,19 @@ class SquareLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param host: Required. The URL of the Square instance. (i.e. - mystore.mysquare.com) + :param connection_properties: Properties used to connect to Square. It is + mutually exclusive with any other properties in the linked service. Type: + object. + :type connection_properties: object + :param host: The URL of the Square instance. (i.e. mystore.mysquare.com) :type host: object - :param client_id: Required. The client ID associated with your Square - application. + :param client_id: The client ID associated with your Square application. :type client_id: object :param client_secret: The client secret associated with your Square application. :type client_secret: ~azure.mgmt.datafactory.models.SecretBase - :param redirect_uri: Required. The redirect URL assigned in the Square - application dashboard. (i.e. http://localhost:2500) + :param redirect_uri: The redirect URL assigned in the Square application + dashboard. (i.e. http://localhost:2500) :type redirect_uri: object :param use_encrypted_endpoints: Specifies whether the data source endpoints are encrypted using HTTPS. The default value is true. @@ -30387,9 +30525,6 @@ class SquareLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'host': {'required': True}, - 'client_id': {'required': True}, - 'redirect_uri': {'required': True}, } _attribute_map = { @@ -30399,6 +30534,7 @@ class SquareLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'client_id': {'key': 'typeProperties.clientId', 'type': 'object'}, 'client_secret': {'key': 'typeProperties.clientSecret', 'type': 'SecretBase'}, @@ -30409,8 +30545,9 @@ class SquareLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, host, client_id, redirect_uri, 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: + def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_properties=None, host=None, client_id=None, client_secret=None, redirect_uri=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: super(SquareLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) + self.connection_properties = connection_properties self.host = host self.client_id = client_id self.client_secret = client_secret @@ -33336,8 +33473,11 @@ class XeroLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param host: Required. The endpoint of the Xero server. (i.e. - api.xero.com) + :param connection_properties: Properties used to connect to Xero. It is + mutually exclusive with any other properties in the linked service. Type: + object. + :type connection_properties: object + :param host: The endpoint of the Xero server. (i.e. api.xero.com) :type host: object :param consumer_key: The consumer key associated with the Xero application. @@ -33365,7 +33505,6 @@ class XeroLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'host': {'required': True}, } _attribute_map = { @@ -33375,6 +33514,7 @@ class XeroLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'host': {'key': 'typeProperties.host', 'type': 'object'}, 'consumer_key': {'key': 'typeProperties.consumerKey', 'type': 'SecretBase'}, 'private_key': {'key': 'typeProperties.privateKey', 'type': 'SecretBase'}, @@ -33384,8 +33524,9 @@ class XeroLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, host, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, consumer_key=None, private_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_properties=None, host=None, consumer_key=None, private_key=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: super(XeroLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) + self.connection_properties = connection_properties self.host = host self.consumer_key = consumer_key self.private_key = private_key @@ -33743,7 +33884,11 @@ class ZohoLinkedService(LinkedService): :type annotations: list[object] :param type: Required. Constant filled by server. :type type: str - :param endpoint: Required. The endpoint of the Zoho server. (i.e. + :param connection_properties: Properties used to connect to Zoho. It is + mutually exclusive with any other properties in the linked service. Type: + object. + :type connection_properties: object + :param endpoint: The endpoint of the Zoho server. (i.e. crm.zoho.com/crm/private) :type endpoint: object :param access_token: The access token for Zoho authentication. @@ -33766,7 +33911,6 @@ class ZohoLinkedService(LinkedService): _validation = { 'type': {'required': True}, - 'endpoint': {'required': True}, } _attribute_map = { @@ -33776,6 +33920,7 @@ class ZohoLinkedService(LinkedService): 'parameters': {'key': 'parameters', 'type': '{ParameterSpecification}'}, 'annotations': {'key': 'annotations', 'type': '[object]'}, 'type': {'key': 'type', 'type': 'str'}, + 'connection_properties': {'key': 'typeProperties.connectionProperties', 'type': 'object'}, 'endpoint': {'key': 'typeProperties.endpoint', 'type': 'object'}, 'access_token': {'key': 'typeProperties.accessToken', 'type': 'SecretBase'}, 'use_encrypted_endpoints': {'key': 'typeProperties.useEncryptedEndpoints', 'type': 'object'}, @@ -33784,8 +33929,9 @@ class ZohoLinkedService(LinkedService): 'encrypted_credential': {'key': 'typeProperties.encryptedCredential', 'type': 'object'}, } - def __init__(self, *, endpoint, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, connect_via=None, description: str=None, parameters=None, annotations=None, connection_properties=None, endpoint=None, access_token=None, use_encrypted_endpoints=None, use_host_verification=None, use_peer_verification=None, encrypted_credential=None, **kwargs) -> None: super(ZohoLinkedService, self).__init__(additional_properties=additional_properties, connect_via=connect_via, description=description, parameters=parameters, annotations=annotations, **kwargs) + self.connection_properties = connection_properties self.endpoint = endpoint self.access_token = access_token self.use_encrypted_endpoints = use_encrypted_endpoints From 8fb3aa64de7288a7486071b4872ee3e2114d78fe Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Mon, 27 Jul 2020 17:52:20 +0000 Subject: [PATCH 2/2] Generated from 1e3ee87586e181de5cf81141896a89fe8f7120f0 lint --- .../azure/mgmt/datafactory/models/_models.py | 6 +- .../mgmt/datafactory/models/_models_py3.py | 6 +- .../operations/_trigger_runs_operations.py | 59 +++++++++++++++++++ 3 files changed, 65 insertions(+), 6 deletions(-) diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py index 4b1362ef9f2b..446b77cfe7d9 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models.py @@ -33248,9 +33248,9 @@ class WebHookActivity(ControlActivity): endpoint. :type authentication: ~azure.mgmt.datafactory.models.WebActivityAuthentication - :param report_status_on_call_back: When set to true, statusCode, output - and error in callback request body will be consumed by activity. The - activity can be marked as failed by setting statusCode >= 400 in callback + :param report_status_on_call_back: When set to true, statusCode, output + and error in callback request body will be consumed by activity. The + activity can be marked as failed by setting statusCode >= 400 in callback request. Default is false. Type: boolean (or Expression with resultType boolean). :type report_status_on_call_back: object diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py index fc71393090f1..f9dd384f75f1 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_models_py3.py @@ -33248,9 +33248,9 @@ class WebHookActivity(ControlActivity): endpoint. :type authentication: ~azure.mgmt.datafactory.models.WebActivityAuthentication - :param report_status_on_call_back: When set to true, statusCode, output - and error in callback request body will be consumed by activity. The - activity can be marked as failed by setting statusCode >= 400 in callback + :param report_status_on_call_back: When set to true, statusCode, output + and error in callback request body will be consumed by activity. The + activity can be marked as failed by setting statusCode >= 400 in callback request. Default is false. Type: boolean (or Expression with resultType boolean). :type report_status_on_call_back: object diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/_trigger_runs_operations.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/_trigger_runs_operations.py index 6cbf968008a1..ee5a66f30a67 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/_trigger_runs_operations.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/_trigger_runs_operations.py @@ -98,6 +98,65 @@ def rerun( return client_raw_response rerun.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerRuns/{runId}/rerun'} + def cancel( + self, resource_group_name, factory_name, trigger_name, run_id, custom_headers=None, raw=False, **operation_config): + """Cancel a single trigger instance by runId. + + :param resource_group_name: The resource group name. + :type resource_group_name: str + :param factory_name: The factory name. + :type factory_name: str + :param trigger_name: The trigger name. + :type trigger_name: str + :param run_id: The pipeline run identifier. + :type run_id: str + :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: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.cancel.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'), + 'factoryName': self._serialize.url("factory_name", factory_name, 'str', max_length=63, min_length=3, pattern=r'^[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*$'), + 'triggerName': self._serialize.url("trigger_name", trigger_name, 'str', max_length=260, min_length=1, pattern=r'^[A-Za-z0-9_][^<>*#.%&:\\+?/]*$'), + 'runId': self._serialize.url("run_id", run_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 = {} + 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 and send request + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/triggerRuns/{runId}/cancel'} + def query_by_factory( self, resource_group_name, factory_name, filter_parameters, custom_headers=None, raw=False, **operation_config): """Query trigger runs.