Skip to content

Add missing parameter values for GithubApiFactory create methods #1516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akordowski wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add missing parameter values for GithubApiFactory create methods #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Octoshift/Commands/AbortMigration/AbortMigrationCommandBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public override AbortMigrationCommandHandler BuildHandler(AbortMigrationCommandA
}

var log = sp.GetRequiredService<OctoLogger>();
var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(args.TargetApiUrl, args.GithubPat);
var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(args.TargetApiUrl, null, args.GithubPat);

return new AbortMigrationCommandHandler(log, githubApi);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Octoshift/Commands/WaitForMigration/WaitForMigrationCommandBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public override WaitForMigrationCommandHandler BuildHandler(WaitForMigrationComm
}

var log = sp.GetRequiredService<OctoLogger>();
var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(args.TargetApiUrl, args.GithubPat);
var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(args.TargetApiUrl, null, args.GithubPat);
var warningsCountLogger = sp.GetRequiredService<WarningsCountLogger>();

return new WaitForMigrationCommandHandler(log, githubApi, warningsCountLogger);
Expand Down
6 changes: 3 additions & 3 deletions src/OctoshiftCLI.Tests/Octoshift/Factories/GithubApiFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public async Task GithubApiFactory_Should_Use_The_Default_Github_Api_Url_If_Pass
.Returns(httpClient);

// Act
var githubApi = _sourceGithubApiFactory.Create(null, SOURCE_GH_PAT);
var githubApi = _sourceGithubApiFactory.Create(null, null, SOURCE_GH_PAT);
await githubApi.DeleteRepo("org", "repo"); // call a simple/random API method just for the sake of verifying the base API url

// Assert
Expand Down Expand Up @@ -230,7 +230,7 @@ public async Task GithubApiFactory_Should_Use_The_Default_Github_Api_Url_If_Pass
.Returns(httpClient);

// Act
var githubApi = _targetGithubApiFactory.Create(null, TARGET_GH_PAT);
var githubApi = _targetGithubApiFactory.Create(null, null, TARGET_GH_PAT);
await githubApi.DeleteRepo("org", "repo"); // call a simple/random API method just for the sake of verifying the base API url

// Assert
Expand Down Expand Up @@ -261,7 +261,7 @@ public async Task GithubApiFactory_Should_Use_The_Default_Github_Api_Url_If_Pass
.Returns(httpClient);

// Act
var githubApi = _sourceGithubApiFactory.CreateClientNoSsl(null, SOURCE_GH_PAT);
var githubApi = _sourceGithubApiFactory.CreateClientNoSsl(null, null, SOURCE_GH_PAT);
await githubApi.DeleteRepo("org", "repo"); // call a simple/random API method just for the sake of verifying the base API url

// Assert
Expand Down
2 changes: 1 addition & 1 deletion src/gei/Commands/MigrateRepo/MigrateRepoCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ public override MigrateRepoCommandHandler BuildHandler(MigrateRepoCommandArgs ar
var awsApiFactory = sp.GetRequiredService<AwsApiFactory>();
var azureApiFactory = sp.GetRequiredService<IAzureApiFactory>();
var httpDownloadServiceFactory = sp.GetRequiredService<HttpDownloadServiceFactory>();
ghesApi = args.NoSslVerify ? sourceGithubApiFactory.CreateClientNoSsl(args.GhesApiUrl, args.GithubSourcePat) : sourceGithubApiFactory.Create(args.GhesApiUrl, args.GithubSourcePat);
ghesApi = args.NoSslVerify ? sourceGithubApiFactory.CreateClientNoSsl(args.GhesApiUrl, null, args.GithubSourcePat) : sourceGithubApiFactory.Create(args.GhesApiUrl, null, args.GithubSourcePat);
httpDownloadService = args.NoSslVerify ? httpDownloadServiceFactory.CreateClientNoSsl() : httpDownloadServiceFactory.CreateDefault();

if (args.AzureStorageConnectionString.HasValue() || environmentVariableProvider.AzureStorageConnectionString(false).HasValue())
Expand Down
Loading