fix: Return correct status when using custom policy

server/core/runtime/run_step_runner.go

@@ -95,9 +95,9 @@ func (r *RunStepRunner) Run(
 		err = fmt.Errorf("%s: running %q in %q: \n%s", err, command, path, output)
 		if !ctx.CustomPolicyCheck {
 			ctx.Log.Debug("error: %s", err)
-			return "", err
 		}
 		ctx.Log.Debug("Treating custom policy tool error exit code as a policy failure.  Error output: %s", err)
+		return "", err
 	}
 
 	switch postProcessOutput {

server/core/runtime/run_step_runner_test.go

@@ -167,6 +167,7 @@ func TestRunStepRunner_Run(t *testing.T) {
 				TerraformVersion:      projVersion,
 				ProjectName:           c.ProjectName,
 				EscapedCommentArgs:    []string{"-target=resource1", "-target=resource2"},
+				CustomPolicyCheck:     true,
 			}
 			out, err := r.Run(ctx, nil, c.Command, tmpDir, map[string]string{"test": "var"}, true, valid.PostProcessRunOutputShow)
 			if c.ExpErr != "" {