Merge branch 'main' into dm-add-agent-timings

DanielleMaywood · DanielleMaywood · commit a8192a5cc55e · 2024-09-20T13:49:36.000Z
diff --git a/agent/proto/agent.pb.go b/agent/proto/agent.pb.go
diff --git a/agent/proto/agent.proto b/agent/proto/agent.proto
@@ -53,6 +53,7 @@ message WorkspaceAgentScript {
 	bool run_on_stop = 6;
 	bool start_blocks_login = 7;
 	google.protobuf.Duration timeout = 8;
+	string display_name = 9;
 	bytes id = 10;
 }
 
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000256_add_display_name_to_workspace_agent_scripts.down.sql b/coderd/database/migrations/000256_add_display_name_to_workspace_agent_scripts.down.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace_agent_scripts DROP COLUMN display_name;
diff --git a/coderd/database/migrations/000256_add_display_name_to_workspace_agent_scripts.up.sql b/coderd/database/migrations/000256_add_display_name_to_workspace_agent_scripts.up.sql
@@ -0,0 +1,8 @@
+ALTER TABLE workspace_agent_scripts ADD COLUMN display_name text;
+
+UPDATE workspace_agent_scripts
+	SET display_name = workspace_agent_log_sources.display_name
+FROM workspace_agent_log_sources
+	WHERE workspace_agent_scripts.log_source_id = workspace_agent_log_sources.id;
+
+ALTER TABLE workspace_agent_scripts ALTER COLUMN display_name SET 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/workspacescripts.sql b/coderd/database/queries/workspacescripts.sql
@@ -1,6 +1,6 @@
 -- name: InsertWorkspaceAgentScripts :many
 INSERT INTO
-	workspace_agent_scripts ( workspace_agent_id, created_at, log_source_id, log_path, script, cron, start_blocks_login, run_on_start, run_on_stop, timeout_seconds, display_name, id )
+	workspace_agent_scripts (workspace_agent_id, created_at, log_source_id, log_path, script, cron, start_blocks_login, run_on_start, run_on_stop, timeout_seconds, display_name, id)
 SELECT
 	@workspace_agent_id :: uuid AS workspace_agent_id,
 	@created_at :: timestamptz AS created_at,
@@ -12,6 +12,7 @@ SELECT
 	unnest(@run_on_start :: boolean [ ]) AS run_on_start,
 	unnest(@run_on_stop :: boolean [ ]) AS run_on_stop,
 	unnest(@timeout_seconds :: integer [ ]) AS timeout_seconds,
+	unnest(@display_name :: text [ ]) AS display_name,
 	unnest(@id :: uuid [ ]) AS id
 RETURNING workspace_agent_scripts.*;
 
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -1865,6 +1865,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 			StartBlocksLogin: scriptStartBlocksLogin,
 			RunOnStart:       scriptRunOnStart,
 			RunOnStop:        scriptRunOnStop,
+			DisplayName:      scriptDisplayName,
 			ID:               scriptIDs,
 		})
 		if err != nil {
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -978,6 +978,7 @@ func convertScripts(dbScripts []database.WorkspaceAgentScript) []codersdk.Worksp
 			RunOnStop:        dbScript.RunOnStop,
 			StartBlocksLogin: dbScript.StartBlocksLogin,
 			Timeout:          time.Duration(dbScript.TimeoutSeconds) * time.Second,
+			DisplayName:      dbScript.DisplayName,
 		})
 	}
 	return scripts
diff --git a/codersdk/agentsdk/convert.go b/codersdk/agentsdk/convert.go
@@ -178,6 +178,7 @@ func AgentScriptFromProto(protoScript *proto.WorkspaceAgentScript) (codersdk.Wor
 		RunOnStop:        protoScript.RunOnStop,
 		StartBlocksLogin: protoScript.StartBlocksLogin,
 		Timeout:          protoScript.Timeout.AsDuration(),
+		DisplayName:      protoScript.DisplayName,
 	}, nil
 }
 
@@ -192,6 +193,7 @@ func ProtoFromScript(s codersdk.WorkspaceAgentScript) *proto.WorkspaceAgentScrip
 		RunOnStop:        s.RunOnStop,
 		StartBlocksLogin: s.StartBlocksLogin,
 		Timeout:          durationpb.New(s.Timeout),
+		DisplayName:      s.DisplayName,
 	}
 }
 
diff --git a/codersdk/agentsdk/convert_test.go b/codersdk/agentsdk/convert_test.go
@@ -115,6 +115,7 @@ func TestManifest(t *testing.T) {
 				RunOnStop:        true,
 				StartBlocksLogin: true,
 				Timeout:          time.Second,
+				DisplayName:      "foo",
 			},
 			{
 				ID:               uuid.New(),
@@ -126,6 +127,7 @@ func TestManifest(t *testing.T) {
 				RunOnStop:        true,
 				StartBlocksLogin: true,
 				Timeout:          time.Second * 4,
+				DisplayName:      "bar",
 			},
 		},
 	}
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -186,7 +186,6 @@ type WorkspaceAgentLogSource struct {
 
 type WorkspaceAgentScript struct {
 	ID               uuid.UUID     `json:"id" format:"uuid"`
-	DisplayName      string        `json:"display_name"`
 	LogSourceID      uuid.UUID     `json:"log_source_id" format:"uuid"`
 	LogPath          string        `json:"log_path"`
 	Script           string        `json:"script"`
@@ -195,6 +194,7 @@ type WorkspaceAgentScript struct {
 	RunOnStop        bool          `json:"run_on_stop"`
 	StartBlocksLogin bool          `json:"start_blocks_login"`
 	Timeout          time.Duration `json:"timeout"`
+	DisplayName      string        `json:"display_name"`
 }
 
 type WorkspaceAgentHealth struct {
diff --git a/go.mod b/go.mod
@@ -39,7 +39,7 @@ replace github.com/dlclark/regexp2 => github.com/dlclark/regexp2 v1.7.0
 
 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
 // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
-replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374
+replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240920101701-ddd4a72e1b56
 
 // This is replaced to include
 // 1. a fix for a data race: c.f. https://github.com/tailscale/wireguard-go/pull/25
diff --git a/go.sum b/go.sum
@@ -230,8 +230,8 @@ github.com/coder/serpent v0.8.0 h1:6OR+k6fekhSeEDmwwzBgnSjaa7FfGGrMlc3GoAEH9dg=
 github.com/coder/serpent v0.8.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
-github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374 h1:a5Eg7D5e2oAc0tN56ee4yxtiTo76ztpRlk6geljaZp8=
-github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374/go.mod h1:rp6BIJxCp127/hvvDWNkHC9MxAlKvQfoOtBr8s5sCqo=
+github.com/coder/tailscale v1.1.1-0.20240920101701-ddd4a72e1b56 h1:yIZA92mej1q0h/YJkZMottzwe2Pv3UiSkNaDnHV4PwE=
+github.com/coder/tailscale v1.1.1-0.20240920101701-ddd4a72e1b56/go.mod h1:rp6BIJxCp127/hvvDWNkHC9MxAlKvQfoOtBr8s5sCqo=
 github.com/coder/terraform-provider-coder v1.0.2 h1:xKbnJF/XUxcUJlZoC3ZkNOj4PZvk5Stdkel2TCZluDQ=
 github.com/coder/terraform-provider-coder v1.0.2/go.mod h1:1f3EjO+DA9QcIbM7sBSk/Ffw3u7kh6vXNBIQfV59yUk=
 github.com/coder/wgtunnel v0.1.13-0.20240522110300-ade90dfb2da0 h1:C2/eCr+r0a5Auuw3YOiSyLNHkdMtyCZHPFBx7syN4rk=
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -896,6 +896,7 @@ export const MockWorkspaceAgentScript: TypesGen.WorkspaceAgentScript = {
 	script: "echo 'hello world'",
 	start_blocks_login: false,
 	timeout: 0,
+	display_name: "Say Hello",
 };
 
 export const MockWorkspaceAgent: TypesGen.WorkspaceAgent = {
diff --git a/site/src/theme/icons.json b/site/src/theme/icons.json
@@ -21,6 +21,7 @@
 	"confluence.svg",
 	"container.svg",
 	"cpp.svg",
+	"cursor.svg",
 	"database.svg",
 	"datagrip.svg",
 	"dataspell.svg",
diff --git a/site/static/icon/cursor.svg b/site/static/icon/cursor.svg

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ message WorkspaceAgentScript {`
`53`	`53`	`bool run_on_stop = 6;`
`54`	`54`	`bool start_blocks_login = 7;`
`55`	`55`	`google.protobuf.Duration timeout = 8;`
	`56`	`+ string display_name = 9;`
`56`	`57`	`bytes id = 10;`
`57`	`58`	`}`
`58`	`59`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE workspace_agent_scripts DROP COLUMN display_name;`
Original file line number	Diff line number	Diff line change
`@@ -978,6 +978,7 @@ func convertScripts(dbScripts []database.WorkspaceAgentScript) []codersdk.Worksp`
`978`	`978`	`RunOnStop: dbScript.RunOnStop,`
`979`	`979`	`StartBlocksLogin: dbScript.StartBlocksLogin,`
`980`	`980`	`Timeout: time.Duration(dbScript.TimeoutSeconds) * time.Second,`
	`981`	`+ DisplayName: dbScript.DisplayName,`
`981`	`982`	`})`
`982`	`983`	`}`
`983`	`984`	`return scripts`