[DDO-3289] Improve error text in deploy hook test routes (#351)

broadinstitute · Nov 3, 2023 · 4047f8a · 4047f8a
1 parent 4f061b8
commit 4047f8a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/sherlock/internal/api/sherlock/github_actions_deploy_hooks_v3_test_run.go b/sherlock/internal/api/sherlock/github_actions_deploy_hooks_v3_test_run.go
@@ -80,7 +80,7 @@ func githubActionsDeployHooksV3TestRun(ctx *gin.Context) {
 		*hook.GithubActionsWorkflowPath,
 		*hook.GithubActionsDefaultRef,
 		workflowInputs); err != nil {
-		errors.AbortRequest(ctx, err)
+		errors.AbortRequest(ctx, fmt.Errorf("error between Sherlock and GitHub: %w", err))
 		return
 	}
 	ctx.JSON(http.StatusOK, GithubActionsDeployHookTestRunResponse{

diff --git a/sherlock/internal/api/sherlock/github_actions_deploy_hooks_v3_test_run_test.go b/sherlock/internal/api/sherlock/github_actions_deploy_hooks_v3_test_run_test.go
@@ -123,7 +123,7 @@ func (s *handlerSuite) TestGithubActionsDeployHooksV3TestRun() {
 					GithubActionsDeployHookTestRunRequest{Execute: utils.PointerTo(true)}),
 				&got)
 			s.Equal(http.StatusBadRequest, code)
-			s.Equal(errors.BadRequest, got.Message)
+			s.Equal(fmt.Sprintf("error between Sherlock and GitHub: %s", errors.BadRequest), got.Message)
 		})
 	})
 }
diff --git a/sherlock/internal/api/sherlock/slack_deploy_hooks_v3_test_run.go b/sherlock/internal/api/sherlock/slack_deploy_hooks_v3_test_run.go
@@ -66,7 +66,7 @@ func slackDeployHooksV3TestRun(ctx *gin.Context) {
 	}
 	if err = slack.SendMessageReturnError(ctx, *hook.SlackChannel,
 		fmt.Sprintf("This is a deploy hook test message from Beehive, triggered by %s", user.SlackReference())); err != nil {
-		errors.AbortRequest(ctx, err)
+		errors.AbortRequest(ctx, fmt.Errorf("error between Sherlock and Slack: %w", err))
 		return
 	}
 	ctx.JSON(http.StatusOK, SlackDeployHookTestRunResponse{OK: true})

diff --git a/sherlock/internal/api/sherlock/slack_deploy_hooks_v3_test_run_test.go b/sherlock/internal/api/sherlock/slack_deploy_hooks_v3_test_run_test.go
@@ -115,7 +115,7 @@ func (s *handlerSuite) TestSlackDeployHooksV3TestRun() {
 					SlackDeployHookTestRunRequest{Execute: utils.PointerTo(true)}),
 				&got)
 			s.Equal(http.StatusBadRequest, code)
-			s.Equal(errors.BadRequest, got.Message)
+			s.Equal(fmt.Sprintf("error between Sherlock and Slack: %s", errors.BadRequest), got.Message)
 		})
 	})
 }