From 9a830dfc74a09f7df320a2a2e222d60ff87661e2 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Thu, 15 Aug 2024 16:47:40 -0700 Subject: [PATCH 1/3] Handle invalid target when creating releases using API --- routers/api/v1/repo/release.go | 3 +++ services/release/release.go | 2 +- tests/integration/api_releases_test.go | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index ef587f6274b91..00e120dbf3a9d 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -12,6 +12,7 @@ import ( "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" + "code.gitea.io/gitea/modules/git" api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/web" "code.gitea.io/gitea/routers/api/v1/utils" @@ -251,6 +252,8 @@ func CreateRelease(ctx *context.APIContext) { ctx.Error(http.StatusConflict, "ReleaseAlreadyExist", err) } else if models.IsErrProtectedTagName(err) { ctx.Error(http.StatusUnprocessableEntity, "ProtectedTagName", err) + } else if git.IsErrNotExist(err) { + ctx.Error(http.StatusConflict, "ErrNotExist", err) } else { ctx.Error(http.StatusInternalServerError, "CreateRelease", err) } diff --git a/services/release/release.go b/services/release/release.go index 399fdc79c010d..5c021404b8fdc 100644 --- a/services/release/release.go +++ b/services/release/release.go @@ -65,7 +65,7 @@ func createTag(ctx context.Context, gitRepo *git.Repository, rel *repo_model.Rel commit, err := gitRepo.GetCommit(rel.Target) if err != nil { - return false, fmt.Errorf("createTag::GetCommit[%v]: %w", rel.Target, err) + return false, err } if len(msg) > 0 { diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 0b336a90e224b..64dff822acf8c 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -208,6 +208,24 @@ func TestAPICreateReleaseToDefaultBranchOnExistingTag(t *testing.T) { createNewReleaseUsingAPI(t, token, owner, repo, "v0.0.1", "", "v0.0.1", "test") } +func TestAPICreateReleaseGivenInvalidTarget(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo.OwnerID}) + session := loginUser(t, owner.LowerName) + token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository) + + urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases", owner.Name, repo.Name) + req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateReleaseOption{ + TagName: "I point to an invalid target", + Title: "Invalid Target", + Target: "invalid-target", + }).AddTokenAuth(token) + + MakeRequest(t, req, http.StatusConflict) +} + func TestAPIGetLatestRelease(t *testing.T) { defer tests.PrepareTestEnv(t)() From 1bb41ebcabae6e7994900eadf90ddc31c77c0b33 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Fri, 16 Aug 2024 13:05:15 -0700 Subject: [PATCH 2/3] Make changes given PR feedback --- routers/api/v1/repo/release.go | 2 +- tests/integration/api_releases_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/api/v1/repo/release.go b/routers/api/v1/repo/release.go index 00e120dbf3a9d..478bdbd797a8e 100644 --- a/routers/api/v1/repo/release.go +++ b/routers/api/v1/repo/release.go @@ -253,7 +253,7 @@ func CreateRelease(ctx *context.APIContext) { } else if models.IsErrProtectedTagName(err) { ctx.Error(http.StatusUnprocessableEntity, "ProtectedTagName", err) } else if git.IsErrNotExist(err) { - ctx.Error(http.StatusConflict, "ErrNotExist", err) + ctx.Error(http.StatusNotFound, "ErrNotExist", fmt.Errorf("target \"%v\" not found: %w", rel.Target, err)) } else { ctx.Error(http.StatusInternalServerError, "CreateRelease", err) } diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 64dff822acf8c..9e9911f337356 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -223,7 +223,7 @@ func TestAPICreateReleaseGivenInvalidTarget(t *testing.T) { Target: "invalid-target", }).AddTokenAuth(token) - MakeRequest(t, req, http.StatusConflict) + MakeRequest(t, req, http.StatusNotFound) } func TestAPIGetLatestRelease(t *testing.T) { From 3c6517565bc610be13e43dbca2d40871a09e9061 Mon Sep 17 00:00:00 2001 From: Kemal Zebari Date: Thu, 29 Aug 2024 18:42:02 -0700 Subject: [PATCH 3/3] Create a correctly-named tag Tag names cannot have spaces. --- tests/integration/api_releases_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/api_releases_test.go b/tests/integration/api_releases_test.go index 9e9911f337356..a4332fdc43d1d 100644 --- a/tests/integration/api_releases_test.go +++ b/tests/integration/api_releases_test.go @@ -218,7 +218,7 @@ func TestAPICreateReleaseGivenInvalidTarget(t *testing.T) { urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/releases", owner.Name, repo.Name) req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateReleaseOption{ - TagName: "I point to an invalid target", + TagName: "i-point-to-an-invalid-target", Title: "Invalid Target", Target: "invalid-target", }).AddTokenAuth(token)