pr comments

sreya · sreya · commit 9be2234b02ce · 2023-08-29T23:01:43.000Z
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -10,8 +10,6 @@ import (
 	"github.com/coder/coder/v2/coderd/rbac"
 )
 
-var DefaultDisplayApps = []DisplayApp{DisplayAppVscode, DisplayAppWebTerminal, DisplayAppSSHHelper, DisplayAppPortForwardingHelper}
-
 type WorkspaceStatus string
 
 const (
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
@@ -1528,7 +1528,7 @@ func TestInsertWorkspaceResource(t *testing.T) {
 		}, agent.DisplayApps)
 	})
 
-	t.Run("AllDefaultApps", func(t *testing.T) {
+	t.Run("AllDisplayApps", func(t *testing.T) {
 		t.Parallel()
 		db := dbfake.New()
 		job := uuid.New()
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -15,6 +15,7 @@ import (
 	stringutil "github.com/coder/coder/v2/coderd/util/strings"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/provisioner"
+	"github.com/coder/coder/v2/provisionersdk"
 	"github.com/coder/coder/v2/provisionersdk/proto"
 )
 
@@ -192,16 +193,10 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 
 			// If a user doesn't specify 'display_apps' then they default
 			// into all apps except VSCode Insiders.
-			displayApps := proto.DisplayApps{
-				Vscode:               true,
-				VscodeInsiders:       false,
-				WebTerminal:          true,
-				PortForwardingHelper: true,
-				SshHelper:            true,
-			}
+			displayApps := provisionersdk.DefaultDisplayApps()
 
 			if len(attrs.DisplayApps) != 0 {
-				displayApps = proto.DisplayApps{
+				displayApps = &proto.DisplayApps{
 					Vscode:               attrs.DisplayApps[0].VSCode,
 					VscodeInsiders:       attrs.DisplayApps[0].VSCodeInsiders,
 					WebTerminal:          attrs.DisplayApps[0].WebTerminal,
@@ -226,7 +221,7 @@ func ConvertState(modules []*tfjson.StateModule, rawGraph string) (*State, error
 				ShutdownScript:               attrs.ShutdownScript,
 				ShutdownScriptTimeoutSeconds: attrs.ShutdownScriptTimeoutSeconds,
 				Metadata:                     metadata,
-				DisplayApps:                  &displayApps,
+				DisplayApps:                  displayApps,
 			}
 			switch attrs.Auth {
 			case "token":
diff --git a/provisionersdk/agent.go b/provisionersdk/agent.go
@@ -4,6 +4,8 @@ import (
 	_ "embed"
 	"fmt"
 	"strings"
+
+	"github.com/coder/coder/v2/provisionersdk/proto"
 )
 
 var (
@@ -35,11 +37,6 @@ var (
 			"arm64": darwinScript,
 		},
 	}
-
-	// AllDisplayApps indicates that a user has not specified a 'display_apps' block in their template.
-	// There is no way to distinguish between a nil array (unset) and an empty array in protobuf and an
-	// empty array already signifies that all display apps should be disabled.
-	AllDisplayApps = "*"
 )
 
 // AgentScriptEnv returns a key-pair of scripts that are consumed
@@ -55,3 +52,15 @@ func AgentScriptEnv() map[string]string {
 	}
 	return env
 }
+
+// DefaultDisplayApps returns the default display applications to enable
+// if none are specified in a template.
+func DefaultDisplayApps() *proto.DisplayApps {
+	return &proto.DisplayApps{
+		Vscode:               true,
+		VscodeInsiders:       false,
+		WebTerminal:          true,
+		PortForwardingHelper: true,
+		SshHelper:            true,
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@ import (`
`10`	`10`	`"github.com/coder/coder/v2/coderd/rbac"`
`11`	`11`	`)`
`12`	`12`
`13`		`-var DefaultDisplayApps = []DisplayApp{DisplayAppVscode, DisplayAppWebTerminal, DisplayAppSSHHelper, DisplayAppPortForwardingHelper}`
`14`		`-`
`15`	`13`	`type WorkspaceStatus string`
`16`	`14`
`17`	`15`	`const (`