add coderd test

sreya · sreya · commit 3ef47ecff626 · 2023-08-28T21:55:38.000Z
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -4431,6 +4431,8 @@ func (q *FakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.Inser
 		DisplayApps:              arg.DisplayApps,
 	}
 
+	fmt.Printf("display apps: %+v\n", arg.DisplayApps)
+
 	q.workspaceAgents = append(q.workspaceAgents, agent)
 	return agent, nil
 }
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1360,7 +1360,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
 		ShutdownScript:               dbAgent.ShutdownScript.String,
 		ShutdownScriptTimeoutSeconds: dbAgent.ShutdownScriptTimeoutSeconds,
 		Subsystems:                   subsystems,
-		DisplayApps:                  convertDefaultApps(dbAgent.DisplayApps),
+		DisplayApps:                  convertDisplayApps(dbAgent.DisplayApps),
 	}
 	node := coordinator.Node(dbAgent.ID)
 	if node != nil {
@@ -1422,7 +1422,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin
 	return workspaceAgent, nil
 }
 
-func convertDefaultApps(apps []database.DisplayApp) []codersdk.DisplayApp {
+func convertDisplayApps(apps []database.DisplayApp) []codersdk.DisplayApp {
 	if apps == nil {
 		return codersdk.DefaultApps
 	}
@@ -1432,6 +1432,8 @@ func convertDefaultApps(apps []database.DisplayApp) []codersdk.DisplayApp {
 		switch codersdk.DisplayApp(app) {
 		case codersdk.DisplayAppVSCodeDesktop, codersdk.DisplayAppVSCodeInsiders, codersdk.DisplayAppPortForward, codersdk.DisplayAppWebTerminal, codersdk.DisplayAppSSH:
 			dapps = append(dapps, codersdk.DisplayApp(app))
+		default:
+			fmt.Println("WTF: ", app)
 		}
 	}
 
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -174,6 +174,93 @@ func TestWorkspaceAgent(t *testing.T) {
 		require.False(t, workspace.LatestBuild.Resources[0].Agents[0].Health.Healthy)
 		require.NotEmpty(t, workspace.LatestBuild.Resources[0].Agents[0].Health.Reason)
 	})
+
+	t.Run("DisplayApps", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, &coderdtest.Options{
+			IncludeProvisionerDaemon: true,
+		})
+		user := coderdtest.CreateFirstUser(t, client)
+		authToken := uuid.NewString()
+		tmpDir := t.TempDir()
+		apps := &proto.DisplayApps{
+			Vscode:               true,
+			VscodeInsiders:       true,
+			WebTerminal:          true,
+			PortForwardingHelper: true,
+			SshHelper:            true,
+		}
+
+		echoResp := &echo.Responses{
+			Parse:         echo.ParseComplete,
+			ProvisionPlan: echo.PlanComplete,
+			ProvisionApply: []*proto.Response{{
+				Type: &proto.Response_Apply{
+					Apply: &proto.ApplyComplete{
+						Resources: []*proto.Resource{{
+							Name: "example",
+							Type: "aws_instance",
+							Agents: []*proto.Agent{{
+								Id:        uuid.NewString(),
+								Directory: tmpDir,
+								Auth: &proto.Agent_Token{
+									Token: authToken,
+								},
+								DisplayApps: apps,
+							},
+							}},
+						}},
+				},
+			}},
+		}
+
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResp)
+		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+		workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
+		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		workspace, err := client.Workspace(ctx, workspace.ID)
+		require.NoError(t, err)
+		agent, err := client.WorkspaceAgent(ctx, workspace.LatestBuild.Resources[0].Agents[0].ID)
+		require.NoError(t, err)
+		expectedApps := []codersdk.DisplayApp{
+			codersdk.DisplayAppPortForward,
+			codersdk.DisplayAppSSH,
+			codersdk.DisplayAppVSCodeDesktop,
+			codersdk.DisplayAppVSCodeInsiders,
+			codersdk.DisplayAppWebTerminal,
+		}
+		require.ElementsMatch(t, expectedApps, agent.DisplayApps)
+
+		// Flips all the apps to false.
+		apps.PortForwardingHelper = false
+		apps.Vscode = false
+		apps.VscodeInsiders = false
+		apps.SshHelper = false
+		apps.WebTerminal = false
+
+		version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, echoResp,
+			func(req *codersdk.CreateTemplateVersionRequest) {
+				req.TemplateID = template.ID
+			})
+
+		err = client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{
+			ID: version.ID,
+		})
+		require.NoError(t, err)
+		coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
+		// Creating another workspace is just easier.
+		workspace = coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
+		build := coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
+		require.NoError(t, err)
+		agent, err = client.WorkspaceAgent(ctx, build.Resources[0].Agents[0].ID)
+		require.NoError(t, err)
+		require.Len(t, agent.DisplayApps, 0)
+	})
 }
 
 func TestWorkspaceAgentStartupLogs(t *testing.T) {
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -136,11 +136,11 @@ type WorkspaceAgentMetadata struct {
 type DisplayApp string
 
 const (
-	DisplayAppVSCodeDesktop  DisplayApp = "vscode-desktop"
-	DisplayAppVSCodeInsiders DisplayApp = "vscode-insiders"
-	DisplayAppWebTerminal    DisplayApp = "web-terminal"
-	DisplayAppPortForward    DisplayApp = "port-forward-helper"
-	DisplayAppSSH            DisplayApp = "ssh-helper"
+	DisplayAppVSCodeDesktop  DisplayApp = "vscode"
+	DisplayAppVSCodeInsiders DisplayApp = "vscode_insiders"
+	DisplayAppWebTerminal    DisplayApp = "web_terminal"
+	DisplayAppPortForward    DisplayApp = "port_forwarding_helper"
+	DisplayAppSSH            DisplayApp = "ssh_helper"
 )
 
 var DefaultApps = []DisplayApp{DisplayAppVSCodeDesktop, DisplayAppWebTerminal, DisplayAppPortForward, DisplayAppWebTerminal, DisplayAppSSH}

Original file line number	Diff line number	Diff line change
`@@ -4431,6 +4431,8 @@ func (q *FakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.Inser`
`4431`	`4431`	`DisplayApps: arg.DisplayApps,`
`4432`	`4432`	`}`
`4433`	`4433`
	`4434`	`+ fmt.Printf("display apps: %+v\n", arg.DisplayApps)`
	`4435`	`+`
`4434`	`4436`	`q.workspaceAgents = append(q.workspaceAgents, agent)`
`4435`	`4437`	`return agent, nil`
`4436`	`4438`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1360,7 +1360,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin`
`1360`	`1360`	`ShutdownScript: dbAgent.ShutdownScript.String,`
`1361`	`1361`	`ShutdownScriptTimeoutSeconds: dbAgent.ShutdownScriptTimeoutSeconds,`
`1362`	`1362`	`Subsystems: subsystems,`
`1363`		`- DisplayApps: convertDefaultApps(dbAgent.DisplayApps),`
	`1363`	`+ DisplayApps: convertDisplayApps(dbAgent.DisplayApps),`
`1364`	`1364`	`}`
`1365`	`1365`	`node := coordinator.Node(dbAgent.ID)`
`1366`	`1366`	`if node != nil {`
`@@ -1422,7 +1422,7 @@ func convertWorkspaceAgent(derpMap *tailcfg.DERPMap, coordinator tailnet.Coordin`
`1422`	`1422`	`return workspaceAgent, nil`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`		`-func convertDefaultApps(apps []database.DisplayApp) []codersdk.DisplayApp {`
	`1425`	`+func convertDisplayApps(apps []database.DisplayApp) []codersdk.DisplayApp {`
`1426`	`1426`	`if apps == nil {`
`1427`	`1427`	`return codersdk.DefaultApps`
`1428`	`1428`	`}`
`@@ -1432,6 +1432,8 @@ func convertDefaultApps(apps []database.DisplayApp) []codersdk.DisplayApp {`
`1432`	`1432`	`switch codersdk.DisplayApp(app) {`
`1433`	`1433`	`case codersdk.DisplayAppVSCodeDesktop, codersdk.DisplayAppVSCodeInsiders, codersdk.DisplayAppPortForward, codersdk.DisplayAppWebTerminal, codersdk.DisplayAppSSH:`
`1434`	`1434`	`dapps = append(dapps, codersdk.DisplayApp(app))`
	`1435`	`+ default:`
	`1436`	`+ fmt.Println("WTF: ", app)`
`1435`	`1437`	`}`
`1436`	`1438`	`}`
`1437`	`1439`