Argo/Git: Update Vendor Identification Logic to poll http endpoint in the event of non-deterministic URL (gitlab only) #1839
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using System; | ||
|
|
||
| namespace Calamari.ArgoCD.Git.GitVendorApiAdapters.AzureDevOps | ||
| { | ||
| public class AzureDevOpsAgnosticApiAdapterFactory : IResolvingGitVendorApiAdapterFactory | ||
| { | ||
| public bool CanHandleAsCloudHosted(IRepositoryConnection repositoryConnection) | ||
| { | ||
| return AzureDevOpsApiAdapter.CanInvokeWith(repositoryConnection.Url); | ||
| } | ||
| public IGitVendorApiAdapter? Create(IRepositoryConnection repositoryConnection) | ||
| { | ||
| throw new NotImplementedException(); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| using System; | ||
|
|
||
| namespace Calamari.ArgoCD.Git.GitVendorApiAdapters.BitBucket | ||
| { | ||
| public class BitBucketAgnosticApiAdapterFactory: IResolvingGitVendorApiAdapterFactory | ||
| { | ||
| static Uri baseUrl = new Uri("https://bitbucket.org"); | ||
|
|
||
| public bool CanHandleAsCloudHosted(IRepositoryConnection repositoryConnection) | ||
| { | ||
| return repositoryConnection.Url.Host.Equals(baseUrl.Host, StringComparison.OrdinalIgnoreCase); | ||
| } | ||
|
|
||
| public IGitVendorApiAdapter Create(IRepositoryConnection repositoryConnection) | ||
| { | ||
| return new BitBucketApiAdapter(repositoryConnection, baseUrl); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #nullable enable | ||
| using System; | ||
| using System.Threading; | ||
| using NGitLab; | ||
|
|
||
| namespace Calamari.ArgoCD.Git.GitVendorApiAdapters.GitLab | ||
| { | ||
| public class GitLabApiAdapterFactory : IResolvingGitVendorApiAdapterFactory | ||
| { | ||
| readonly string CloudHost = "https://gitlab.com"; | ||
|
|
||
| readonly SelfHostedGitLabInspector selfHostedGitLabInspector; | ||
|
|
||
| public GitLabApiAdapterFactory(SelfHostedGitLabInspector selfHostedGitLabInspector) | ||
| { | ||
| this.selfHostedGitLabInspector = selfHostedGitLabInspector; | ||
| } | ||
|
|
||
| public bool CanHandleAsCloudHosted(Uri repositoryUri) | ||
| { | ||
| return repositoryUri.Host.Equals("gitlab.com", StringComparison.OrdinalIgnoreCase) | ||
| //Handle www.gitlab.com | ||
| || repositoryUri.Host.EndsWith(".gitlab.com", StringComparison.OrdinalIgnoreCase); | ||
| } | ||
|
|
||
| public bool CanHandleAsSelfHosted(IRepositoryConnection repositoryConnection) | ||
| { | ||
| return selfHostedGitLabInspector.IsSelfHostedGitLabInstance(repositoryConnection.Url, CancellationToken.None).Result; | ||
| } | ||
|
|
||
| public IGitVendorApiAdapter Create(IRepositoryConnection repositoryConnection) | ||
| { | ||
| var host = CanHandleAsCloudHosted(repositoryConnection.Url) | ||
| ? CloudHost | ||
| : SelfHostedGitLabInspector.GetSelfHostedBaseRepositoryUrl(repositoryConnection.Url); | ||
|
|
||
| var client = new GitLabClient(host, repositoryConnection.Password); | ||
|
|
||
| return new GitLabApiAdapter(client, repositoryConnection, new Uri(host)); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| using System; | ||
| using System.Net.Http; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.Extensions.Caching.Memory; | ||
|
|
||
| // This is duplicated from the OctopusDeploy server repo | ||
|
Contributor
There was a problem hiding this comment. Helpful to add this same note to the server copy too |
||
| // source/Octopus.Core/Features/Git/PullRequests/Vendors/GitLab/SelfHostedGitLabInspector.cs | ||
| // Adjustments required: | ||
| // * Namespace | ||
| // * removed references to IOctopusHttpClientFactory - construct HtpClient directly | ||
| // * removed memory cache | ||
| // * removed semaphoreslim | ||
|
|
||
| namespace Calamari.ArgoCD.Git.GitVendorApiAdapters.GitLab; | ||
|
|
||
| public class SelfHostedGitLabInspector() | ||
| { | ||
| public static string GetSelfHostedBaseRepositoryUrl(Uri repositoryUri) => repositoryUri.GetLeftPart(UriPartial.Authority); //this elides the path & query | ||
|
|
||
| public async Task<bool> IsSelfHostedGitLabInstance(Uri repositoryUri, CancellationToken cancellationToken) | ||
| { | ||
| var selfHostedUri = GetSelfHostedBaseRepositoryUrl(repositoryUri); | ||
| var key = $"gitlab_{selfHostedUri}"; | ||
|
|
||
| using var httpClient = new HttpClient(); | ||
|
|
||
| //we can make an anonymous HTTP call to `/api/v4` and inspect the headers for `X-GitLab-Meta` | ||
| var apiUrl = new UriBuilder(selfHostedUri) | ||
| { | ||
| Path = "/api/v4" | ||
| }; | ||
|
|
||
| bool hasGitLabHeader; | ||
| try | ||
| { | ||
| var response = await httpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, apiUrl.Uri), | ||
| HttpCompletionOption.ResponseHeadersRead, | ||
| cancellationToken); | ||
|
|
||
| //all API requests from GitLab have this header (afaik) | ||
| hasGitLabHeader = response.Headers.Contains("x-gitlab-meta"); | ||
| } | ||
| catch | ||
| { | ||
| //any exception we ignore | ||
| hasGitLabHeader = false; | ||
| } | ||
|
|
||
| return hasGitLabHeader; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should tests have been deleted from here?