making things normal

api/build/create.go

@@ -111,7 +111,6 @@ func CreateBuild(c *gin.Context) {
 	// verify the build has a valid event and the repo allows that event type
 	if (input.GetEvent() == constants.EventPush && !r.GetAllowPush()) ||
 		(input.GetEvent() == constants.EventPull && !r.GetAllowPull()) ||
-		(input.GetEvent() == constants.EventDelete && !r.GetAllowDelete()) ||
 		(input.GetEvent() == constants.EventTag && !r.GetAllowTag()) ||
 		(input.GetEvent() == constants.EventDeploy && !r.GetAllowDeploy()) {
 		retErr := fmt.Errorf("unable to create new build: %s does not have %s events enabled", r.GetFullName(), input.GetEvent())

api/repo/create.go

@@ -173,15 +173,13 @@ func CreateRepo(c *gin.Context) {
 	// set default events if no events are passed in
 	if !input.GetAllowPull() && !input.GetAllowPush() &&
 		!input.GetAllowDeploy() && !input.GetAllowTag() &&
-		!input.GetAllowComment() && !input.GetAllowDelete() {
+		!input.GetAllowComment() {
 		for _, event := range defaultRepoEvents {
 			switch event {
 			case constants.EventPull:
 				r.SetAllowPull(true)
 			case constants.EventPush:
 				r.SetAllowPush(true)
-			case constants.EventDelete:
-				r.SetAllowDelete(true)
 			case constants.EventDeploy:
 				r.SetAllowDeploy(true)
 			case constants.EventTag:
@@ -195,7 +193,6 @@ func CreateRepo(c *gin.Context) {
 		r.SetAllowDeploy(input.GetAllowDeploy())
 		r.SetAllowPull(input.GetAllowPull())
 		r.SetAllowPush(input.GetAllowPush())
-		r.SetAllowDelete(input.GetAllowDelete())
 		r.SetAllowTag(input.GetAllowTag())
 	}
 	// -- END DEPRECATED SECTION --
@@ -269,7 +266,6 @@ func CreateRepo(c *gin.Context) {
 		r.SetAllowDeploy(dbRepo.GetAllowDeploy())
 		r.SetAllowPull(dbRepo.GetAllowPull())
 		r.SetAllowPush(dbRepo.GetAllowPush())
-		r.SetAllowDelete(dbRepo.GetAllowDelete())
 		r.SetAllowTag(dbRepo.GetAllowTag())
 	}
 

api/repo/update.go

@@ -194,13 +194,6 @@ func UpdateRepo(c *gin.Context) {
 		eventsChanged = true
 	}
 
-	if input.AllowDelete != nil {
-		// update allow_delete if set
-		r.SetAllowDelete(input.GetAllowDelete())
-
-		eventsChanged = true
-	}
-
 	if input.AllowDeploy != nil {
 		// update allow_deploy if set
 		r.SetAllowDeploy(input.GetAllowDeploy())
@@ -225,10 +218,9 @@ func UpdateRepo(c *gin.Context) {
 	// set default events if no events are enabled
 	if !r.GetAllowPull() && !r.GetAllowPush() &&
 		!r.GetAllowDeploy() && !r.GetAllowTag() &&
-		!r.GetAllowComment() && !r.GetAllowDelete() {
+		!r.GetAllowComment() {
 		r.SetAllowPull(true)
 		r.SetAllowPush(true)
-		r.SetAllowDelete(true)
 	}
 	// -- END DEPRECATED SECTION --
 

api/webhook/post.go

@@ -365,30 +365,12 @@ func PostWebhook(c *gin.Context) {
 		b.SetHeadRef(headref)
 	}
 
-	if strings.EqualFold(b.GetEvent(), constants.EventDelete) {
-		// send API call to capture the commit sha for the branch
-		_, commit, err := scm.FromContext(c).GetBranch(u, r)
-		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)
-
-			h.SetStatus(constants.StatusFailure)
-			h.SetError(retErr.Error())
-
-			return
-		}
-
-		b.SetCommit(commit)
-		b.SetRef(r.GetBranch())
-	}
-
 	// 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.EventDelete) {
+		!strings.EqualFold(b.GetEvent(), constants.EventPull) {
 		// 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 {

database/build/build_test.go

@@ -256,7 +256,6 @@ func testRepo() *library.Repo {
 		Active:       new(bool),
 		AllowPull:    new(bool),
 		AllowPush:    new(bool),
-		AllowDelete:  new(bool),
 		AllowDeploy:  new(bool),
 		AllowTag:     new(bool),
 		AllowComment: new(bool),

database/hook/hook_test.go

@@ -209,7 +209,6 @@ func testRepo() *library.Repo {
 		Active:       new(bool),
 		AllowPull:    new(bool),
 		AllowPush:    new(bool),
-		AllowDelete:  new(bool),
 		AllowDeploy:  new(bool),
 		AllowTag:     new(bool),
 		AllowComment: new(bool),

database/integration_test.go

@@ -2121,7 +2121,6 @@ func newResources() *Resources {
 	repoOne.SetActive(true)
 	repoOne.SetAllowPull(false)
 	repoOne.SetAllowPush(true)
-	repoOne.SetAllowDelete(true)
 	repoOne.SetAllowDeploy(false)
 	repoOne.SetAllowTag(false)
 	repoOne.SetAllowComment(false)
@@ -2150,7 +2149,6 @@ func newResources() *Resources {
 	repoTwo.SetActive(true)
 	repoTwo.SetAllowPull(false)
 	repoTwo.SetAllowPush(true)
-	repoTwo.SetAllowDelete(true)
 	repoTwo.SetAllowDeploy(false)
 	repoTwo.SetAllowTag(false)
 	repoTwo.SetAllowComment(false)

database/repo/repo_test.go

@@ -196,7 +196,6 @@ func testRepo() *library.Repo {
 		Active:       new(bool),
 		AllowPull:    new(bool),
 		AllowPush:    new(bool),
-		AllowDelete:  new(bool),
 		AllowDeploy:  new(bool),
 		AllowTag:     new(bool),
 		AllowComment: new(bool),

database/repo/table.go

@@ -33,7 +33,6 @@ repos (
 	active        BOOLEAN,
 	allow_pull    BOOLEAN,
 	allow_push    BOOLEAN,
-	allow_delete  BOOLEAN,
 	allow_deploy  BOOLEAN,
 	allow_tag     BOOLEAN,
 	allow_comment BOOLEAN,
@@ -69,7 +68,6 @@ repos (
 	active        BOOLEAN,
 	allow_pull    BOOLEAN,
 	allow_push    BOOLEAN,
-	allow_delete  BOOLEAN,
 	allow_deploy  BOOLEAN,
 	allow_tag     BOOLEAN,
 	allow_comment BOOLEAN,

database/schedule/schedule_test.go

@@ -212,7 +212,6 @@ func testRepo() *library.Repo {
 		Active:       new(bool),
 		AllowPull:    new(bool),
 		AllowPush:    new(bool),
-		AllowDelete:  new(bool),
 		AllowDeploy:  new(bool),
 		AllowTag:     new(bool),
 		AllowComment: new(bool),

database/secret/secret_test.go

@@ -199,7 +199,6 @@ func testRepo() *library.Repo {
 		Active:       new(bool),
 		AllowPull:    new(bool),
 		AllowPush:    new(bool),
-		AllowDelete:  new(bool),
 		AllowDeploy:  new(bool),
 		AllowTag:     new(bool),
 		AllowComment: new(bool),

mock/server/repo.go

@@ -32,7 +32,6 @@ const (
   "active": true,
   "allow_pr": false,
   "allow_push": true,
-  "allow_delete": true,
   "allow_deploy": false,
   "allow_tag": false
 }`
@@ -56,7 +55,6 @@ const (
     "active": true,
     "allow_pr": false,
     "allow_push": true,
-    "allow_delete": true,
     "allow_deploy": false,
     "allow_tag": false
   },
@@ -77,7 +75,6 @@ const (
     "active": true,
     "allow_pr": false,
     "allow_push": true,
-    "allow_delete": true,
     "allow_deploy": false,
     "allow_tag": false
   }

mock/server/schedule.go

@@ -44,7 +44,6 @@ const (
 		"active": true,
 		"allow_pull": false,
 		"allow_push": true,
-		"allow_delete": true,
 		"allow_deploy": false,
 		"allow_tag": false,
 		"allow_comment": false,
@@ -82,7 +81,6 @@ const (
 			"active": true,
 			"allow_pull": false,
 			"allow_push": true,
-			"allow_delete": true,
 			"allow_deploy": false,
 			"allow_tag": false,
 			"allow_comment": false,
@@ -119,7 +117,6 @@ const (
 			"active": true,
 			"allow_pull": false,
 			"allow_push": true,
-			"allow_delete": true,
 			"allow_deploy": false,
 			"allow_tag": false,
 			"allow_comment": false,

queue/redis/redis_test.go

@@ -88,7 +88,6 @@ var (
 		Active:      Bool(true),
 		AllowPull:   Bool(false),
 		AllowPush:   Bool(true),
-		AllowDelete: Bool(true),
 		AllowDeploy: Bool(false),
 		AllowTag:    Bool(false),
 	}

router/middleware/org/org_test.go

@@ -50,7 +50,6 @@ func TestOrg_Establish(t *testing.T) {
 	r.SetActive(false)
 	r.SetAllowPull(false)
 	r.SetAllowPush(false)
-	r.SetAllowDelete(false)
 	r.SetAllowDeploy(false)
 	r.SetAllowTag(false)
 	r.SetAllowComment(false)

router/middleware/repo/repo_test.go

@@ -56,7 +56,6 @@ func TestRepo_Establish(t *testing.T) {
 	want.SetActive(false)
 	want.SetAllowPull(false)
 	want.SetAllowPush(false)
-	want.SetAllowDelete(false)
 	want.SetAllowDeploy(false)
 	want.SetAllowTag(false)
 	want.SetAllowComment(false)

scm/github/github.go

@@ -20,7 +20,6 @@ const (
 	// events for repo webhooks.
 	eventPush         = "push"
 	eventPullRequest  = "pull_request"
-	eventDelete       = "delete"
 	eventDeployment   = "deployment"
 	eventIssueComment = "issue_comment"
 	eventRepository   = "repository"

scm/github/repo_test.go

@@ -616,7 +616,6 @@ func TestGithub_Enable(t *testing.T) {
 	r.SetHash("secret")
 	r.SetAllowPush(true)
 	r.SetAllowPull(true)
-	r.SetAllowDelete(true)
 	r.SetAllowDeploy(true)
 
 	client, _ := NewTest(s.URL)
@@ -666,7 +665,6 @@ func TestGithub_Update(t *testing.T) {
 	r.SetHash("secret")
 	r.SetAllowPush(true)
 	r.SetAllowPull(true)
-	r.SetAllowDelete(true)
 	r.SetAllowDeploy(true)
 
 	hookID := int64(1)

scm/github/webhook.go

@@ -73,9 +73,6 @@ func (c *client) ProcessWebhook(ctx context.Context, request *http.Request) (*ty
 	case *github.PullRequestEvent:
 		c.Logger.Tracef("pull")
 		return c.processPREvent(h, event)
-	case *github.DeleteEvent:
-		c.Logger.Tracef("help me please dear lord")
-		return c.processDeleteEvent(h, event)
 	case *github.DeploymentEvent:
 		c.Logger.Tracef("deployment")
 		return c.processDeploymentEvent(h, event)
@@ -301,50 +298,6 @@ func (c *client) processPREvent(h *library.Hook, payload *github.PullRequestEven
 	}, nil
 }
 
-func (c *client) processDeleteEvent(h *library.Hook, payload *github.DeleteEvent) (*types.Webhook, error) {
-	c.Logger.WithFields(logrus.Fields{
-		"org":  payload.GetRepo().GetOwner().GetLogin(),
-		"repo": payload.GetRepo().GetName(),
-	}).Tracef("processing delete GitHub webhook for %s", payload.GetRepo().GetFullName())
-
-	// capture the repo from the payload
-	repo := payload.GetRepo()
-
-	// convert payload to library repo
-	r := new(library.Repo)
-	r.SetOrg(repo.GetOwner().GetLogin())
-	r.SetName(repo.GetName())
-	r.SetFullName(repo.GetFullName())
-	r.SetLink(repo.GetHTMLURL())
-	r.SetClone(repo.GetCloneURL())
-	r.SetBranch(repo.GetDefaultBranch())
-	r.SetPrivate(repo.GetPrivate())
-	r.SetTopics(repo.Topics)
-
-	// convert payload to library build
-	b := new(library.Build)
-	b.SetEvent(constants.EventDelete)
-	b.SetClone(repo.GetCloneURL())
-	b.SetTitle(fmt.Sprintf("%s received from %s", constants.EventDelete, repo.GetHTMLURL()))
-	b.SetSender(payload.GetSender().GetLogin())
-	b.SetBranch(strings.TrimPrefix(payload.GetRef(), "refs/heads/"))
-	b.SetRef(payload.GetRef())
-	b.SetMessage(fmt.Sprintf("Branch %s deleted", b.GetBranch()))
-
-	// update the hook object
-	h.SetBranch(b.GetBranch())
-	h.SetEvent(constants.EventDelete)
-	h.SetLink(
-		fmt.Sprintf("https://%s/%s/settings/hooks", h.GetHost(), r.GetFullName()),
-	)
-
-	return &types.Webhook{
-		Hook:  h,
-		Repo:  r,
-		Build: b,
-	}, nil
-}
-
 // processDeploymentEvent is a helper function to process the deployment event.
 func (c *client) processDeploymentEvent(h *library.Hook, payload *github.DeploymentEvent) (*types.Webhook, error) {
 	c.Logger.WithFields(logrus.Fields{