fix: debug log on r.scriptCompleted being nil

DanielleMaywood · DanielleMaywood · commit ed31199f8feb · 2024-09-20T11:19:43.000Z
diff --git a/agent/agentscripts/agentscripts.go b/agent/agentscripts/agentscripts.go
@@ -331,6 +331,11 @@ func (r *Runner) run(ctx context.Context, script codersdk.WorkspaceAgentScript,
 			logger.Info(ctx, fmt.Sprintf("%s script completed", logPath), slog.F("execution_time", execTime), slog.F("exit_code", exitCode))
 		}
 
+		if r.scriptCompleted == nil {
+			logger.Debug(ctx, "r.scriptCompleted unexpectedly nil")
+			return
+		}
+
 		var stage proto.Timing_Stage
 		switch option {
 		case ExecuteStartScripts:
@@ -341,21 +346,19 @@ func (r *Runner) run(ctx context.Context, script codersdk.WorkspaceAgentScript,
 			stage = proto.Timing_CRON
 		}
 
-		if r.scriptCompleted != nil {
-			_, err = r.scriptCompleted(ctx, &proto.WorkspaceAgentScriptCompletedRequest{
-				Timing: &proto.Timing{
-					ScriptId:    script.ID[:],
-					DisplayName: script.DisplayName,
-					Start:       timestamppb.New(start),
-					End:         timestamppb.New(end),
-					ExitCode:    int32(exitCode),
-					Stage:       stage,
-					TimedOut:    errors.Is(err, ErrTimeout),
-				},
-			})
-			if err != nil {
-				logger.Error(ctx, fmt.Sprintf("reporting script completed: %s", err.Error()))
-			}
+		_, err = r.scriptCompleted(ctx, &proto.WorkspaceAgentScriptCompletedRequest{
+			Timing: &proto.Timing{
+				ScriptId:    script.ID[:],
+				DisplayName: script.DisplayName,
+				Start:       timestamppb.New(start),
+				End:         timestamppb.New(end),
+				ExitCode:    int32(exitCode),
+				Stage:       stage,
+				TimedOut:    errors.Is(err, ErrTimeout),
+			},
+		})
+		if err != nil {
+			logger.Error(ctx, fmt.Sprintf("reporting script completed: %s", err.Error()))
 		}
 	}()
 
