Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: adding a delete event #1038

Merged
merged 21 commits into from
Jan 24, 2024
Merged

feat: adding a delete event #1038

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c57b4fc
enhance: getting visbility to match on vela and SCM
claire1618 Aug 4, 2023
fc69846
fix: modifying test cases to consider new visibility changes
Aug 4, 2023
0ed3ab7
adding my incomplete changes to recognizing a delete branch event in …
Aug 9, 2023
38d1b20
enhance: recognizing delete event
Aug 15, 2023
1956de7
merging main into branch
Dec 28, 2023
1c27ef6
making things normal
Dec 28, 2023
9d7cdb7
Merge branch 'main' of github.com:go-vela/server into enhance/deleteE…
Jan 11, 2024
8662409
fix: starting stuff
Jan 15, 2024
7c25580
fix: main changes to processDeleteEvent() to get things working
Jan 16, 2024
6603dab
fix: adding tests
Jan 18, 2024
8e0b050
fixing linter errors and go mod tidy
Jan 18, 2024
3861822
Merge branch 'main' of github.com:go-vela/server into enhance/deleteE…
Jan 18, 2024
584e1ab
fix: deleting vscode things
Jan 18, 2024
2a4db96
fix: fixing tests
Jan 19, 2024
84b1df1
fix: moving around some code to clean up and bring in new types commit
Jan 22, 2024
750529a
Merge branch 'main' of github.com:go-vela/server into enhance/deleteE…
Jan 22, 2024
b3e0cec
fix: removing unused code
Jan 22, 2024
295e7f4
fix: go mod tidy
Jan 22, 2024
80f852c
fix: removing unused test files
Jan 22, 2024
82c704f
fix: adding more tests for delete event
Jan 22, 2024
5a55c01
fix: testing things
Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion api/build/list_org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ func ListBuildsForOrg(c *gin.Context) {
// verify the event provided is a valid event type
if event != constants.EventComment && event != constants.EventDeploy &&
event != constants.EventPush && event != constants.EventPull &&
event != constants.EventTag && event != constants.EventSchedule {
event != constants.EventTag && event != constants.EventSchedule &&
event != constants.EventDelete {
retErr := fmt.Errorf("unable to process event %s: invalid event type provided", event)

util.HandleError(c, http.StatusBadRequest, retErr)
Expand Down
3 changes: 2 additions & 1 deletion api/build/list_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ func ListBuildsForRepo(c *gin.Context) {
// verify the event provided is a valid event type
if event != constants.EventComment && event != constants.EventDeploy &&
event != constants.EventPush && event != constants.EventPull &&
event != constants.EventTag && event != constants.EventSchedule {
event != constants.EventTag && event != constants.EventSchedule &&
event != constants.EventDelete {
retErr := fmt.Errorf("unable to process event %s: invalid event type provided", event)

util.HandleError(c, http.StatusBadRequest, retErr)
Expand Down
6 changes: 6 additions & 0 deletions api/repo/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"github.com/go-vela/server/util"
"github.com/go-vela/types/constants"
"github.com/go-vela/types/library"
"github.com/go-vela/types/library/actions"

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / test 

github.com/go-vela/[email protected]: replacement directory ../types does not exist

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / test 

github.com/go-vela/[email protected]: replacement directory ../types does not exist

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / build 

github.com/go-vela/[email protected]: replacement directory ../types does not exist

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / database_sql 

github.com/go-vela/[email protected]: replacement directory ../types does not exist

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / build 

github.com/go-vela/[email protected]: replacement directory ../types does not exist

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / database_postgres (postgres:16-alpine) 

github.com/go-vela/[email protected]: replacement directory ../types does not exist

Check failure on line 18 in api/repo/create.go

View workflow job for this annotation

GitHub Actions / database_postgres (postgres:15-alpine) 

github.com/go-vela/[email protected]: replacement directory ../types does not exist
"github.com/google/uuid"
"github.com/sirupsen/logrus"
)
Expand Down Expand Up @@ -378,6 +378,12 @@
comment.SetEdited(true)

events.SetComment(comment)
case constants.EventDelete:
deletion := events.GetPush()
deletion.SetDeleteBranch(true)
deletion.SetDeleteTag(true)

events.SetPush(deletion)
}
}

Expand Down
17 changes: 16 additions & 1 deletion api/webhook/post.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,12 +367,27 @@ func PostWebhook(c *gin.Context) {
b.SetHeadRef(headref)
}

// if the event is delete,
// call SCM for more data not provided in webhook payload
if strings.EqualFold(b.GetEvent(), constants.EventDelete) {
// send API call to capture the commit sha for the branch
_, commit, err := scm.FromContext(c).GetBranch(ctx, u, r, r.GetBranch())
if err != nil {
retErr := fmt.Errorf("failed to get commit for repo %s on %s branch: %w", r.GetFullName(), r.GetBranch(), err)
util.HandleError(c, http.StatusInternalServerError, retErr)
}

b.SetCommit(commit)
b.SetRef(commit)
}

claire1618 marked this conversation as resolved.
Show resolved Hide resolved
// variable to store changeset files
var files []string

// check if the build event is not issue_comment or pull_request
if !strings.EqualFold(b.GetEvent(), constants.EventComment) &&
!strings.EqualFold(b.GetEvent(), constants.EventPull) {
!strings.EqualFold(b.GetEvent(), constants.EventPull) &&
!strings.EqualFold(b.GetEvent(), constants.EventDelete) {
// send API call to capture list of files changed for the commit
files, err = scm.FromContext(c).Changeset(ctx, u, repo, b.GetCommit())
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/build/conditional/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
- go get ./...
image: {{ $image }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ end }}

Expand All @@ -21,7 +21,7 @@ steps:
- go test ./...
image: {{ $image }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: build
commands:
Expand All @@ -31,4 +31,4 @@ steps:
GOOS: linux
image: {{ $image }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/build/conditional/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ steps:
- go get ./...
image: golang:latest
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: test
commands:
- go test ./...
image: golang:latest
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: build
commands:
Expand All @@ -22,4 +22,4 @@ steps:
GOOS: linux
image: golang:latest
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/basic/tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ steps:
image: {{ .image }}
{{ .pull_policy }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: test
commands:
- go test ./...
image: {{ .image }}
{{ .pull_policy }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: build
commands:
Expand All @@ -27,4 +27,4 @@ steps:
image: {{ .image }}
{{ .pull_policy }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/basic/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test
commands:
- go test ./...
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_build
commands:
Expand All @@ -24,4 +24,4 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/conditional/tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
image: {{ .image }}
{{ .pull_policy }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ end }}

Expand All @@ -23,7 +23,7 @@ steps:
image: {{ .image }}
{{ .pull_policy }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: build
commands:
Expand All @@ -34,4 +34,4 @@ steps:
image: {{ .image }}
{{ .pull_policy }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/conditional/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test
commands:
- go test ./...
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_build
commands:
Expand All @@ -24,4 +24,4 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/loop_map/tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
image: golang:latest
{{ $pull }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ range $key, $value := .images }}

Expand All @@ -22,7 +22,7 @@ steps:
image: {{ $value }}
{{ $pull }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ end }}

Expand All @@ -35,4 +35,4 @@ steps:
image: golang:latest
{{ $pull }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/loop_map/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test_latest
commands:
- go test ./...
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
claire1618 marked this conversation as resolved.
Show resolved Hide resolved

- name: sample_build
commands:
Expand All @@ -24,4 +24,4 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/loop_slice/tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
image: golang:latest
{{ $pull }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ range $value := .images }}

Expand All @@ -22,7 +22,7 @@ steps:
image: {{ $value }}
{{ $pull }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ end }}

Expand All @@ -35,4 +35,4 @@ steps:
image: golang:latest
{{ $pull }}
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
10 changes: 5 additions & 5 deletions compiler/template/native/testdata/step/loop_slice/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test_golang:latest
commands:
- go test ./...
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test_golang:1.12
commands:
- go test ./...
image: golang:1.12
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test_golang:1.13
commands:
- go test ./...
image: golang:1.13
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_build
commands:
Expand All @@ -40,4 +40,4 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
2 changes: 1 addition & 1 deletion compiler/template/native/testdata/step/multiline/step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]


4 changes: 2 additions & 2 deletions compiler/template/native/testdata/step/multiline/tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

{{ .test }}

Expand All @@ -21,4 +21,4 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
6 changes: 3 additions & 3 deletions compiler/template/native/testdata/step/multiline/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_test
commands:
- go test ./...
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]

- name: sample_build
commands:
Expand All @@ -24,4 +24,4 @@ steps:
image: golang:latest
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
2 changes: 1 addition & 1 deletion compiler/template/native/testdata/step/with_vars_plat/tmpl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ steps:
image: alpine
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
2 changes: 1 addition & 1 deletion compiler/template/native/testdata/step/with_vars_plat/want.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ steps:
image: alpine
pull: true
ruleset:
event: [ push, pull_request ]
event: [ push, pull_request, delete ]
Loading
Loading