fix(publish): make it compatible with gitlab 14, fixes #273

aevea · Oct 8, 2021 · d9694a2 · d9694a2
1 parent 09cc0c7
commit d9694a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/internal/gitlab/publish.go b/internal/gitlab/publish.go
@@ -8,19 +8,19 @@ import (
 	"github.com/aevea/release-notary/internal/release"
 )
 
-// Publish publishes a Release https://docs.gitlab.com/ee/api/tags.html#create-a-new-release
+// Publish publishes a Release https://docs.gitlab.com/ee/api/releases/#create-a-release
 func (g *Gitlab) Publish(release *release.Release) error {
-	// By default we are creating a new release
+	// By default, we are creating a new release
 	method := "POST"
+	url := fmt.Sprintf("%v/projects/%v/releases", g.apiURL, g.projectID)
 
 	// In case release already exists we need to update instead of creating
 	if release.Message != "" {
+		url = fmt.Sprintf("%v/projects/%v/releases/%v", g.apiURL, g.projectID, g.tagName)
 		method = "PUT"
 	}
 
-	url := fmt.Sprintf("%v/projects/%v/repository/tags/%v/release", g.apiURL, g.projectID, g.tagName)
-
-	jsonBody, err := json.Marshal(gitlabRelease{Message: release.ReleaseNotes})
+	jsonBody, err := json.Marshal(gitlabRelease{Message: release.ReleaseNotes, TagName: g.tagName})
 
 	if err != nil {
 		return err

diff --git a/internal/gitlab/publish_test.go b/internal/gitlab/publish_test.go
@@ -17,7 +17,7 @@ func TestPublishExistingRelease(t *testing.T) {
 
 	newReleaseNotes := "test"
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-		url := fmt.Sprintf("/projects/%v/repository/tags/%v/release", projectID, tagName)
+		url := fmt.Sprintf("/projects/%v/releases/%v", projectID, tagName)
 		assert.Equal(t, "PUT", req.Method)
 		assert.Equal(t, url, req.URL.String())
 		assert.Equal(t, "testtoken", req.Header["Private-Token"][0])
@@ -26,7 +26,7 @@ func TestPublishExistingRelease(t *testing.T) {
 
 		assert.NoError(t, err)
 
-		expectedBody := fmt.Sprintf("{\"name\":\"\",\"description\":\"%v\"}", newReleaseNotes)
+		expectedBody := fmt.Sprintf("{\"name\":\"\",\"tag_name\":\"%v\",\"description\":\"%v\"}", tagName, newReleaseNotes)
 
 		assert.Equal(t, expectedBody, string(body))
 
@@ -55,7 +55,7 @@ func TestPublishNewRelease(t *testing.T) {
 
 	newReleaseNotes := "test"
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
-		url := fmt.Sprintf("/projects/%v/repository/tags/%v/release", projectID, tagName)
+		url := fmt.Sprintf("/projects/%v/releases", projectID)
 		assert.Equal(t, "POST", req.Method)
 		assert.Equal(t, url, req.URL.String())
 		assert.Equal(t, "testtoken", req.Header["Private-Token"][0])
@@ -64,7 +64,7 @@ func TestPublishNewRelease(t *testing.T) {
 
 		assert.NoError(t, err)
 
-		expectedBody := fmt.Sprintf("{\"name\":\"\",\"description\":\"%v\"}", newReleaseNotes)
+		expectedBody := fmt.Sprintf("{\"name\":\"\",\"tag_name\":\"%v\",\"description\":\"%v\"}", tagName, newReleaseNotes)
 
 		assert.Equal(t, expectedBody, string(body))
 

diff --git a/internal/gitlab/service.go b/internal/gitlab/service.go
@@ -15,6 +15,7 @@ type Gitlab struct {
 
 type gitlabRelease struct {
 	Name    string `json:"name"`
+	TagName string `json:"tag_name"`
 	Message string `json:"description"`
 }