Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4b45c31

Browse files
authored
Fix BitBucket CommitInfo Url (#122)
1 parent7371a84 commit4b45c31

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎vcsclient/bitbucketserver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ func (client *BitbucketServerClient) mapBitbucketServerCommitToCommitInfo(commit
752752
fori,p:=rangecommit.Parents {
753753
parents[i]=p.ID
754754
}
755-
url:=fmt.Sprintf("%s/api/1.0/projects/%s/repos/%s/commits/%s",
756-
client.vcsInfo.APIEndpoint,owner,repo,commit.ID)
755+
url:=fmt.Sprintf("%s/projects/%s/repos/%s/commits/%s",
756+
strings.TrimSuffix(client.vcsInfo.APIEndpoint,"/rest"),owner,repo,commit.ID)
757757
returnCommitInfo{
758758
Hash:commit.ID,
759759
AuthorName:commit.Author.Name,

‎vcsclient/bitbucketserver_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ func TestBitbucketServer_GetLatestCommit(t *testing.T) {
333333
result,err:=client.GetLatestCommit(ctx,owner,repo1,"master")
334334

335335
assert.NoError(t,err)
336-
expectedUrl:=fmt.Sprintf("%s/rest/api/1.0/projects/jfrog/repos/repo-1"+
336+
expectedUrl:=fmt.Sprintf("%s/projects/jfrog/repos/repo-1"+
337337
"/commits/def0123abcdef4567abcdef8987abcdef6543abc",serverUrl)
338338
assert.Equal(t,CommitInfo{
339339
Hash:"def0123abcdef4567abcdef8987abcdef6543abc",
@@ -364,7 +364,7 @@ func TestBitbucketServer_GetCommits(t *testing.T) {
364364
result,err:=client.GetCommits(ctx,owner,repo1,"master")
365365

366366
assert.NoError(t,err)
367-
expectedUrl:=fmt.Sprintf("%s/rest/api/1.0/projects/jfrog/repos/repo-1"+
367+
expectedUrl:=fmt.Sprintf("%s/projects/jfrog/repos/repo-1"+
368368
"/commits/def0123abcdef4567abcdef8987abcdef6543abc",serverUrl)
369369
assert.Equal(t,CommitInfo{
370370
Hash:"def0123abcdef4567abcdef8987abcdef6543abc",
@@ -596,7 +596,7 @@ func TestBitbucketServer_GetCommitBySha(t *testing.T) {
596596
result,err:=client.GetCommitBySha(ctx,owner,repo1,sha)
597597

598598
assert.NoError(t,err)
599-
expectedUrl:=fmt.Sprintf("%s/rest/api/1.0/projects/jfrog/repos/repo-1"+
599+
expectedUrl:=fmt.Sprintf("%s/projects/jfrog/repos/repo-1"+
600600
"/commits/abcdef0123abcdef4567abcdef8987abcdef6543",serverUrl)
601601
assert.Equal(t,CommitInfo{
602602
Hash:sha,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp