Merge branch 'pr1410' into brianaj/external-pr-1410

Author: brianaj

RELEASENOTES.md

@@ -1 +1,2 @@
 
+- Fixed issue where CLI commands required GH_PAT environment variable even when GitHub tokens were provided via command-line arguments (--github-source-pat, --github-target-pat). All migration commands now work correctly with CLI-only token authentication.

src/Octoshift/Factories/GithubApiFactory.cs

@@ -30,7 +30,7 @@ GithubApi ISourceGithubApiFactory.Create(string apiUrl, string uploadsUrl, strin
     {
         apiUrl ??= DEFAULT_API_URL;
         uploadsUrl ??= DEFAULT_UPLOADS_URL;
-        sourcePersonalAccessToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken();
+        sourcePersonalAccessToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken(throwIfNotFound: false);
         var githubClient = new GithubClient(_octoLogger, _clientFactory.CreateClient("Default"), _versionProvider, _retryPolicy, _dateTimeProvider, sourcePersonalAccessToken);
         var multipartUploader = new ArchiveUploader(githubClient, uploadsUrl, _octoLogger, _retryPolicy);
         return new GithubApi(githubClient, apiUrl, _retryPolicy, multipartUploader);
@@ -40,7 +40,7 @@ GithubApi ISourceGithubApiFactory.CreateClientNoSsl(string apiUrl, string upload
     {
         apiUrl ??= DEFAULT_API_URL;
         uploadsUrl ??= DEFAULT_UPLOADS_URL;
-        sourcePersonalAccessToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken();
+        sourcePersonalAccessToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken(throwIfNotFound: false);
         var githubClient = new GithubClient(_octoLogger, _clientFactory.CreateClient("NoSSL"), _versionProvider, _retryPolicy, _dateTimeProvider, sourcePersonalAccessToken);
         var multipartUploader = new ArchiveUploader(githubClient, uploadsUrl, _octoLogger, _retryPolicy);
         return new GithubApi(githubClient, apiUrl, _retryPolicy, multipartUploader);
@@ -50,7 +50,7 @@ GithubApi ITargetGithubApiFactory.Create(string apiUrl, string uploadsUrl, strin
     {
         apiUrl ??= DEFAULT_API_URL;
         uploadsUrl ??= DEFAULT_UPLOADS_URL;
-        targetPersonalAccessToken ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        targetPersonalAccessToken ??= _environmentVariableProvider.TargetGithubPersonalAccessToken(throwIfNotFound: false);
         var githubClient = new GithubClient(_octoLogger, _clientFactory.CreateClient("Default"), _versionProvider, _retryPolicy, _dateTimeProvider, targetPersonalAccessToken);
         var multipartUploader = new ArchiveUploader(githubClient, uploadsUrl, _octoLogger, _retryPolicy);
         return new GithubApi(githubClient, apiUrl, _retryPolicy, multipartUploader);

src/ado2gh/Commands/IntegrateBoards/IntegrateBoardsCommandHandler.cs

@@ -29,7 +29,7 @@ public async Task Handle(IntegrateBoardsCommandArgs args)
 
         _log.LogInformation("Integrating Azure Boards...");
 
-        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken(throwIfNotFound: false);
 
         var adoTeamProjectId = await _adoApi.GetTeamProjectId(args.AdoOrg, args.AdoTeamProject);
         var githubHandle = await _adoApi.GetGithubHandle(args.AdoOrg, args.AdoTeamProject, args.GithubPat);

src/ado2gh/Commands/MigrateRepo/MigrateRepoCommandHandler.cs

@@ -30,7 +30,7 @@ public async Task Handle(MigrateRepoCommandArgs args)
 
         _log.LogInformation("Migrating Repo...");
 
-        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken(throwIfNotFound: false);
 
         var adoRepoUrl = GetAdoRepoUrl(args.AdoOrg, args.AdoTeamProject, args.AdoRepo, args.AdoServerUrl);
 

src/bbs2gh/Commands/MigrateRepo/MigrateRepoCommandHandler.cs

@@ -229,7 +229,7 @@ private async Task<string> CreateMigrationSource(MigrateRepoCommandArgs args)
     {
         _log.LogInformation("Creating Migration Source...");
 
-        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken(throwIfNotFound: false);
         var githubOrgId = await _githubApi.GetOrganizationId(args.GithubOrg);
 
         try
@@ -252,7 +252,7 @@ private async Task ImportArchive(MigrateRepoCommandArgs args, string migrationSo
 
         var bbsRepoUrl = GetBbsRepoUrl(args);
 
-        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        args.GithubPat ??= _environmentVariableProvider.TargetGithubPersonalAccessToken(throwIfNotFound: false);
         var githubOrgId = await _githubApi.GetOrganizationId(args.GithubOrg);
 
         string migrationId;

src/gei/Commands/MigrateCodeScanningAlerts/MigrateCodeScanningAlertsCommand.cs

@@ -78,10 +78,7 @@ public override MigrateCodeScanningAlertsCommandHandler BuildHandler(MigrateCode
             throw new ArgumentNullException(nameof(sp));
         }
 
-        var environmentVariableProvider = sp.GetRequiredService<EnvironmentVariableProvider>();
-        args.GithubSourcePat ??= environmentVariableProvider.SourceGithubPersonalAccessToken(false);
-        args.GithubTargetPat ??= environmentVariableProvider.TargetGithubPersonalAccessToken();
-
+        // The factory handles environment variable resolution
         if (args.GithubSourcePat.IsNullOrWhiteSpace())
         {
             args.GithubSourcePat = args.GithubTargetPat;

src/gei/Commands/MigrateOrg/MigrateOrgCommandHandler.cs

@@ -72,7 +72,7 @@ public async Task Handle(MigrateOrgCommandArgs args)
     }
 
     private string GetSourceToken(MigrateOrgCommandArgs args) =>
-        args.GithubSourcePat ?? _environmentVariableProvider.SourceGithubPersonalAccessToken();
+        args.GithubSourcePat ?? _environmentVariableProvider.SourceGithubPersonalAccessToken(throwIfNotFound: false);
 
     private string GetGithubOrgUrl(string org, string baseUrl) => $"{baseUrl ?? DEFAULT_GITHUB_BASE_URL}/{org.EscapeDataString()}";
 }

src/gei/Commands/MigrateRepo/MigrateRepoCommandHandler.cs

@@ -153,7 +153,7 @@ public async Task Handle(MigrateRepoCommandArgs args)
 
         var sourceRepoUrl = GetSourceRepoUrl(args);
         var sourceToken = GetSourceToken(args);
-        var targetToken = args.GithubTargetPat ?? _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        var targetToken = args.GithubTargetPat ?? _environmentVariableProvider.TargetGithubPersonalAccessToken(throwIfNotFound: false);
 
         string migrationId;
 
@@ -214,7 +214,7 @@ public async Task Handle(MigrateRepoCommandArgs args)
         _log.LogInformation($"Migration log available at {migrationLogUrl} or by running `gh {CliContext.RootCommand} download-logs --github-target-org {args.GithubTargetOrg} --target-repo {args.TargetRepo}`");
     }
 
-    private string GetSourceToken(MigrateRepoCommandArgs args) => args.GithubSourcePat ?? _environmentVariableProvider.SourceGithubPersonalAccessToken();
+    private string GetSourceToken(MigrateRepoCommandArgs args) => args.GithubSourcePat ?? _environmentVariableProvider.SourceGithubPersonalAccessToken(throwIfNotFound: false);
 
     private string GetSourceRepoUrl(MigrateRepoCommandArgs args) => GetGithubRepoUrl(args.GithubSourceOrg, args.SourceRepo, args.GhesApiUrl.HasValue() ? ExtractGhesBaseUrl(args.GhesApiUrl) : null);
 

src/gei/Commands/MigrateSecretAlerts/MigrateSecretAlertsCommand.cs

@@ -78,10 +78,7 @@ public override MigrateSecretAlertsCommandHandler BuildHandler(MigrateSecretAler
             throw new ArgumentNullException(nameof(sp));
         }
 
-        var environmentVariableProvider = sp.GetRequiredService<EnvironmentVariableProvider>();
-        args.GithubSourcePat ??= environmentVariableProvider.SourceGithubPersonalAccessToken(false);
-        args.GithubTargetPat ??= environmentVariableProvider.TargetGithubPersonalAccessToken();
-
+        // The factory handles environment variable resolution
         if (args.GithubSourcePat.IsNullOrWhiteSpace())
         {
             args.GithubSourcePat = args.GithubTargetPat;

src/gei/Factories/CodeScanningAlertServiceFactory.cs

@@ -25,13 +25,27 @@ public CodeScanningAlertServiceFactory(
     public virtual CodeScanningAlertService
         Create(string sourceApi, string sourceToken, string targetApi, string targetToken, bool sourceApiNoSsl = false)
     {
-        sourceToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken();
-        targetToken ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
+        // Only resolve from environment if tokens are explicitly null
+        // Use consistent throwIfNotFound=false to prevent exceptions when CLI args are preferred
+        sourceToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken(false);
+
+        targetToken ??= _environmentVariableProvider.TargetGithubPersonalAccessToken(false);
+
+        // Validate that we have tokens after all resolution attempts
+        if (string.IsNullOrWhiteSpace(sourceToken))
+        {
+            throw new OctoshiftCliException("Source GitHub Personal Access Token is required. Provide it via --github-source-pat argument or GH_SOURCE_PAT/GH_PAT environment variable.");
+        }
+
+        if (string.IsNullOrWhiteSpace(targetToken))
+        {
+            throw new OctoshiftCliException("Target GitHub Personal Access Token is required. Provide it via --github-target-pat argument or GH_PAT environment variable.");
+        }
 
         var sourceGithubApi = sourceApiNoSsl
-            ? _sourceGithubApiFactory.CreateClientNoSsl(sourceApi, sourceToken)
-            : _sourceGithubApiFactory.Create(sourceApi, sourceToken);
+            ? _sourceGithubApiFactory.CreateClientNoSsl(sourceApi, null, sourceToken)
+            : _sourceGithubApiFactory.Create(sourceApi, null, sourceToken);
 
-        return new(sourceGithubApi, _targetGithubApiFactory.Create(targetApi, targetToken), _octoLogger);
+        return new(sourceGithubApi, _targetGithubApiFactory.Create(targetApi, null, targetToken), _octoLogger);
     }
 }