From d8f473fc2fde4475fdd2befd13317b758e843d2b Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 16 Dec 2020 15:03:53 +0800 Subject: [PATCH 1/2] [DataFactory]Fix the command `Invoke-AzDataFactoryV2Pipeline` for SupportsShouldProcess issue --- src/DataFactory/DataFactoryV2/Changelog.md | 1 + src/DataFactory/DataFactoryV2/Constants.cs | 1 + .../Runs/InvokeAzureDataFactoryPipelineCommand.cs | 7 +++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/DataFactory/DataFactoryV2/Changelog.md b/src/DataFactory/DataFactoryV2/Changelog.md index dd1af8a2c48b..081bc6ed7291 100644 --- a/src/DataFactory/DataFactoryV2/Changelog.md +++ b/src/DataFactory/DataFactoryV2/Changelog.md @@ -18,6 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release +* Fix the command `Invoke-AzDataFactoryV2Pipeline` for SupportsShouldProcess issue ## Version 1.11.2 * Updated ADF .Net SDK version to 4.13.0 diff --git a/src/DataFactory/DataFactoryV2/Constants.cs b/src/DataFactory/DataFactoryV2/Constants.cs index a08f47504c2d..41febc683bf5 100644 --- a/src/DataFactory/DataFactoryV2/Constants.cs +++ b/src/DataFactory/DataFactoryV2/Constants.cs @@ -286,5 +286,6 @@ internal static class Constants public const string ActionDescriptionForRemoveEventSubscription = "Unsubscribe the event trigger from external service events."; + public const string ActionDescriptionForInvokePipeline = "Starts a run for \"{0}\" pipeline in the \"{1}\" factory."; } } diff --git a/src/DataFactory/DataFactoryV2/Runs/InvokeAzureDataFactoryPipelineCommand.cs b/src/DataFactory/DataFactoryV2/Runs/InvokeAzureDataFactoryPipelineCommand.cs index 2cc80bdb053b..18429f8a87ea 100644 --- a/src/DataFactory/DataFactoryV2/Runs/InvokeAzureDataFactoryPipelineCommand.cs +++ b/src/DataFactory/DataFactoryV2/Runs/InvokeAzureDataFactoryPipelineCommand.cs @@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.DataFactoryV2 { - [Cmdlet("Invoke", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataFactoryV2Pipeline", DefaultParameterSetName = ParameterSetNames.ByFactoryNameByParameterFile,SupportsShouldProcess = true), OutputType(typeof(PSPipeline))] + [Cmdlet("Invoke", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "DataFactoryV2Pipeline", DefaultParameterSetName = ParameterSetNames.ByFactoryNameByParameterFile, SupportsShouldProcess = true), OutputType(typeof(PSPipeline))] public class InvokeAzureDataFactoryPipelineCommand : DataFactoryBaseCmdlet { [Parameter(ParameterSetName = ParameterSetNames.ByPipelineObjectByParameterFile, Position = 0, Mandatory = true, ValueFromPipeline = true, @@ -157,7 +157,10 @@ public override void ExecuteCmdlet() } } - WriteObject(DataFactoryClient.CreatePipelineRun(ResourceGroupName, DataFactoryName, PipelineName, paramDictionary, ReferencePipelineRunId, isRecovery, StartActivityName, startFromFailure)); + if (ShouldProcess(this.ResourceGroupName, string.Format(Constants.ActionDescriptionForInvokePipeline, this.PipelineName, this.DataFactoryName))) + { + WriteObject(DataFactoryClient.CreatePipelineRun(ResourceGroupName, DataFactoryName, PipelineName, paramDictionary, ReferencePipelineRunId, isRecovery, StartActivityName, startFromFailure)); + } } private Dictionary ReadParametersFromJson() From 58bc79c35bf659f3d940c5a1a21d146ad77bcbcd Mon Sep 17 00:00:00 2001 From: Yunchi Wang <54880216+wyunchi-ms@users.noreply.github.com> Date: Wed, 16 Dec 2020 16:52:09 +0800 Subject: [PATCH 2/2] Update Changelog.md --- src/DataFactory/DataFactoryV2/Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DataFactory/DataFactoryV2/Changelog.md b/src/DataFactory/DataFactoryV2/Changelog.md index 081bc6ed7291..9c9123112aee 100644 --- a/src/DataFactory/DataFactoryV2/Changelog.md +++ b/src/DataFactory/DataFactoryV2/Changelog.md @@ -18,7 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release -* Fix the command `Invoke-AzDataFactoryV2Pipeline` for SupportsShouldProcess issue +* Fixed the command `Invoke-AzDataFactoryV2Pipeline` for SupportsShouldProcess issue ## Version 1.11.2 * Updated ADF .Net SDK version to 4.13.0