From 5a6eb0282972df2e002db66a6e29c797d32be430 Mon Sep 17 00:00:00 2001
From: Begona Guereca <begonaguereca@github.com>
Date: Thu, 5 Jan 2023 10:31:13 -0800
Subject: [PATCH] Updating options on GH-Valet with new ADO options  (#104)

* Updating options on GH valet for new ADO configs

* Update audit option

* update dry run options

* remove space

* Add option

* Updated location of source file

* Pipeline id is not required for build pipelines now with config/source files

* typo
---
 src/Valet/Commands/AzureDevOps/Audit.cs          |  7 +++++++
 .../Commands/AzureDevOps/BuildPipeline/DryRun.cs |  6 +++++-
 .../AzureDevOps/BuildPipeline/Migrate.cs         |  6 +++++-
 src/Valet/Commands/AzureDevOps/Common.cs         | 16 ++++++++++++++--
 src/Valet/Commands/AzureDevOps/DryRun.cs         |  1 -
 src/Valet/Commands/AzureDevOps/Migrate.cs        |  1 -
 .../AzureDevOps/ReleasePipeline/DryRun.cs        |  4 +++-
 .../AzureDevOps/ReleasePipeline/Migrate.cs       |  5 ++++-
 8 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/src/Valet/Commands/AzureDevOps/Audit.cs b/src/Valet/Commands/AzureDevOps/Audit.cs
index 9425971..0f4ebf6 100644
--- a/src/Valet/Commands/AzureDevOps/Audit.cs
+++ b/src/Valet/Commands/AzureDevOps/Audit.cs
@@ -13,7 +13,14 @@ public Audit(string[] args)
     protected override string Name => "azure-devops";
     protected override string Description => "An audit will output a list of data used in an Azure DevOps instance.";
 
+    private static readonly Option<FileInfo> ConfigFilePath = new("--config-file-path")
+    {
+        Description = "The file path corresponding to the Azure DevOps configuration file.",
+        IsRequired = false,
+    };
+
     protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
+        ConfigFilePath,
         Common.Organization,
         Common.Project,
         Common.InstanceUrl,
diff --git a/src/Valet/Commands/AzureDevOps/BuildPipeline/DryRun.cs b/src/Valet/Commands/AzureDevOps/BuildPipeline/DryRun.cs
index 696835c..f9622c3 100644
--- a/src/Valet/Commands/AzureDevOps/BuildPipeline/DryRun.cs
+++ b/src/Valet/Commands/AzureDevOps/BuildPipeline/DryRun.cs
@@ -11,5 +11,9 @@ public DryRun(string[] args) : base(args)
 
     protected override string Name => "pipeline";
     protected override string Description => "Target a designer or YAML pipeline";
-    protected override ImmutableArray<Option> Options => ImmutableArray<Option>.Empty;
+
+    protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
+        Common.SourceFilePath,
+        Common.PipelineIdNotRequired
+    );
 }
diff --git a/src/Valet/Commands/AzureDevOps/BuildPipeline/Migrate.cs b/src/Valet/Commands/AzureDevOps/BuildPipeline/Migrate.cs
index d47a9f7..556c1f6 100644
--- a/src/Valet/Commands/AzureDevOps/BuildPipeline/Migrate.cs
+++ b/src/Valet/Commands/AzureDevOps/BuildPipeline/Migrate.cs
@@ -11,5 +11,9 @@ public Migrate(string[] args) : base(args)
 
     protected override string Name => "pipeline";
     protected override string Description => "Target a designer or YAML pipeline";
-    protected override ImmutableArray<Option> Options => ImmutableArray<Option>.Empty;
+
+    protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
+        Common.SourceFilePath,
+        Common.PipelineIdNotRequired
+    );
 }
diff --git a/src/Valet/Commands/AzureDevOps/Common.cs b/src/Valet/Commands/AzureDevOps/Common.cs
index 87f5b0b..1d9c29a 100644
--- a/src/Valet/Commands/AzureDevOps/Common.cs
+++ b/src/Valet/Commands/AzureDevOps/Common.cs
@@ -28,9 +28,21 @@ public static class Common
         IsRequired = false,
     };
 
-    public static readonly Option<int> PipelineId = new(new[] { "--pipeline-id", "-i" })
+    public static readonly Option<int> PipelineIdRequired = new(new[] { "--pipeline-id", "-i" })
     {
-        Description = "The Azure DevOps pipeline id.",
+        Description = "The Azure DevOps pipeline ID.",
         IsRequired = true,
     };
+
+    public static readonly Option<int> PipelineIdNotRequired = new(new[] { "--pipeline-id", "-i" })
+    {
+        Description = "The Azure DevOps pipeline ID.",
+        IsRequired = false,
+    };
+
+    public static readonly Option<FileInfo> SourceFilePath = new("--source-file-path")
+    {
+        Description = "The file path corresponding to the Azure DevOps pipeline file.",
+        IsRequired = false,
+    };
 }
diff --git a/src/Valet/Commands/AzureDevOps/DryRun.cs b/src/Valet/Commands/AzureDevOps/DryRun.cs
index aa6e32c..783af1f 100644
--- a/src/Valet/Commands/AzureDevOps/DryRun.cs
+++ b/src/Valet/Commands/AzureDevOps/DryRun.cs
@@ -18,7 +18,6 @@ protected override Command GenerateCommand(App app)
     {
         var command = base.GenerateCommand(app);
 
-        command.AddGlobalOption(Common.PipelineId);
         command.AddGlobalOption(Common.InstanceUrl);
         command.AddGlobalOption(Common.Organization);
         command.AddGlobalOption(Common.Project);
diff --git a/src/Valet/Commands/AzureDevOps/Migrate.cs b/src/Valet/Commands/AzureDevOps/Migrate.cs
index d033409..05c5847 100644
--- a/src/Valet/Commands/AzureDevOps/Migrate.cs
+++ b/src/Valet/Commands/AzureDevOps/Migrate.cs
@@ -18,7 +18,6 @@ protected override Command GenerateCommand(App app)
     {
         var command = base.GenerateCommand(app);
 
-        command.AddGlobalOption(Common.PipelineId);
         command.AddGlobalOption(Common.InstanceUrl);
         command.AddGlobalOption(Common.Organization);
         command.AddGlobalOption(Common.Project);
diff --git a/src/Valet/Commands/AzureDevOps/ReleasePipeline/DryRun.cs b/src/Valet/Commands/AzureDevOps/ReleasePipeline/DryRun.cs
index 577cc82..e468d73 100644
--- a/src/Valet/Commands/AzureDevOps/ReleasePipeline/DryRun.cs
+++ b/src/Valet/Commands/AzureDevOps/ReleasePipeline/DryRun.cs
@@ -11,5 +11,7 @@ public DryRun(string[] args) : base(args)
 
     protected override string Name => "release";
     protected override string Description => "Target a release pipeline";
-    protected override ImmutableArray<Option> Options => ImmutableArray<Option>.Empty;
+    protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
+        Common.PipelineIdRequired
+    );
 }
diff --git a/src/Valet/Commands/AzureDevOps/ReleasePipeline/Migrate.cs b/src/Valet/Commands/AzureDevOps/ReleasePipeline/Migrate.cs
index 6a0cd29..7d9cd9c 100644
--- a/src/Valet/Commands/AzureDevOps/ReleasePipeline/Migrate.cs
+++ b/src/Valet/Commands/AzureDevOps/ReleasePipeline/Migrate.cs
@@ -11,5 +11,8 @@ public Migrate(string[] args) : base(args)
 
     protected override string Name => "release";
     protected override string Description => "Target a release pipeline";
-    protected override ImmutableArray<Option> Options => ImmutableArray<Option>.Empty;
+
+    protected override ImmutableArray<Option> Options => ImmutableArray.Create<Option>(
+        Common.PipelineIdRequired
+    );
 }