diff --git a/atlasaction/action.go b/atlasaction/action.go index 13cd3953..9e40ca8f 100644 --- a/atlasaction/action.go +++ b/atlasaction/action.go @@ -285,13 +285,13 @@ func (g *githubAPI) addSuggestions(act *githubactions.Action, payload *atlasexec filePath := path.Join(payload.Env.Dir, file.Name) for _, report := range file.Reports { for _, s := range report.SuggestedFixes { - if err := g.commentSuggestion(event.PullRequestNumber, ghContext.SHA, filePath, s); err != nil { + if err := g.commentSuggestion(event.PullRequestNumber, ghContext.Ref, filePath, s); err != nil { return err } } for _, d := range report.Diagnostics { for _, s := range d.SuggestedFixes { - if err := g.commentSuggestion(event.PullRequestNumber, ghContext.SHA, filePath, s); err != nil { + if err := g.commentSuggestion(event.PullRequestNumber, ghContext.Ref, filePath, s); err != nil { return err } } @@ -420,6 +420,7 @@ func (g *githubAPI) commentSuggestion(prID int, commitID, filePath string, sugge if err != nil { return err } + fmt.Println("body sent:", string(buf)) url := fmt.Sprintf("%v/repos/%v/pulls/%v/comments", g.baseURL, g.repo, prID) req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(buf)) if err != nil { @@ -456,7 +457,7 @@ func createRunContext(act *githubactions.Action) (*atlasexec.RunContext, error) return &atlasexec.RunContext{ Repo: ghContext.Repository, Branch: branch, - Commit: ghContext.SHA, + Commit: ghContext.Ref, Path: act.GetInput("dir"), URL: ev.HeadCommit.URL, }, nil diff --git a/atlasaction/action_test.go b/atlasaction/action_test.go index 057cf7c4..b42d3488 100644 --- a/atlasaction/action_test.go +++ b/atlasaction/action_test.go @@ -252,7 +252,7 @@ func TestMigrateE2E(t *testing.T) { tt.env["GITHUB_REPOSITORY"] = "repository" tt.env["GITHUB_HEAD_REF"] = "testing-branch" tt.env["GITHUB_REF_NAME"] = "refs/pulls/6/merge" - tt.env["GITHUB_SHA"] = "sha1234" + tt.env["GITHUB_REF"] = "sha1234" expected := &atlasexec.RunContext{ Repo: "repository", Path: "file://testdata/migrations", diff --git a/atlasaction/testdata/migrations_destructive/20230925192914.sql b/atlasaction/testdata/migrations_destructive/20230925192914.sql index 853c1ad6..f5abfe79 100644 --- a/atlasaction/testdata/migrations_destructive/20230925192914.sql +++ b/atlasaction/testdata/migrations_destructive/20230925192914.sql @@ -1 +1,2 @@ +-- drop table t1; drop table t1; diff --git a/atlasaction/testdata/migrations_destructive/atlas.sum b/atlasaction/testdata/migrations_destructive/atlas.sum index 94a06804..455e7a4e 100644 --- a/atlasaction/testdata/migrations_destructive/atlas.sum +++ b/atlasaction/testdata/migrations_destructive/atlas.sum @@ -1,3 +1,3 @@ -h1:jw+3IjeTY+1ngJYKRc/Ddq8hJkBWpVRnF8qS61zspJg= +h1:H/F2w8bIg7dfvQR4lLFOLhf+bZLwlCAPXMBVJb1VKLc= 20230922132634_init.sql h1:Q+dJaaJDja1u1qEni6E0SfC4dMXhHgW2F1ybAtgcgeE= -20230925192914.sql h1:2YTCgLJQ5t3t71z3zGGRNSaWBItjTXF9zEcQICGIZkc= +20230925192914.sql h1:45yfGQkVGdeGJNj/MEF9xtJdvtW2dWnpvMIhsVjIkiA=