diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py index 76cb83407fb8..4475cdbd9bea 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy.py @@ -28,6 +28,9 @@ class ActivityPolicy(Model): :param retry_interval_in_seconds: Interval between each retry attempt (in seconds). The default is 30 sec. :type retry_interval_in_seconds: int + :param secure_input: When set to true, Input from activity is considered + as secure and will not be logged to monitoring. + :type secure_input: bool :param secure_output: When set to true, Output from activity is considered as secure and will not be logged to monitoring. :type secure_output: bool @@ -42,6 +45,7 @@ class ActivityPolicy(Model): 'timeout': {'key': 'timeout', 'type': 'object'}, 'retry': {'key': 'retry', 'type': 'object'}, 'retry_interval_in_seconds': {'key': 'retryIntervalInSeconds', 'type': 'int'}, + 'secure_input': {'key': 'secureInput', 'type': 'bool'}, 'secure_output': {'key': 'secureOutput', 'type': 'bool'}, } @@ -51,4 +55,5 @@ def __init__(self, **kwargs): self.timeout = kwargs.get('timeout', None) self.retry = kwargs.get('retry', None) self.retry_interval_in_seconds = kwargs.get('retry_interval_in_seconds', None) + self.secure_input = kwargs.get('secure_input', None) self.secure_output = kwargs.get('secure_output', None) diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy_py3.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy_py3.py index 0a99fdb4d92d..52d469679974 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy_py3.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/models/activity_policy_py3.py @@ -28,6 +28,9 @@ class ActivityPolicy(Model): :param retry_interval_in_seconds: Interval between each retry attempt (in seconds). The default is 30 sec. :type retry_interval_in_seconds: int + :param secure_input: When set to true, Input from activity is considered + as secure and will not be logged to monitoring. + :type secure_input: bool :param secure_output: When set to true, Output from activity is considered as secure and will not be logged to monitoring. :type secure_output: bool @@ -42,13 +45,15 @@ class ActivityPolicy(Model): 'timeout': {'key': 'timeout', 'type': 'object'}, 'retry': {'key': 'retry', 'type': 'object'}, 'retry_interval_in_seconds': {'key': 'retryIntervalInSeconds', 'type': 'int'}, + 'secure_input': {'key': 'secureInput', 'type': 'bool'}, 'secure_output': {'key': 'secureOutput', 'type': 'bool'}, } - def __init__(self, *, additional_properties=None, timeout=None, retry=None, retry_interval_in_seconds: int=None, secure_output: bool=None, **kwargs) -> None: + def __init__(self, *, additional_properties=None, timeout=None, retry=None, retry_interval_in_seconds: int=None, secure_input: bool=None, secure_output: bool=None, **kwargs) -> None: super(ActivityPolicy, self).__init__(**kwargs) self.additional_properties = additional_properties self.timeout = timeout self.retry = retry self.retry_interval_in_seconds = retry_interval_in_seconds + self.secure_input = secure_input self.secure_output = secure_output diff --git a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py index 28799443c0d3..de8744612d20 100644 --- a/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py +++ b/azure-mgmt-datafactory/azure/mgmt/datafactory/operations/pipeline_runs_operations.py @@ -172,7 +172,7 @@ def get( get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/pipelineruns/{runId}'} def cancel( - self, resource_group_name, factory_name, run_id, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, factory_name, run_id, is_recursive=None, custom_headers=None, raw=False, **operation_config): """Cancel a pipeline run by its run ID. :param resource_group_name: The resource group name. @@ -181,6 +181,9 @@ def cancel( :type factory_name: str :param run_id: The pipeline run identifier. :type run_id: str + :param is_recursive: If true, cancel all the Child pipelines that are + triggered by the current pipeline. + :type is_recursive: bool :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -202,6 +205,8 @@ def cancel( # Construct parameters query_parameters = {} + if is_recursive is not None: + query_parameters['isRecursive'] = self._serialize.query("is_recursive", is_recursive, 'bool') query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') # Construct headers