Merge branch 'main' into dependabot/github_actions/actions/download-artifact-6

Author: brianaj

.github/workflows/CI.yml

@@ -22,20 +22,20 @@ jobs:
     runs-on: ${{ matrix.runner-os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - uses: extractions/setup-just@v3
       - name: Initialize CodeQL
         if: matrix.runner-os == 'ubuntu-latest'
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           queries: +security-and-quality
           config-file: ./.github/codeql/codeql-config.yml
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 
@@ -52,12 +52,12 @@ jobs:
         run: just test-coverage
 
       - name: Copy Coverage To Predictable Location
-        if: always() && matrix.runner-os == 'ubuntu-latest'
+        if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
         run: cp coverage/**/coverage.cobertura.xml coverage/coverage.cobertura.xml
 
       - name: Code Coverage Summary Report
         uses: irongut/[email protected]
-        if: always() && matrix.runner-os == 'ubuntu-latest'
+        if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
         with:
           filename: coverage/coverage.cobertura.xml
           badge: true
@@ -66,22 +66,22 @@ jobs:
 
       # This is used by the subsequent publish-test-results.yml
       - name: Upload Unit Test Results
-        if: always() && matrix.runner-os == 'ubuntu-latest'
+        if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
         uses: actions/upload-artifact@v4
         with:
           name: Unit Test Results
           path: src/OctoshiftCLI.Tests/unit-tests.xml
 
       # This is used by the subsequent publish-test-results.yml
       - name: Upload Code Coverage Report
-        if: always() && matrix.runner-os == 'ubuntu-latest'
+        if: always() && matrix.runner-os == 'ubuntu-latest' && matrix.language == 'csharp'
         uses: actions/upload-artifact@v4
         with:
           name: Code Coverage Report
           path: code-coverage-results.md
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
         if: matrix.runner-os == 'ubuntu-latest'
 
   upload-event-file:
@@ -102,13 +102,13 @@ jobs:
         target-os: [windows-latest, ubuntu-latest, macos-latest]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
       - uses: extractions/setup-just@v3
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 
@@ -150,12 +150,12 @@ jobs:
     runs-on: ${{ matrix.runner-os }}
     concurrency: integration-test-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           persist-credentials: false
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 
@@ -282,9 +282,8 @@ jobs:
     environment: PUBLISH_RELEASE
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
-          persist-credentials: false
           token: ${{ secrets.RELEASE_NOTES_PAT }}
           fetch-depth: 0
 
@@ -304,7 +303,7 @@ jobs:
           }
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 
@@ -366,7 +365,7 @@ jobs:
           $TAG_NAME | Out-File ./LATEST-VERSION.txt
 
       - name: Commit Release Notes and Version
-        uses: stefanzweifel/git-auto-commit-action@v5
+        uses: stefanzweifel/git-auto-commit-action@28e16e81777b558cc906c8750092100bbb34c5e3
         with:
           commit_message: Automated commit of archived release notes and version file [skip ci]
           file_pattern: RELEASENOTES.md releasenotes/*.md LATEST-VERSION.txt

.github/workflows/copilot-setup-steps.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v2

.github/workflows/integration-tests.yml

@@ -23,7 +23,7 @@ jobs:
         target-os: [windows-latest, ubuntu-latest, macos-latest]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
         fetch-depth: 0
@@ -95,7 +95,7 @@ jobs:
     runs-on: ${{ matrix.runner-os }}
     concurrency: integration-test-${{ matrix.source-vcs }}-${{ matrix.runner-os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: 'refs/pull/${{ github.event.inputs.pr_number }}/merge'
         fetch-depth: 0

LATEST-VERSION.txt

@@ -1 +1 @@
-v1.21.0
+v1.23.0

releasenotes/v1.22.0.md

@@ -0,0 +1 @@
+- Added `--migration-id` option to `download-logs` command to allow downloading logs directly by migration ID without requiring org/repo lookup

releasenotes/v1.23.0.md

@@ -0,0 +1,2 @@
+- bbs2gh : Added validation for `--archive-path` and `--bbs-shared-home` options to fail fast with clear error messages if the provided paths do not exist or are not accessible. Archive path is now logged before upload operations to help with troubleshooting
+- ado2gh: Fixed `--rewire-pipelines` for GitHub Enterprise Cloud with data residency by correctly matching GitHubProximaPipelines service connections by team project name instead of GitHub organization name

src/Octoshift/Commands/CreateTeam/CreateTeamCommandBase.cs

@@ -16,8 +16,10 @@ public CreateTeamCommandBase() : base(name: "create-team", description: "Creates
 
     public virtual Option<string> TeamName { get; } = new("--team-name") { IsRequired = true };
 
-    public virtual Option<string> IdpGroup { get; } = new("--idp-group");
-
+    public virtual Option<string> IdpGroup { get; } = new("--idp-group")
+    {
+        Description = "The Identity Provider Group to link the team to. For Enterprise Managed Users only."
+    };
     public virtual Option<string> GithubPat { get; } = new("--github-pat")
     {
         Description = "Personal access token of the GitHub target. Overrides GH_PAT environment variable."

src/Octoshift/Commands/DownloadLogs/DownloadLogsCommandArgs.cs

@@ -5,6 +5,7 @@ public class DownloadLogsCommandArgs : CommandArgs
 {
     public string GithubOrg { get; set; }
     public string GithubRepo { get; set; }
+    public string MigrationId { get; set; }
     public string GithubApiUrl { get; set; }
     [Secret]
     public string GithubPat { get; set; }

src/Octoshift/Commands/DownloadLogs/DownloadLogsCommandBase.cs

@@ -18,16 +18,19 @@ public class DownloadLogsCommandBase : CommandBase<DownloadLogsCommandArgs, Down
 
     public virtual Option<string> GithubOrg { get; } = new("--github-org")
     {
-        IsRequired = true,
         Description = "GitHub organization to download logs from."
     };
 
     public virtual Option<string> GithubRepo { get; } = new("--github-repo")
     {
-        IsRequired = true,
         Description = "Target repository to download latest log for."
     };
 
+    public virtual Option<string> MigrationId { get; } = new("--migration-id")
+    {
+        Description = "Migration ID to download logs for. If specified, --github-org and --github-repo are not required."
+    };
+
     public virtual Option<string> GithubApiUrl { get; } = new("--github-api-url")
     {
         Description = "Target GitHub API URL if not targeting github.com (default: https://api.github.com)."
@@ -79,6 +82,7 @@ protected void AddOptions()
     {
         AddOption(GithubOrg);
         AddOption(GithubRepo);
+        AddOption(MigrationId);
         AddOption(GithubApiUrl);
         AddOption(GithubPat);
         AddOption(MigrationLogFile);

src/Octoshift/Commands/DownloadLogs/DownloadLogsCommandHandler.cs

@@ -38,6 +38,21 @@ public async Task Handle(DownloadLogsCommandArgs args)
             throw new ArgumentNullException(nameof(args));
         }
 
+        if (args.MigrationId.HasValue())
+        {
+            if (args.GithubOrg.HasValue() || args.GithubRepo.HasValue())
+            {
+                _log.LogWarning("--github-org and --github-repo are ignored when --migration-id is specified.");
+            }
+        }
+        else
+        {
+            if (!args.GithubOrg.HasValue() || !args.GithubRepo.HasValue())
+            {
+                throw new OctoshiftCliException("Either --migration-id (GraphQL migration ID) or both --github-org and --github-repo must be specified.");
+            }
+        }
+
         _log.LogWarning("Migration logs are only available for 24 hours after a migration finishes!");
 
         _log.LogInformation("Downloading migration logs...");
@@ -49,22 +64,52 @@ public async Task Handle(DownloadLogsCommandArgs args)
             throw new OctoshiftCliException($"File {args.MigrationLogFile} already exists! Use --overwrite to overwrite this file.");
         }
 
-        var result = await _retryPolicy.RetryOnResult(async () => await _githubApi.GetMigrationLogUrl(args.GithubOrg, args.GithubRepo), r => r?.MigrationLogUrl.IsNullOrWhiteSpace() ?? false,
-            "Waiting for migration log to populate...");
+        string logUrl;
+        string migrationId;
+        string repositoryName;
 
-        if (result.Outcome == OutcomeType.Successful && result.Result is null)
+        if (args.MigrationId.HasValue())
         {
-            throw new OctoshiftCliException($"Migration for repository {args.GithubRepo} not found!");
-        }
+            // Use migration ID directly
+            migrationId = args.MigrationId;
+            var migrationResult = await _retryPolicy.RetryOnResult(
+                async () => await _githubApi.GetMigration(migrationId),
+                r => string.IsNullOrWhiteSpace(r.MigrationLogUrl),
+                "Waiting for migration log to populate...");
+
+            if (migrationResult.Outcome == OutcomeType.Failure)
+            {
+                throw new OctoshiftCliException($"Migration log for migration {migrationId} is currently unavailable. Migration logs are only available for 24 hours after a migration finishes. Please ensure the migration ID is correct and the migration has completed recently.");
+            }
 
-        if (result.Outcome == OutcomeType.Failure)
-        {
-            throw new OctoshiftCliException($"Migration log for repository {args.GithubRepo} unavailable!");
+            var (_, RepositoryName, _, _, MigrationLogUrl) = migrationResult.Result;
+            logUrl = MigrationLogUrl;
+            repositoryName = RepositoryName;
         }
+        else
+        {
+            // Use org/repo to find migration
+            var result = await _retryPolicy.RetryOnResult(async () => await _githubApi.GetMigrationLogUrl(args.GithubOrg, args.GithubRepo), r => r?.MigrationLogUrl.IsNullOrWhiteSpace() ?? false,
+                "Waiting for migration log to populate...");
+
+            if (result.Outcome == OutcomeType.Successful && result.Result is null)
+            {
+                throw new OctoshiftCliException($"Migration for repository {args.GithubRepo} not found!");
+            }
 
-        var (logUrl, migrationId) = result.Result.Value;
+            if (result.Outcome == OutcomeType.Failure)
+            {
+                throw new OctoshiftCliException($"Migration log for repository {args.GithubRepo} unavailable!");
+            }
+
+            (logUrl, migrationId) = result.Result.Value;
+            repositoryName = args.GithubRepo;
+        }
 
-        args.MigrationLogFile ??= $"migration-log-{args.GithubOrg}-{args.GithubRepo}-{migrationId}.log";
+        var defaultFileName = args.MigrationId.HasValue()
+            ? $"migration-log-{repositoryName}-{migrationId}.log"
+            : $"migration-log-{args.GithubOrg}-{repositoryName}-{migrationId}.log";
+        args.MigrationLogFile ??= defaultFileName;
 
         if (FileExists(args.MigrationLogFile))
         {
@@ -76,9 +121,9 @@ public async Task Handle(DownloadLogsCommandArgs args)
             _log.LogWarning($"Overwriting {args.MigrationLogFile} due to --overwrite option.");
         }
 
-        _log.LogInformation($"Downloading log for repository {args.GithubRepo} to {args.MigrationLogFile}...");
+        _log.LogInformation($"Downloading log for repository {repositoryName} to {args.MigrationLogFile}...");
         await _httpDownloadService.DownloadToFile(logUrl, args.MigrationLogFile);
 
-        _log.LogSuccess($"Downloaded {args.GithubRepo} log to {args.MigrationLogFile}.");
+        _log.LogSuccess($"Downloaded {repositoryName} log to {args.MigrationLogFile}.");
     }
 }