diff --git a/internal/releaser/github/github.go b/internal/releaser/github/github.go index 45cf098..0ca529f 100644 --- a/internal/releaser/github/github.go +++ b/internal/releaser/github/github.go @@ -55,12 +55,12 @@ func New(c *config.GitHubProvider, checkConfig bool) (*Client, error) { client = github.NewClient(httpClient) } else { // v25.0 of google github does not append prefixes for base and upload URLs - if client, err = github.NewEnterpriseClient(c.CustomURL+"/api/v3", c.CustomURL+"/api/uploads/", httpClient); err != nil { + if client, err = github.NewEnterpriseClient(c.CustomURL+"/api/v3/", c.CustomURL+"/api/uploads/", httpClient); err != nil { return &Client{}, err } - // NewEnterpriseClient(newest versions) adds prefix /api/v3 to base URL and /api/uploads to upload URL - // So save the new base url here - baseURL = client.BaseURL.String() + // note: do not append find / to end of the url since all the url constructions using this + // assume no trailing / + baseURL = c.CustomURL + "/api/v3" } return &Client{ config: c, diff --git a/internal/releaser/github/github_test.go b/internal/releaser/github/github_test.go index 72d938e..44d0ab1 100644 --- a/internal/releaser/github/github_test.go +++ b/internal/releaser/github/github_test.go @@ -136,7 +136,7 @@ func TestGetCommitURL(t *testing.T) { client, _ := New(&testOject.config, false) actualURL := client.GetCommitURL() if testOject.config.CustomURL != "" { - expectedURL := fmt.Sprintf("%s/%s/%s/commit/{{hash}}", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo) + expectedURL := fmt.Sprintf("%s/api/v3/%s/%s/commit/{{hash}}", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo) assert.EqualValues(t, expectedURL, actualURL) } else { @@ -154,7 +154,7 @@ func TestGetCompareURL(t *testing.T) { client, _ := New(&testOject.config, false) actualURL := client.GetCompareURL("1", "2") if testOject.config.CustomURL != "" { - expectedURL := fmt.Sprintf("%s/%s/%s/compare/%s...%s", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo, "1", "2") + expectedURL := fmt.Sprintf("%s/api/v3/%s/%s/compare/%s...%s", testOject.config.CustomURL, testOject.config.User, testOject.config.Repo, "1", "2") assert.EqualValues(t, expectedURL, actualURL) } else {