diff --git a/sdk/datafactory/azure-mgmt-datafactory/_meta.json b/sdk/datafactory/azure-mgmt-datafactory/_meta.json index bf776bd01373..84937b275de5 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/_meta.json +++ b/sdk/datafactory/azure-mgmt-datafactory/_meta.json @@ -1,11 +1,11 @@ { - "commit": "f06cffbda682a8cd225a8b16bc6f000d26d01612", + "commit": "5c2947d902b979ad475a2d05a6d9ebff32287bb4", "repository_url": "https://github.com/Azure/azure-rest-api-specs", "autorest": "3.10.2", "use": [ - "@autorest/python@6.26.4", + "@autorest/python@6.27.4", "@autorest/modelerfour@4.27.0" ], - "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.26.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", + "autorest_command": "autorest specification/datafactory/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.27.4 --use=@autorest/modelerfour@4.27.0 --version=3.10.2 --version-tolerant=False", "readme": "specification/datafactory/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_serialization.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_serialization.py index ce17d1798ce7..b24ab2885450 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_serialization.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_serialization.py @@ -310,7 +310,7 @@ def _create_xml_node(tag, prefix=None, ns=None): return ET.Element(tag) -class Model(object): +class Model: """Mixin for all client request body/response body models to support serialization and deserialization. """ @@ -563,7 +563,7 @@ def _decode_attribute_map_key(key): return key.replace("\\.", ".") -class Serializer(object): # pylint: disable=too-many-public-methods +class Serializer: # pylint: disable=too-many-public-methods """Request object model serializer.""" basic_types = {str: "str", int: "int", bool: "bool", float: "float"} @@ -1441,7 +1441,7 @@ def xml_key_extractor(attr, attr_desc, data): # pylint: disable=unused-argument return children[0] -class Deserializer(object): +class Deserializer: """Response object model deserializer. :param dict classes: Class type dictionary for deserializing complex types. @@ -1683,17 +1683,21 @@ def _instantiate_model(self, response, attrs, additional_properties=None): subtype = getattr(response, "_subtype_map", {}) try: readonly = [ - k for k, v in response._validation.items() if v.get("readonly") # pylint: disable=protected-access + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("readonly") ] const = [ - k for k, v in response._validation.items() if v.get("constant") # pylint: disable=protected-access + k + for k, v in response._validation.items() # pylint: disable=protected-access # type: ignore + if v.get("constant") ] kwargs = {k: v for k, v in attrs.items() if k not in subtype and k not in readonly + const} response_obj = response(**kwargs) for attr in readonly: setattr(response_obj, attr, attrs.get(attr)) if additional_properties: - response_obj.additional_properties = additional_properties + response_obj.additional_properties = additional_properties # type: ignore return response_obj except TypeError as err: msg = "Unable to deserialize {} into model {}. ".format(kwargs, response) # type: ignore diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py index f89ed38360ab..c47f66669f1b 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "9.1.0" +VERSION = "1.0.0" 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 ee44f781e28c..500fd677a88f 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 @@ -847,6 +847,7 @@ GoogleAdWordsAuthenticationType, GoogleBigQueryAuthenticationType, GoogleBigQueryV2AuthenticationType, + GreenplumAuthenticationType, HBaseAuthenticationType, HDInsightActivityDebugInfoOption, HdiNodeTypes, @@ -1771,6 +1772,7 @@ "GoogleAdWordsAuthenticationType", "GoogleBigQueryAuthenticationType", "GoogleBigQueryV2AuthenticationType", + "GreenplumAuthenticationType", "HBaseAuthenticationType", "HDInsightActivityDebugInfoOption", "HdiNodeTypes", diff --git a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py index ac24170e4c2a..350df8151bb3 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py +++ b/sdk/datafactory/azure-mgmt-datafactory/azure/mgmt/datafactory/models/_data_factory_management_client_enums.py @@ -377,6 +377,12 @@ class GoogleBigQueryV2AuthenticationType(str, Enum, metaclass=CaseInsensitiveEnu USER_AUTHENTICATION = "UserAuthentication" +class GreenplumAuthenticationType(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """The authentication type to use. Type: string. Only used for V2.""" + + BASIC = "Basic" + + class HBaseAuthenticationType(str, Enum, metaclass=CaseInsensitiveEnumMeta): """The authentication mechanism to use to connect to the HBase server.""" 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 c93dd92dc173..abd21ea9a0b3 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 @@ -5587,9 +5587,9 @@ class AvroWriteSettings(FormatWriteSettings): :ivar max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :vartype max_rows_per_file: JSON - :ivar file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :ivar file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :vartype file_name_prefix: JSON """ @@ -5627,9 +5627,9 @@ def __init__( :keyword max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :paramtype max_rows_per_file: JSON - :keyword file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :keyword file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :paramtype file_name_prefix: JSON """ super().__init__(additional_properties=additional_properties, **kwargs) @@ -8575,8 +8575,8 @@ class AzureDataExplorerLinkedService(LinkedService): :ivar annotations: List of tags that can be used for describing the linked service. :vartype annotations: list[JSON] :ivar endpoint: The endpoint of Azure Data Explorer (the engine's endpoint). URL will be in the - format https://:code:``.:code:``.kusto.windows.net. Type: string (or - Expression with resultType string). Required. + format https://\\ :code:``.\\ :code:``.kusto.windows.net. Type: string + (or Expression with resultType string). Required. :vartype endpoint: JSON :ivar service_principal_id: The ID of the service principal used to authenticate against Azure Data Explorer. Type: string (or Expression with resultType string). @@ -8648,8 +8648,8 @@ def __init__( :keyword annotations: List of tags that can be used for describing the linked service. :paramtype annotations: list[JSON] :keyword endpoint: The endpoint of Azure Data Explorer (the engine's endpoint). URL will be in - the format https://:code:``.:code:``.kusto.windows.net. Type: string - (or Expression with resultType string). Required. + the format https://\\ :code:``.\\ :code:``.kusto.windows.net. Type: + string (or Expression with resultType string). Required. :paramtype endpoint: JSON :keyword service_principal_id: The ID of the service principal used to authenticate against Azure Data Explorer. Type: string (or Expression with resultType string). @@ -10566,7 +10566,7 @@ class AzureFunctionLinkedService(LinkedService): :ivar annotations: List of tags that can be used for describing the linked service. :vartype annotations: list[JSON] :ivar function_app_url: The endpoint of the Azure Function App. URL will be in the format - https://:code:``.azurewebsites.net. Type: string (or Expression with resultType + https://\\ :code:``.azurewebsites.net. Type: string (or Expression with resultType string). Required. :vartype function_app_url: JSON :ivar function_key: Function or Host key for Azure Function App. @@ -10637,7 +10637,7 @@ def __init__( :keyword annotations: List of tags that can be used for describing the linked service. :paramtype annotations: list[JSON] :keyword function_app_url: The endpoint of the Azure Function App. URL will be in the format - https://:code:``.azurewebsites.net. Type: string (or Expression with resultType + https://\\ :code:``.azurewebsites.net. Type: string (or Expression with resultType string). Required. :paramtype function_app_url: JSON :keyword function_key: Function or Host key for Azure Function App. @@ -16485,8 +16485,8 @@ class AzureSynapseArtifactsLinkedService(LinkedService): :vartype parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] :ivar annotations: List of tags that can be used for describing the linked service. :vartype annotations: list[JSON] - :ivar endpoint: https://:code:``.dev.azuresynapse.net, Azure Synapse Analytics - workspace URL. Type: string (or Expression with resultType string). Required. + :ivar endpoint: https://\\ :code:``.dev.azuresynapse.net, Azure Synapse + Analytics workspace URL. Type: string (or Expression with resultType string). Required. :vartype endpoint: JSON :ivar authentication: Required to specify MSI, if using system assigned managed identity as authentication method. Type: string (or Expression with resultType string). @@ -16543,7 +16543,7 @@ def __init__( :paramtype parameters: dict[str, ~azure.mgmt.datafactory.models.ParameterSpecification] :keyword annotations: List of tags that can be used for describing the linked service. :paramtype annotations: list[JSON] - :keyword endpoint: https://:code:``.dev.azuresynapse.net, Azure Synapse + :keyword endpoint: https://\\ :code:``.dev.azuresynapse.net, Azure Synapse Analytics workspace URL. Type: string (or Expression with resultType string). Required. :paramtype endpoint: JSON :keyword authentication: Required to specify MSI, if using system assigned managed identity as @@ -25271,9 +25271,9 @@ class DelimitedTextWriteSettings(FormatWriteSettings): :ivar max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :vartype max_rows_per_file: JSON - :ivar file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :ivar file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :vartype file_name_prefix: JSON """ @@ -25314,9 +25314,9 @@ def __init__( :keyword max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :paramtype max_rows_per_file: JSON - :keyword file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :keyword file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :paramtype file_name_prefix: JSON """ super().__init__(additional_properties=additional_properties, **kwargs) @@ -33622,6 +33622,30 @@ class GreenplumLinkedService(LinkedService): :ivar encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. :vartype encrypted_credential: str + :ivar authentication_type: The authentication type to use. Type: string. Only used for V2. + "Basic" + :vartype authentication_type: str or ~azure.mgmt.datafactory.models.GreenplumAuthenticationType + :ivar host: Host name for connection. Type: string. Only used for V2. + :vartype host: JSON + :ivar port: The port for the connection. Type: integer. Only used for V2. + :vartype port: JSON + :ivar username: Username for authentication. Type: string. Only used for V2. + :vartype username: JSON + :ivar database: Database name for connection. Type: string. Only used for V2. + :vartype database: JSON + :ivar ssl_mode: SSL mode for connection. Type: integer. 0: disable, 1:allow, 2: prefer, 3: + require, 4: verify-ca, 5: verify-full. Type: integer. Only used for V2. + :vartype ssl_mode: JSON + :ivar connection_timeout: The time to wait (in seconds) while trying to establish a connection + before terminating the attempt and generating an error. Type: integer. Only used for V2. + :vartype connection_timeout: JSON + :ivar command_timeout: The time to wait (in seconds) while trying to execute a command before + terminating the attempt and generating an error. Set to zero for infinity. Type: integer. Only + used for V2. + :vartype command_timeout: JSON + :ivar password: The Azure key vault secret reference of password in connection string. Type: + string. Only used for V2. + :vartype password: ~azure.mgmt.datafactory.models.SecretBase """ _validation = { @@ -33639,6 +33663,15 @@ class GreenplumLinkedService(LinkedService): "connection_string": {"key": "typeProperties.connectionString", "type": "object"}, "pwd": {"key": "typeProperties.pwd", "type": "AzureKeyVaultSecretReference"}, "encrypted_credential": {"key": "typeProperties.encryptedCredential", "type": "str"}, + "authentication_type": {"key": "typeProperties.authenticationType", "type": "str"}, + "host": {"key": "typeProperties.host", "type": "object"}, + "port": {"key": "typeProperties.port", "type": "object"}, + "username": {"key": "typeProperties.username", "type": "object"}, + "database": {"key": "typeProperties.database", "type": "object"}, + "ssl_mode": {"key": "typeProperties.sslMode", "type": "object"}, + "connection_timeout": {"key": "typeProperties.connectionTimeout", "type": "object"}, + "command_timeout": {"key": "typeProperties.commandTimeout", "type": "object"}, + "password": {"key": "typeProperties.password", "type": "SecretBase"}, } def __init__( @@ -33653,6 +33686,15 @@ def __init__( connection_string: Optional[JSON] = None, pwd: Optional["_models.AzureKeyVaultSecretReference"] = None, encrypted_credential: Optional[str] = None, + authentication_type: Optional[Union[str, "_models.GreenplumAuthenticationType"]] = None, + host: Optional[JSON] = None, + port: Optional[JSON] = None, + username: Optional[JSON] = None, + database: Optional[JSON] = None, + ssl_mode: Optional[JSON] = None, + connection_timeout: Optional[JSON] = None, + command_timeout: Optional[JSON] = None, + password: Optional["_models.SecretBase"] = None, **kwargs: Any ) -> None: """ @@ -33677,6 +33719,32 @@ def __init__( :keyword encrypted_credential: The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string. :paramtype encrypted_credential: str + :keyword authentication_type: The authentication type to use. Type: string. Only used for V2. + "Basic" + :paramtype authentication_type: str or + ~azure.mgmt.datafactory.models.GreenplumAuthenticationType + :keyword host: Host name for connection. Type: string. Only used for V2. + :paramtype host: JSON + :keyword port: The port for the connection. Type: integer. Only used for V2. + :paramtype port: JSON + :keyword username: Username for authentication. Type: string. Only used for V2. + :paramtype username: JSON + :keyword database: Database name for connection. Type: string. Only used for V2. + :paramtype database: JSON + :keyword ssl_mode: SSL mode for connection. Type: integer. 0: disable, 1:allow, 2: prefer, 3: + require, 4: verify-ca, 5: verify-full. Type: integer. Only used for V2. + :paramtype ssl_mode: JSON + :keyword connection_timeout: The time to wait (in seconds) while trying to establish a + connection before terminating the attempt and generating an error. Type: integer. Only used for + V2. + :paramtype connection_timeout: JSON + :keyword command_timeout: The time to wait (in seconds) while trying to execute a command + before terminating the attempt and generating an error. Set to zero for infinity. Type: + integer. Only used for V2. + :paramtype command_timeout: JSON + :keyword password: The Azure key vault secret reference of password in connection string. Type: + string. Only used for V2. + :paramtype password: ~azure.mgmt.datafactory.models.SecretBase """ super().__init__( additional_properties=additional_properties, @@ -33691,6 +33759,15 @@ def __init__( self.connection_string = connection_string self.pwd = pwd self.encrypted_credential = encrypted_credential + self.authentication_type = authentication_type + self.host = host + self.port = port + self.username = username + self.database = database + self.ssl_mode = ssl_mode + self.connection_timeout = connection_timeout + self.command_timeout = command_timeout + self.password = password class GreenplumSource(TabularSource): @@ -50084,9 +50161,9 @@ class OrcWriteSettings(FormatWriteSettings): :ivar max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :vartype max_rows_per_file: JSON - :ivar file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :ivar file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :vartype file_name_prefix: JSON """ @@ -50116,9 +50193,9 @@ def __init__( :keyword max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :paramtype max_rows_per_file: JSON - :keyword file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :keyword file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :paramtype file_name_prefix: JSON """ super().__init__(additional_properties=additional_properties, **kwargs) @@ -50638,9 +50715,9 @@ class ParquetWriteSettings(FormatWriteSettings): :ivar max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :vartype max_rows_per_file: JSON - :ivar file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :ivar file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :vartype file_name_prefix: JSON """ @@ -50670,9 +50747,9 @@ def __init__( :keyword max_rows_per_file: Limit the written file's row count to be smaller than or equal to the specified count. Type: integer (or Expression with resultType integer). :paramtype max_rows_per_file: JSON - :keyword file_name_prefix: Specifies the file name pattern - :code:``_:code:``.:code:`` when copy from non-file - based store without partitionOptions. Type: string (or Expression with resultType string). + :keyword file_name_prefix: Specifies the file name pattern :code:``_\\ + :code:``.\\ :code:`` when copy from non-file based store without + partitionOptions. Type: string (or Expression with resultType string). :paramtype file_name_prefix: JSON """ super().__init__(additional_properties=additional_properties, **kwargs) @@ -59807,8 +59884,8 @@ class SapOdpLinkedService(LinkedService): :ivar message_server_service: The service name or port number of the Message Server. Type: string (or Expression with resultType string). :vartype message_server_service: JSON - :ivar snc_mode: SNC activation indicator to access the SAP server where the table is located. - Must be either 0 (off) or 1 (on). Type: string (or Expression with resultType string). + :ivar snc_mode: SNC activation flag (Boolean) to access the SAP server where the table is + located. Type: boolean (or Expression with resultType boolean). :vartype snc_mode: JSON :ivar snc_my_name: Initiator's SNC name to access the SAP server where the table is located. Type: string (or Expression with resultType string). @@ -59939,8 +60016,8 @@ def __init__( # pylint: disable=too-many-locals :keyword message_server_service: The service name or port number of the Message Server. Type: string (or Expression with resultType string). :paramtype message_server_service: JSON - :keyword snc_mode: SNC activation indicator to access the SAP server where the table is - located. Must be either 0 (off) or 1 (on). Type: string (or Expression with resultType string). + :keyword snc_mode: SNC activation flag (Boolean) to access the SAP server where the table is + located. Type: boolean (or Expression with resultType boolean). :paramtype snc_mode: JSON :keyword snc_my_name: Initiator's SNC name to access the SAP server where the table is located. Type: string (or Expression with resultType string). @@ -60723,8 +60800,8 @@ class SapTableLinkedService(LinkedService): :ivar message_server_service: The service name or port number of the Message Server. Type: string (or Expression with resultType string). :vartype message_server_service: JSON - :ivar snc_mode: SNC activation indicator to access the SAP server where the table is located. - Must be either 0 (off) or 1 (on). Type: string (or Expression with resultType string). + :ivar snc_mode: SNC activation flag (Boolean) to access the SAP server where the table is + located. Type: boolean (or Expression with resultType boolean). :vartype snc_mode: JSON :ivar snc_my_name: Initiator's SNC name to access the SAP server where the table is located. Type: string (or Expression with resultType string). @@ -60845,8 +60922,8 @@ def __init__( :keyword message_server_service: The service name or port number of the Message Server. Type: string (or Expression with resultType string). :paramtype message_server_service: JSON - :keyword snc_mode: SNC activation indicator to access the SAP server where the table is - located. Must be either 0 (off) or 1 (on). Type: string (or Expression with resultType string). + :keyword snc_mode: SNC activation flag (Boolean) to access the SAP server where the table is + located. Type: boolean (or Expression with resultType boolean). :paramtype snc_mode: JSON :keyword snc_my_name: Initiator's SNC name to access the SAP server where the table is located. Type: string (or Expression with resultType string). @@ -61465,6 +61542,10 @@ class ScriptActivity(ExecutionActivity): :vartype scripts: list[~azure.mgmt.datafactory.models.ScriptActivityScriptBlock] :ivar log_settings: Log settings of script activity. :vartype log_settings: ~azure.mgmt.datafactory.models.ScriptActivityTypePropertiesLogSettings + :ivar return_multistatement_result: Enable to retrieve result sets from multiple SQL statements + and the number of rows affected by the DML statement. Supported connector: SnowflakeV2. Type: + boolean (or Expression with resultType boolean). + :vartype return_multistatement_result: JSON """ _validation = { @@ -61486,6 +61567,7 @@ class ScriptActivity(ExecutionActivity): "script_block_execution_timeout": {"key": "typeProperties.scriptBlockExecutionTimeout", "type": "object"}, "scripts": {"key": "typeProperties.scripts", "type": "[ScriptActivityScriptBlock]"}, "log_settings": {"key": "typeProperties.logSettings", "type": "ScriptActivityTypePropertiesLogSettings"}, + "return_multistatement_result": {"key": "typeProperties.returnMultistatementResult", "type": "object"}, } def __init__( @@ -61503,6 +61585,7 @@ def __init__( script_block_execution_timeout: Optional[JSON] = None, scripts: Optional[List["_models.ScriptActivityScriptBlock"]] = None, log_settings: Optional["_models.ScriptActivityTypePropertiesLogSettings"] = None, + return_multistatement_result: Optional[JSON] = None, **kwargs: Any ) -> None: """ @@ -61536,6 +61619,10 @@ def __init__( :paramtype scripts: list[~azure.mgmt.datafactory.models.ScriptActivityScriptBlock] :keyword log_settings: Log settings of script activity. :paramtype log_settings: ~azure.mgmt.datafactory.models.ScriptActivityTypePropertiesLogSettings + :keyword return_multistatement_result: Enable to retrieve result sets from multiple SQL + statements and the number of rows affected by the DML statement. Supported connector: + SnowflakeV2. Type: boolean (or Expression with resultType boolean). + :paramtype return_multistatement_result: JSON """ super().__init__( additional_properties=additional_properties, @@ -61553,6 +61640,7 @@ def __init__( self.script_block_execution_timeout = script_block_execution_timeout self.scripts = scripts self.log_settings = log_settings + self.return_multistatement_result = return_multistatement_result class ScriptActivityParameter(_serialization.Model): diff --git a/sdk/datafactory/azure-mgmt-datafactory/setup.py b/sdk/datafactory/azure-mgmt-datafactory/setup.py index 570262824209..907fd55998d6 100644 --- a/sdk/datafactory/azure-mgmt-datafactory/setup.py +++ b/sdk/datafactory/azure-mgmt-datafactory/setup.py @@ -22,11 +22,9 @@ # Version extraction inspired from 'requests' with open( - ( - os.path.join(package_folder_path, "version.py") - if os.path.exists(os.path.join(package_folder_path, "version.py")) - else os.path.join(package_folder_path, "_version.py") - ), + os.path.join(package_folder_path, "version.py") + if os.path.exists(os.path.join(package_folder_path, "version.py")) + else os.path.join(package_folder_path, "_version.py"), "r", ) as fd: version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)