Enforce explicitly setting SHA in API requests

Signed-off-by: Lukas Peter Aldershaab <lukas.aldershaab@lego.com>
runatlantis · Dec 7, 2024 · 940222c · 940222c
1 parent d0294cd
commit 940222c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/server/controllers/api_controller.go b/server/controllers/api_controller.go
@@ -39,6 +39,7 @@ type APIRequest struct {
 	Repository string `validate:"required"`
 	Ref        string `validate:"required"`
 	Type       string `validate:"required"`
+	Sha        string `validate:"required"`
 	PR         int
 	Projects   []string
 	Paths      []struct {
@@ -239,7 +240,7 @@ func (a *APIController) apiParseAndValidate(r *http.Request) (*APIRequest, *comm
 			Num:        request.PR,
 			BaseBranch: request.Ref,
 			HeadBranch: request.Ref,
-			HeadCommit: request.Ref,
+			HeadCommit: request.Sha,
 			BaseRepo:   baseRepo,
 		},
 		Scope: a.Scope,

diff --git a/server/controllers/api_controller_test.go b/server/controllers/api_controller_test.go
@@ -28,6 +28,7 @@ func TestAPIController_Plan(t *testing.T) {
 	body, _ := json.Marshal(controllers.APIRequest{
 		Repository: "Repo",
 		Ref:        "main",
+		Sha:        "abc123",
 		Type:       "Gitlab",
 		Projects:   []string{"default"},
 	})
@@ -45,6 +46,7 @@ func TestAPIController_Apply(t *testing.T) {
 	body, _ := json.Marshal(controllers.APIRequest{
 		Repository: "Repo",
 		Ref:        "main",
+		Sha:        "abc123",
 		Type:       "Gitlab",
 		Projects:   []string{"default"},
 	})