fix: fix broken tests and convert bug

DanielleMaywood · DanielleMaywood · commit 863c3dc1bc01 · 2024-09-20T08:40:05.000Z
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -1517,10 +1517,12 @@ func TestAgent_Lifecycle(t *testing.T) {
 			agentsdk.Manifest{
 				DERPMap: derpMap,
 				Scripts: []codersdk.WorkspaceAgentScript{{
+					ID:         uuid.New(),
 					LogPath:    "coder-startup-script.log",
 					Script:     "echo 1",
 					RunOnStart: true,
 				}, {
+					ID:        uuid.New(),
 					LogPath:   "coder-shutdown-script.log",
 					Script:    "echo " + expected,
 					RunOnStop: true,
diff --git a/coderd/agentapi/manifest_test.go b/coderd/agentapi/manifest_test.go
@@ -108,6 +108,7 @@ func TestGetManifest(t *testing.T) {
 		}
 		scripts = []database.WorkspaceAgentScript{
 			{
+				ID:               uuid.New(),
 				WorkspaceAgentID: agent.ID,
 				LogSourceID:      uuid.New(),
 				LogPath:          "/cool/log/path/1",
@@ -119,6 +120,7 @@ func TestGetManifest(t *testing.T) {
 				TimeoutSeconds:   60,
 			},
 			{
+				ID:               uuid.New(),
 				WorkspaceAgentID: agent.ID,
 				LogSourceID:      uuid.New(),
 				LogPath:          "/cool/log/path/2",
@@ -227,6 +229,7 @@ func TestGetManifest(t *testing.T) {
 		}
 		protoScripts = []*agentproto.WorkspaceAgentScript{
 			{
+				Id:               scripts[0].ID[:],
 				LogSourceId:      scripts[0].LogSourceID[:],
 				LogPath:          scripts[0].LogPath,
 				Script:           scripts[0].Script,
@@ -237,6 +240,7 @@ func TestGetManifest(t *testing.T) {
 				Timeout:          durationpb.New(time.Duration(scripts[0].TimeoutSeconds) * time.Second),
 			},
 			{
+				Id:               scripts[1].ID[:],
 				LogSourceId:      scripts[1].LogSourceID[:],
 				LogPath:          scripts[1].LogPath,
 				Script:           scripts[1].Script,
diff --git a/codersdk/agentsdk/convert.go b/codersdk/agentsdk/convert.go
@@ -184,6 +184,7 @@ func AgentScriptFromProto(protoScript *proto.WorkspaceAgentScript) (codersdk.Wor
 
 func ProtoFromScript(s codersdk.WorkspaceAgentScript) *proto.WorkspaceAgentScript {
 	return &proto.WorkspaceAgentScript{
+		Id:               s.ID[:],
 		DisplayName:      s.DisplayName,
 		LogSourceId:      s.LogSourceID[:],
 		LogPath:          s.LogPath,
diff --git a/codersdk/agentsdk/convert_test.go b/codersdk/agentsdk/convert_test.go
@@ -106,6 +106,7 @@ func TestManifest(t *testing.T) {
 		},
 		Scripts: []codersdk.WorkspaceAgentScript{
 			{
+				ID:               uuid.New(),
 				LogSourceID:      uuid.New(),
 				LogPath:          "/var/log/script.log",
 				Script:           "script",
@@ -116,6 +117,7 @@ func TestManifest(t *testing.T) {
 				Timeout:          time.Second,
 			},
 			{
+				ID:               uuid.New(),
 				LogSourceID:      uuid.New(),
 				LogPath:          "/var/log/script2.log",
 				Script:           "script2",

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ func TestGetManifest(t *testing.T) {`
`108`	`108`	`}`
`109`	`109`	`scripts = []database.WorkspaceAgentScript{`
`110`	`110`	`{`
	`111`	`+ ID: uuid.New(),`
`111`	`112`	`WorkspaceAgentID: agent.ID,`
`112`	`113`	`LogSourceID: uuid.New(),`
`113`	`114`	`LogPath: "/cool/log/path/1",`
`@@ -119,6 +120,7 @@ func TestGetManifest(t *testing.T) {`
`119`	`120`	`TimeoutSeconds: 60,`
`120`	`121`	`},`
`121`	`122`	`{`
	`123`	`+ ID: uuid.New(),`
`122`	`124`	`WorkspaceAgentID: agent.ID,`
`123`	`125`	`LogSourceID: uuid.New(),`
`124`	`126`	`LogPath: "/cool/log/path/2",`
`@@ -227,6 +229,7 @@ func TestGetManifest(t *testing.T) {`
`227`	`229`	`}`
`228`	`230`	`protoScripts = []*agentproto.WorkspaceAgentScript{`
`229`	`231`	`{`
	`232`	`+ Id: scripts[0].ID[:],`
`230`	`233`	`LogSourceId: scripts[0].LogSourceID[:],`
`231`	`234`	`LogPath: scripts[0].LogPath,`
`232`	`235`	`Script: scripts[0].Script,`
`@@ -237,6 +240,7 @@ func TestGetManifest(t *testing.T) {`
`237`	`240`	`Timeout: durationpb.New(time.Duration(scripts[0].TimeoutSeconds) * time.Second),`
`238`	`241`	`},`
`239`	`242`	`{`
	`243`	`+ Id: scripts[1].ID[:],`
`240`	`244`	`LogSourceId: scripts[1].LogSourceID[:],`
`241`	`245`	`LogPath: scripts[1].LogPath,`
`242`	`246`	`Script: scripts[1].Script,`