Fix schema jank

coder · kylecarbs · Sep 25, 2023 · Sep 3, 2023 · Sep 5, 2023 · Sep 5, 2023
commit 75388f701fb0804e3be45950f877eedefd48c2b3
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -1209,9 +1209,9 @@ func TestAgent_Lifecycle(t *testing.T) {
 
 		_, client, _, _, _ := setupAgent(t, agentsdk.Manifest{
 			Scripts: []codersdk.WorkspaceAgentScript{{
-				Script:     "sleep 3",
-				Timeout:    time.Nanosecond,
-				RunOnStart: true,
+				Script:         "sleep 3",
+				TimeoutSeconds: time.Nanosecond,
+				RunOnStart:     true,
 			}},
 		}, 0)
 
@@ -1234,9 +1234,9 @@ func TestAgent_Lifecycle(t *testing.T) {
 
 		_, client, _, _, _ := setupAgent(t, agentsdk.Manifest{
 			Scripts: []codersdk.WorkspaceAgentScript{{
-				Script:     "false",
-				Timeout:    30 * time.Second,
-				RunOnStart: true,
+				Script:         "false",
+				TimeoutSeconds: 30 * time.Second,
+				RunOnStart:     true,
 			}},
 		}, 0)
 
@@ -1259,9 +1259,9 @@ func TestAgent_Lifecycle(t *testing.T) {
 
 		_, client, _, _, _ := setupAgent(t, agentsdk.Manifest{
 			Scripts: []codersdk.WorkspaceAgentScript{{
-				Script:     "true",
-				Timeout:    30 * time.Second,
-				RunOnStart: true,
+				Script:         "true",
+				TimeoutSeconds: 30 * time.Second,
+				RunOnStart:     true,
 			}},
 		}, 0)
 
@@ -1284,9 +1284,9 @@ func TestAgent_Lifecycle(t *testing.T) {
 
 		_, client, _, _, closer := setupAgent(t, agentsdk.Manifest{
 			Scripts: []codersdk.WorkspaceAgentScript{{
-				Script:    "sleep 3",
-				Timeout:   30 * time.Second,
-				RunOnStop: true,
+				Script:         "sleep 3",
+				TimeoutSeconds: 30 * time.Second,
+				RunOnStop:      true,
 			}},
 		}, 0)
 
@@ -1325,9 +1325,9 @@ func TestAgent_Lifecycle(t *testing.T) {
 
 		_, client, _, _, closer := setupAgent(t, agentsdk.Manifest{
 			Scripts: []codersdk.WorkspaceAgentScript{{
-				Script:    "sleep 3",
-				Timeout:   time.Nanosecond,
-				RunOnStop: true,
+				Script:         "sleep 3",
+				TimeoutSeconds: time.Nanosecond,
+				RunOnStop:      true,
 			}},
 		}, 0)
 
@@ -1367,9 +1367,9 @@ func TestAgent_Lifecycle(t *testing.T) {
 
 		_, client, _, _, closer := setupAgent(t, agentsdk.Manifest{
 			Scripts: []codersdk.WorkspaceAgentScript{{
-				Script:    "false",
-				Timeout:   30 * time.Second,
-				RunOnStop: true,
+				Script:         "false",
+				TimeoutSeconds: 30 * time.Second,
+				RunOnStop:      true,
 			}},
 		}, 0)
 

diff --git a/agent/agentscripts/agentscripts.go b/agent/agentscripts/agentscripts.go
@@ -141,10 +141,10 @@ func (r *Runner) run(script codersdk.WorkspaceAgentScript) error {
 	}()
 
 	var cmd *exec.Cmd
-	if script.Timeout > 0 {
+	if script.TimeoutSeconds > 0 {
 		var cancel context.CancelFunc
 		// Add a buffer to forcefully kill with the context.
-		ctx, cancel = context.WithTimeout(ctx, script.Timeout+(3*time.Second))
+		ctx, cancel = context.WithTimeout(ctx, script.TimeoutSeconds+(3*time.Second))
 		defer cancel()
 	}
 
@@ -196,9 +196,9 @@ func (r *Runner) run(script codersdk.WorkspaceAgentScript) error {
 
 	// timeout stores whether the process timed out then was gracefully killed.
 	var timeout chan struct{}
-	if script.Timeout > 0 {
+	if script.TimeoutSeconds > 0 {
 		timeout = make(chan struct{})
-		timer := time.AfterFunc(script.Timeout, func() {
+		timer := time.AfterFunc(script.TimeoutSeconds, func() {
 			close(timeout)
 			err := cmd.Process.Signal(os.Interrupt)
 			if err != nil {
@@ -232,6 +232,7 @@ func (r *Runner) Close() error {
 		return nil
 	}
 	close(r.closed)
+	r.cron.Stop()
 	r.cmdCloseWait.Wait()
 	return nil
 }

diff --git a/agent/agentscripts/agentscripts_test.go b/agent/agentscripts/agentscripts_test.go
@@ -46,8 +46,8 @@ func TestTimeout(t *testing.T) {
 	runner := setup(t, nil)
 	defer runner.Close()
 	err := runner.Init([]codersdk.WorkspaceAgentScript{{
-		Script:  "sleep 3",
-		Timeout: time.Nanosecond,
+		Script:         "sleep 3",
+		TimeoutSeconds: time.Nanosecond,
 	}})
 	require.NoError(t, err)
 	require.ErrorIs(t, runner.Execute(nil), agentscripts.ErrTimeout)

diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -4557,7 +4557,7 @@ func (q *FakeQuerier) InsertWorkspaceAgentLogSources(_ context.Context, arg data
 		logSource := database.WorkspaceAgentLogSource{
 			ID:               source,
 			WorkspaceAgentID: arg.WorkspaceAgentID,
-			CreatedAt:        arg.CreatedAt[index],
+			CreatedAt:        arg.CreatedAt,
 			DisplayName:      arg.DisplayName[index],
 			Icon:             arg.Icon[index],
 		}
@@ -4586,7 +4586,7 @@ func (q *FakeQuerier) InsertWorkspaceAgentLogs(_ context.Context, arg database.I
 		logs = append(logs, database.WorkspaceAgentLog{
 			ID:          id,
 			AgentID:     arg.AgentID,
-			CreatedAt:   arg.CreatedAt[index],
+			CreatedAt:   arg.CreatedAt,
 			Level:       arg.Level[index],
 			LogSourceID: arg.LogSourceID,
 			Output:      output,
@@ -4650,8 +4650,8 @@ func (q *FakeQuerier) InsertWorkspaceAgentScripts(_ context.Context, arg databas
 			StartBlocksLogin: arg.StartBlocksLogin[index],
 			RunOnStart:       arg.RunOnStart[index],
 			RunOnStop:        arg.RunOnStop[index],
-			Timeout:          arg.Timeout[index],
-			CreatedAt:        arg.CreatedAt[index],
+			TimeoutSeconds:   arg.TimeoutSeconds[index],
+			CreatedAt:        arg.CreatedAt,
 		}
 		scripts = append(scripts, script)
 	}

diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -178,7 +178,7 @@ func WorkspaceAgentLogSource(t testing.TB, db database.Store, orig database.Work
 	sources, err := db.InsertWorkspaceAgentLogSources(genCtx, database.InsertWorkspaceAgentLogSourcesParams{
 		WorkspaceAgentID: takeFirst(orig.WorkspaceAgentID, uuid.New()),
 		ID:               []uuid.UUID{takeFirst(orig.ID, uuid.New())},
-		CreatedAt:        []time.Time{takeFirst(orig.CreatedAt, dbtime.Now())},
+		CreatedAt:        takeFirst(orig.CreatedAt, dbtime.Now()),
 		DisplayName:      []string{takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1))},
 		Icon:             []string{takeFirst(orig.Icon, namesgenerator.GetRandomName(1))},
 	})

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000155_workspace_agent_script.up.sql b/coderd/database/migrations/000155_workspace_agent_script.up.sql
@@ -1,7 +1,7 @@
 BEGIN;
 CREATE TABLE workspace_agent_log_sources (
 	workspace_agent_id uuid NOT NULL,
-	id uuid NOT NULL,
+	id uuid NOT NULL UNIQUE,
 	created_at timestamptz NOT NULL,
 	display_name varchar(127) NOT NULL,
 	icon text NOT NULL,
@@ -10,15 +10,15 @@ CREATE TABLE workspace_agent_log_sources (
 
 CREATE TABLE workspace_agent_scripts (
 	workspace_agent_id uuid NOT NULL,
-	log_source_id uuid NOT NULL,
+	log_source_id uuid NOT NULL REFERENCES workspace_agent_log_sources(id) ON DELETE CASCADE,
 	log_path text NOT NULL,
 	created_at timestamptz NOT NULL,
 	script text NOT NULL,
 	cron text NOT NULL,
 	start_blocks_login boolean NOT NULL,
 	run_on_start boolean NOT NULL,
 	run_on_stop boolean NOT NULL,
-	timeout integer NOT NULL
+	timeout_seconds integer NOT NULL
 );
 
 ALTER TABLE workspace_agent_logs ADD COLUMN log_source_id uuid NOT NULL;

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
@@ -154,7 +154,7 @@ INSERT INTO
 		workspace_agent_logs (agent_id, created_at, output, level, log_source_id)
 	SELECT
 		@agent_id :: uuid AS agent_id,
-		unnest(@created_at :: timestamptz [ ]) AS created_at,
+		@created_at :: timestamptz AS created_at,
 		unnest(@output :: VARCHAR(1024) [ ]) AS output,
 		unnest(@level :: log_level [ ]) AS level,
 		@log_source_id :: uuid AS log_source_id
@@ -165,8 +165,8 @@ INSERT INTO
 		workspace_agent_log_sources (workspace_agent_id, id, created_at, display_name, icon)
 	SELECT
 		@workspace_agent_id :: uuid AS workspace_agent_id,
+		@created_at :: timestamptz AS created_at,
 		unnest(@id :: uuid [ ]) AS id,
-		unnest(@created_at :: timestamptz [ ]) AS created_at,
 		unnest(@display_name :: VARCHAR(127) [ ]) AS display_name,
 		unnest(@icon :: text [ ]) AS icon
 	RETURNING workspace_agent_log_sources.*;