Support pre-workflow hooks on all comment/auto triggered commands. (#43…

…) (#1418)

Fixes pre-workflow-hooks not logging errors #1371
Prevents pre-workflow-hook from locking and cloning the dir if there are no hooks registered. #1342

server/events/command_runner.go

@@ -108,9 +108,10 @@ type DefaultCommandRunner struct {
 	// SilenceForkPRErrorsFlag is the name of the flag that controls fork PR's. We use
 	// this in our error message back to the user on a forked PR so they know
 	// how to disable error comment
-	SilenceForkPRErrorsFlag   string
-	CommentCommandRunnerByCmd map[models.CommandName]CommentCommandRunner
-	Drainer                   *Drainer
+	SilenceForkPRErrorsFlag       string
+	CommentCommandRunnerByCmd     map[models.CommandName]CommentCommandRunner
+	Drainer                       *Drainer
+	PreWorkflowHooksCommandRunner PreWorkflowHooksCommandRunner
 }
 
 // RunAutoplanCommand runs plan and policy_checks when a pull request is opened or updated.
@@ -139,12 +140,14 @@ func (c *DefaultCommandRunner) RunAutoplanCommand(baseRepo models.Repo, headRepo
 		return
 	}
 
-	autoPlanRunner := buildCommentCommandRunner(c, models.PlanCommand)
-	if autoPlanRunner == nil {
-		ctx.Log.Err("invalid autoplan command")
-		return
+	err := c.PreWorkflowHooksCommandRunner.RunPreHooks(ctx)
+
+	if err != nil {
+		ctx.Log.Err("Error running pre-workflow hooks %s. Proceeding with %s command.", err, models.PlanCommand)
 	}
 
+	autoPlanRunner := buildCommentCommandRunner(c, models.PlanCommand)
+
 	autoPlanRunner.Run(ctx, nil)
 }
 
@@ -182,12 +185,14 @@ func (c *DefaultCommandRunner) RunCommentCommand(baseRepo models.Repo, maybeHead
 		return
 	}
 
-	cmdRunner := buildCommentCommandRunner(c, cmd.CommandName())
-	if cmdRunner == nil {
-		ctx.Log.Err("command %s is not supported", cmd.Name.String())
-		return
+	err = c.PreWorkflowHooksCommandRunner.RunPreHooks(ctx)
+
+	if err != nil {
+		ctx.Log.Err("Error running pre-workflow hooks %s. Proceeding with %s command.", err, cmd.Name.String())
 	}
 
+	cmdRunner := buildCommentCommandRunner(c, cmd.CommandName())
+
 	cmdRunner.Run(ctx, cmd)
 }
 

server/events/command_runner_test.go

@@ -61,6 +61,7 @@ var approvePoliciesCommandRunner *events.ApprovePoliciesCommandRunner
 var planCommandRunner *events.PlanCommandRunner
 var applyCommandRunner *events.ApplyCommandRunner
 var unlockCommandRunner *events.UnlockCommandRunner
+var preWorkflowHooksCommandRunner events.PreWorkflowHooksCommandRunner
 
 func setup(t *testing.T) *vcsmocks.MockClient {
 	RegisterMockTestingT(t)
@@ -161,17 +162,22 @@ func setup(t *testing.T) *vcsmocks.MockClient {
 		models.UnlockCommand:          unlockCommandRunner,
 	}
 
+	preWorkflowHooksCommandRunner = mocks.NewMockPreWorkflowHooksCommandRunner()
+
+	When(preWorkflowHooksCommandRunner.RunPreHooks(matchers.AnyPtrToEventsCommandContext())).ThenReturn(nil)
+
 	ch = events.DefaultCommandRunner{
-		VCSClient:                 vcsClient,
-		CommentCommandRunnerByCmd: commentCommandRunnerByCmd,
-		EventParser:               eventParsing,
-		GithubPullGetter:          githubGetter,
-		GitlabMergeRequestGetter:  gitlabGetter,
-		AzureDevopsPullGetter:     azuredevopsGetter,
-		Logger:                    logger,
-		AllowForkPRs:              false,
-		AllowForkPRsFlag:          "allow-fork-prs-flag",
-		Drainer:                   drainer,
+		VCSClient:                     vcsClient,
+		CommentCommandRunnerByCmd:     commentCommandRunnerByCmd,
+		EventParser:                   eventParsing,
+		GithubPullGetter:              githubGetter,
+		GitlabMergeRequestGetter:      gitlabGetter,
+		AzureDevopsPullGetter:         azuredevopsGetter,
+		Logger:                        logger,
+		AllowForkPRs:                  false,
+		AllowForkPRsFlag:              "allow-fork-prs-flag",
+		Drainer:                       drainer,
+		PreWorkflowHooksCommandRunner: preWorkflowHooksCommandRunner,
 	}
 	return vcsClient
 }

server/events/delete_lock_command.go

@@ -45,6 +45,7 @@ func (l *DefaultDeleteLockCommand) DeleteLocksByPull(repoFullName string, pullNu
 		return err
 	}
 	if len(locks) == 0 {
+		l.Logger.Debug("No locks found for pull")
 		return nil
 	}
 
@@ -61,6 +62,7 @@ func (l *DefaultDeleteLockCommand) deleteWorkingDir(lock models.ProjectLock) {
 	// installations of Atlantis will have locks in their DB that do not have
 	// this field on PullRequest. We skip deleting the working dir in this case.
 	if lock.Pull.BaseRepo == (models.Repo{}) {
+		l.Logger.Debug("Not deleting the working dir.")
 		return
 	}
 	unlock, err := l.WorkingDirLocker.TryLock(lock.Pull.BaseRepo.FullName, lock.Pull.Num, lock.Workspace)