feat: add 'ran_on_start' and 'blocked_login' fields

coder · DanielleMaywood · Sep 24, 2024 · Sep 17, 2024 · Sep 17, 2024 · Sep 17, 2024
commit 9cb1252d029b09bd30214708abda75a92a17ed1c
diff --git a/agent/agentscripts/agentscripts.go b/agent/agentscripts/agentscripts.go
@@ -323,10 +323,12 @@ func (r *Runner) run(ctx context.Context, script codersdk.WorkspaceAgentScript)
 
 		_, err = r.scriptCompleted(ctx, &proto.WorkspaceAgentScriptCompletedRequest{
 			Timing: &proto.Timing{
-				DisplayName: script.DisplayName,
-				Start:       timestamppb.New(start),
-				End:         timestamppb.New(end),
-				ExitCode:    int32(exitCode),
+				DisplayName:  script.DisplayName,
+				Start:        timestamppb.New(start),
+				End:          timestamppb.New(end),
+				ExitCode:     int32(exitCode),
+				RanOnStart:   script.RunOnStart,
+				BlockedLogin: script.StartBlocksLogin,
 			},
 		})
 	}()

@@ -277,6 +277,8 @@ message Timing {
     google.protobuf.Timestamp start = 2;
     google.protobuf.Timestamp end = 3;
     int32 exit_code = 4;
+    bool ran_on_start = 5;
+    bool blocked_login = 6;
 }
 
 service Agent {

diff --git a/coderd/agentapi/scripts.go b/coderd/agentapi/scripts.go
@@ -29,11 +29,13 @@ func (s *ScriptsAPI) ScriptCompleted(ctx context.Context, req *agentproto.Worksp
 	}
 
 	_, err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
-		JobID:       resource.JobID,
-		DisplayName: req.Timing.DisplayName,
-		StartedAt:   req.Timing.Start.AsTime(),
-		EndedAt:     req.Timing.End.AsTime(),
-		ExitCode:    req.Timing.ExitCode,
+		JobID:        resource.JobID,
+		DisplayName:  req.Timing.DisplayName,
+		StartedAt:    req.Timing.Start.AsTime(),
+		EndedAt:      req.Timing.End.AsTime(),
+		ExitCode:     req.Timing.ExitCode,
+		RanOnStart:   req.Timing.RanOnStart,
+		BlockedLogin: req.Timing.BlockedLogin,
 	})
 	if err != nil {
 		return nil, xerrors.Errorf("insert workspace agent script timings into database: %w", err)

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -7838,11 +7838,13 @@ func (q *FakeQuerier) InsertWorkspaceAgentScriptTimings(_ context.Context, arg d
 
 	//nolint:gosimple // Stop linter suggesting 'arg' should be of type database.WorkspaceAgentScriptTiming
 	scriptTiming := database.WorkspaceAgentScriptTiming{
-		StartedAt:   arg.StartedAt,
-		EndedAt:     arg.EndedAt,
-		ExitCode:    arg.ExitCode,
-		DisplayName: arg.DisplayName,
-		JobID:       arg.JobID,
+		StartedAt:    arg.StartedAt,
+		EndedAt:      arg.EndedAt,
+		ExitCode:     arg.ExitCode,
+		DisplayName:  arg.DisplayName,
+		JobID:        arg.JobID,
+		RanOnStart:   arg.RanOnStart,
+		BlockedLogin: arg.BlockedLogin,
 	}
 
 	q.workspaceAgentScriptTimings = append(q.workspaceAgentScriptTimings, scriptTiming)

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000255_workspace_agent_script_timings.up.sql b/coderd/database/migrations/000255_workspace_agent_script_timings.up.sql
@@ -1,10 +1,12 @@
 CREATE TABLE workspace_agent_script_timings
 (
-    job_id       uuid not null references provisioner_jobs (id) on delete cascade,
-    display_name text not null,
-    started_at   timestamp with time zone not null,
-    ended_at     timestamp with time zone not null,
-    exit_code    int not null
+    job_id        uuid not null references provisioner_jobs (id) on delete cascade,
+    display_name  text not null,
+    started_at    timestamp with time zone not null,
+    ended_at      timestamp with time zone not null,
+    exit_code     int not null,
+    ran_on_start  bool not null,
+    blocked_login bool not null
 );
 
 ALTER TABLE workspace_agent_scripts ADD COLUMN display_name text not null default '';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagents.sql b/coderd/database/queries/workspaceagents.sql
@@ -295,7 +295,9 @@ INSERT INTO
         display_name,
         started_at,
         ended_at,
-        exit_code
+        exit_code,
+        ran_on_start,
+        blocked_login
     )
 VALUES
-    ($1, $2, $3, $4, $5) RETURNING *;
+    ($1, $2, $3, $4, $5, $6, $7) RETURNING *;