Bitbucket enterprise support #246
There are no files selected for viewing
This file contains 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 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 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 |
|---|---|---|
|
|
@@ -16,7 +16,88 @@ public sealed class GetSourceLinkUrl : GetSourceLinkUrlGitTask | |
| protected override string HostsItemGroupName => "SourceLinkBitbucketGitHost"; | ||
| protected override string ProviderDisplayName => "Bitbucket.Git"; | ||
|
|
||
| private const string IsEnterpriseEditionMetadataName = "EnterpriseEdition"; | ||
| private const string VersionMetadataName = "Version"; | ||
| private const string VersionWithNewUrlFormat = "4.7"; | ||
|
|
||
| protected override bool SupportsImplicitHost => false; | ||
|
There was a problem hiding this comment.
If you keep this set to |
||
|
|
||
| protected override string BuildSourceLinkUrl(Uri contentUri, Uri gitUri, string relativeUrl, string revisionId, | ||
| ITaskItem hostItem) | ||
|
There was a problem hiding this comment.
Style: keep the parameter on the previous line. We either indent all parameters or none. |
||
| { | ||
| var isEnterpriseEditionFlagAvailable = | ||
|
There was a problem hiding this comment.
This can be simplified as return boo.TryParse(..., out var isEnterpriseEditionValue) && isEnterpriseEditionValue ?
BuildSourceLinkUrlForEnterpriseEdition(contentUri, relativeUrl, revisionId, hostItem) :
BuildSourceLinkUrlForCloudEdition(contentUri, relativeUrl, revisionId); There was a problem hiding this comment. @tmat I modified pull request according to your suggestions.
Bottom line, now it will be not necessary to put |
||
| bool.TryParse(hostItem.GetMetadata(IsEnterpriseEditionMetadataName), out var isEnterpriseEdition); | ||
|
|
||
| if (isEnterpriseEditionFlagAvailable && isEnterpriseEdition) | ||
| { | ||
| return BuildSourceLinkUrlForEnterpriseEdition(contentUri, relativeUrl, revisionId, hostItem); | ||
| } | ||
| else | ||
| { | ||
| return BuildSourceLinkUrlForCloudEdition(contentUri, relativeUrl, revisionId); | ||
| } | ||
| } | ||
|
|
||
| private string BuildSourceLinkUrlForEnterpriseEdition(Uri contentUri, string relativeUrl, string revisionId, | ||
| ITaskItem hostItem) | ||
| { | ||
| var bitbucketEnterpriseVersion = GetBitbucketEnterpriseVersion(hostItem); | ||
|
|
||
| var splits = relativeUrl.Split(new[] {'/'}, StringSplitOptions.RemoveEmptyEntries); | ||
| var isSshRepoUri = !(splits.Length == 3 && splits[0] == "scm"); | ||
| var projectName = isSshRepoUri ? splits[0] : splits[1]; | ||
| var repositoryName = isSshRepoUri ? splits[1] : splits[2]; | ||
|
|
||
| var relativeUrlForBitbucketEnterprise = | ||
| GetRelativeUrlForBitbucketEnterprise(projectName, repositoryName, revisionId, | ||
| bitbucketEnterpriseVersion); | ||
|
|
||
| var result = UriUtilities.Combine(contentUri.ToString(), relativeUrlForBitbucketEnterprise); | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| private Version GetBitbucketEnterpriseVersion(ITaskItem hostItem) | ||
| { | ||
| var bitbucketEnterpriseVersionAsString = hostItem.GetMetadata(VersionMetadataName); | ||
| Version bitbucketEnterpriseVersion; | ||
| if (!string.IsNullOrEmpty(bitbucketEnterpriseVersionAsString)) | ||
| { | ||
| if (!Version.TryParse(bitbucketEnterpriseVersionAsString, out bitbucketEnterpriseVersion)) | ||
| { | ||
| Log.LogError(CommonResources.ItemOfItemGroupMustSpecifyMetadata, hostItem.ItemSpec, | ||
| HostsItemGroupName, VersionMetadataName); | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
| else | ||
| { | ||
| bitbucketEnterpriseVersion = Version.Parse(VersionWithNewUrlFormat); | ||
| } | ||
|
|
||
| return bitbucketEnterpriseVersion; | ||
| } | ||
|
|
||
| private static string BuildSourceLinkUrlForCloudEdition(Uri contentUri, string relativeUrl, string revisionId) | ||
| { | ||
| return UriUtilities.Combine(UriUtilities.Combine(contentUri.ToString(), relativeUrl), | ||
| "raw/" + revisionId + "/*"); | ||
| } | ||
|
|
||
| private static string GetRelativeUrlForBitbucketEnterprise(string projectName, string repositoryName, string commitId, Version bitbucketVersion) | ||
| { | ||
| string relativeUrl; | ||
| if (bitbucketVersion >= Version.Parse(VersionWithNewUrlFormat)) | ||
| { | ||
| relativeUrl = $"projects/{projectName}/repos/{repositoryName}/raw/*?at={commitId}"; | ||
| } | ||
| else | ||
| { | ||
| relativeUrl = $"projects/{projectName}/repos/{repositoryName}/browse/*?at={commitId}&raw"; | ||
| } | ||
|
|
||
| return relativeUrl; | ||
| } | ||
| } | ||
| } | ||
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.
This should be default. Customer who uses repository hosted on bitbucket.org shouldn't need to specify anything in their project file.
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.
When using a server hosted in different domain we should default to enterprise edition and the latest version with the option to specify an older version.
In reply to: 280532565 [](ancestors = 280532565)
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.
Done.
Now for bitbucket.org cloud hosting there is no need to provide SourceLinkBitbucketGitHost configuration in csproj.
When the domain is different than bitbucket.org it defaults to enterprise edition and the latest version.