Merge pull request #1493 from github/brianaj/external-pr-1465

Improve rewire-pipeline error handling for disabled repos/pipelines

Author: gohana

RELEASENOTES.md

@@ -1,2 +1,5 @@
 - Added validation to detect and return clear error messages when a URL is provided instead of a name for organization, repository, or enterprise arguments (e.g., `--github-org`, `--github-target-org`, `--source-repo`, `--github-target-enterprise`)
 - Added `--target-api-url` as an optional arg to the `add-team-to-repo` command
+- **ado2gh**: Fixed 404 errors when checking branch policies for classic pipelines with prefixed repository names
+- **ado2gh**: Fixed misleading success messages when pipeline rewiring was skipped
+- **ado2gh**: Fixed monitor timeout minutes to only display when --dry-run mode is enabled, reducing confusion during regular pipeline rewiring operations

src/Octoshift/Commands/CommandArgs.cs

@@ -13,7 +13,7 @@ public abstract class CommandArgs
         public virtual void Validate(OctoLogger log)
         { }
 
-        public void Log(OctoLogger log)
+        public virtual void Log(OctoLogger log)
         {
             if (log is null)
             {

src/Octoshift/Services/AdoApi.cs

@@ -562,6 +562,18 @@ public virtual async Task ShareServiceConnection(string adoOrg, string adoTeamPr
         return (defaultBranch, clean, checkoutSubmodules, triggers);
     }
 
+    public virtual async Task<bool> IsPipelineEnabled(string org, string teamProject, int pipelineId)
+    {
+        var url = $"{_adoBaseUrl}/{org.EscapeDataString()}/{teamProject.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
+
+        var response = await _client.GetAsync(url);
+        var data = JObject.Parse(response);
+
+        // Check the queueStatus field - it can be "enabled", "disabled", or "paused"
+        var queueStatus = (string)data["queueStatus"];
+        return string.IsNullOrEmpty(queueStatus) || queueStatus.Equals("enabled", StringComparison.OrdinalIgnoreCase);
+    }
+
     public virtual async Task<string> GetBoardsGithubRepoId(string org, string teamProject, string teamProjectId, string endpointId, string githubOrg, string githubRepo)
     {
         var url = $"{_adoBaseUrl}/{org.EscapeDataString()}/_apis/Contribution/HierarchyQuery?api-version=5.0-preview.1";

src/Octoshift/Services/AdoPipelineTriggerService.cs

@@ -59,6 +59,16 @@ public async Task<PipelineTestResult> TestPipeline(PipelineTestArgs args)
                     args.PipelineId = pipelineId;
                 }
 
+                // Check if pipeline is disabled before attempting to queue a build
+                var isEnabled = await _adoApi.IsPipelineEnabled(args.AdoOrg, args.AdoTeamProject, args.PipelineId.Value);
+                if (!isEnabled)
+                {
+                    _log.LogWarning($"Pipeline '{args.PipelineName}' (ID: {args.PipelineId.Value}) is disabled. Skipping pipeline test.");
+                    testResult.ErrorMessage = "Pipeline is disabled";
+                    testResult.EndTime = DateTime.UtcNow;
+                    return testResult;
+                }
+
                 // Get original repository information for restoration
                 (originalRepoName, _, originalDefaultBranch, originalClean, originalCheckoutSubmodules) =
                     await _adoApi.GetPipelineRepository(args.AdoOrg, args.AdoTeamProject, args.PipelineId.Value);

src/Octoshift/Services/PipelineTestService.cs

@@ -985,6 +985,81 @@ public async Task GetPipeline_Should_Return_Pipeline()
         Triggers.Should().NotBeNull();
     }
 
+    [Fact]
+    public async Task IsPipelineEnabled_Should_Return_True_For_Enabled_Pipeline()
+    {
+        var pipelineId = 826263;
+
+        var endpoint = $"https://dev.azure.com/{ADO_ORG.EscapeDataString()}/{ADO_TEAM_PROJECT.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
+        var response = new
+        {
+            id = pipelineId,
+            queueStatus = "enabled"
+        };
+
+        _mockAdoClient.Setup(x => x.GetAsync(endpoint).Result).Returns(response.ToJson());
+
+        var result = await sut.IsPipelineEnabled(ADO_ORG, ADO_TEAM_PROJECT, pipelineId);
+
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public async Task IsPipelineEnabled_Should_Return_False_For_Disabled_Pipeline()
+    {
+        var pipelineId = 826263;
+
+        var endpoint = $"https://dev.azure.com/{ADO_ORG.EscapeDataString()}/{ADO_TEAM_PROJECT.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
+        var response = new
+        {
+            id = pipelineId,
+            queueStatus = "disabled"
+        };
+
+        _mockAdoClient.Setup(x => x.GetAsync(endpoint).Result).Returns(response.ToJson());
+
+        var result = await sut.IsPipelineEnabled(ADO_ORG, ADO_TEAM_PROJECT, pipelineId);
+
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public async Task IsPipelineEnabled_Should_Return_False_For_Paused_Pipeline()
+    {
+        var pipelineId = 826263;
+
+        var endpoint = $"https://dev.azure.com/{ADO_ORG.EscapeDataString()}/{ADO_TEAM_PROJECT.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
+        var response = new
+        {
+            id = pipelineId,
+            queueStatus = "paused"
+        };
+
+        _mockAdoClient.Setup(x => x.GetAsync(endpoint).Result).Returns(response.ToJson());
+
+        var result = await sut.IsPipelineEnabled(ADO_ORG, ADO_TEAM_PROJECT, pipelineId);
+
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public async Task IsPipelineEnabled_Should_Return_True_For_Missing_QueueStatus()
+    {
+        var pipelineId = 826263;
+
+        var endpoint = $"https://dev.azure.com/{ADO_ORG.EscapeDataString()}/{ADO_TEAM_PROJECT.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
+        var response = new
+        {
+            id = pipelineId
+        };
+
+        _mockAdoClient.Setup(x => x.GetAsync(endpoint).Result).Returns(response.ToJson());
+
+        var result = await sut.IsPipelineEnabled(ADO_ORG, ADO_TEAM_PROJECT, pipelineId);
+
+        result.Should().BeTrue();
+    }
+
     [Fact]
     public async Task GetBoardsGithubRepoId_Should_Return_RepoId()
     {