coder · kylecarbs · May 2, 2022 · Apr 29, 2022 · Apr 29, 2022 · Apr 30, 2022
diff --git a/agent/agent.go b/agent/agent.go
@@ -49,6 +49,7 @@ type Metadata struct {
 	OwnerUsername        string            `json:"owner_username"`
 	EnvironmentVariables map[string]string `json:"environment_variables"`
 	StartupScript        string            `json:"startup_script"`
+	Directory            string            `json:"directory"`
 }
 
 type Dialer func(ctx context.Context, logger slog.Logger) (Metadata, *peerbroker.Listener, error)
@@ -340,6 +341,11 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri
 		caller = "/c"
 	}
 	cmd := exec.CommandContext(ctx, shell, caller, command)
+	cmd.Dir = metadata.Directory
+	if cmd.Dir == "" {
+		// Default to $HOME if a directory is not set!
+		cmd.Dir = os.Getenv("HOME")
+	}
 	cmd.Env = append(os.Environ(), env...)
 	executablePath, err := os.Executable()
 	if err != nil {

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1173,6 +1173,7 @@ func (q *fakeQuerier) InsertWorkspaceAgent(_ context.Context, arg database.Inser
 		Name:                 arg.Name,
 		Architecture:         arg.Architecture,
 		OperatingSystem:      arg.OperatingSystem,
+		Directory:            arg.Directory,
 		StartupScript:        arg.StartupScript,
 		InstanceMetadata:     arg.InstanceMetadata,
 		ResourceMetadata:     arg.ResourceMetadata,

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000009_agent_directory.down.sql b/coderd/database/migrations/000009_agent_directory.down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE ONLY workspace_agents
+	DROP COLUMN IF EXISTS directory;
diff --git a/coderd/database/migrations/000009_agent_directory.up.sql b/coderd/database/migrations/000009_agent_directory.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE ONLY workspace_agents
+    -- UNIX paths are a maximum length of 4096.
+    ADD COLUMN IF NOT EXISTS directory varchar(4096) DEFAULT '' 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
@@ -48,11 +48,12 @@ INSERT INTO
 		environment_variables,
 		operating_system,
 		startup_script,
+		directory,
 		instance_metadata,
 		resource_metadata
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13) RETURNING *;
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) RETURNING *;
 
 -- name: UpdateWorkspaceAgentConnectionByID :exec
 UPDATE

diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -243,6 +243,8 @@ func (server *provisionerdServer) AcquireJob(ctx context.Context, _ *proto.Empty
 					WorkspaceTransition: transition,
 					WorkspaceName:       workspace.Name,
 					WorkspaceOwner:      owner.Username,
+					WorkspaceId:         workspace.ID.String(),
+					WorkspaceOwnerId:    owner.ID.String(),
 				},
 			},
 		}
@@ -633,6 +635,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 			AuthInstanceID:       instanceID,
 			Architecture:         agent.Architecture,
 			EnvironmentVariables: env,
+			Directory:            agent.Directory,
 			OperatingSystem:      agent.OperatingSystem,
 			StartupScript: sql.NullString{
 				String: agent.StartupScript,

diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -132,6 +132,7 @@ func (api *api) workspaceAgentMetadata(rw http.ResponseWriter, r *http.Request)
 		OwnerUsername:        owner.Username,
 		EnvironmentVariables: apiAgent.EnvironmentVariables,
 		StartupScript:        apiAgent.StartupScript,
+		Directory:            apiAgent.Directory,
 	})
 }
 
@@ -469,6 +470,7 @@ func convertWorkspaceAgent(dbAgent database.WorkspaceAgent, agentUpdateFrequency
 		OperatingSystem:      dbAgent.OperatingSystem,
 		StartupScript:        dbAgent.StartupScript.String,
 		EnvironmentVariables: envs,
+		Directory:            dbAgent.Directory,
 	}
 	if dbAgent.FirstConnectedAt.Valid {
 		workspaceAgent.FirstConnectedAt = &dbAgent.FirstConnectedAt.Time

diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -3,6 +3,7 @@ package coderd_test
 import (
 	"context"
 	"encoding/json"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -22,40 +23,45 @@ import (
 
 func TestWorkspaceAgent(t *testing.T) {
 	t.Parallel()
-	client := coderdtest.New(t, nil)
-	user := coderdtest.CreateFirstUser(t, client)
-	daemonCloser := coderdtest.NewProvisionerDaemon(t, client)
-	authToken := uuid.NewString()
-	version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
-		Parse:           echo.ParseComplete,
-		ProvisionDryRun: echo.ProvisionComplete,
-		Provision: []*proto.Provision_Response{{
-			Type: &proto.Provision_Response_Complete{
-				Complete: &proto.Provision_Complete{
-					Resources: []*proto.Resource{{
-						Name: "example",
-						Type: "aws_instance",
-						Agents: []*proto.Agent{{
-							Id: uuid.NewString(),
-							Auth: &proto.Agent_Token{
-								Token: authToken,
-							},
+	t.Run("Connect", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		user := coderdtest.CreateFirstUser(t, client)
+		daemonCloser := coderdtest.NewProvisionerDaemon(t, client)
+		authToken := uuid.NewString()
+		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
+			Parse:           echo.ParseComplete,
+			ProvisionDryRun: echo.ProvisionComplete,
+			Provision: []*proto.Provision_Response{{
+				Type: &proto.Provision_Response_Complete{
+					Complete: &proto.Provision_Complete{
+						Resources: []*proto.Resource{{
+							Name: "example",
+							Type: "aws_instance",
+							Agents: []*proto.Agent{{
+								Id:        uuid.NewString(),
+								Directory: "/tmp",
+								Auth: &proto.Agent_Token{
+									Token: authToken,
+								},
+							}},
 						}},
-					}},
+					},
 				},
-			},
-		}},
+			}},
+		})
+		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)
+		daemonCloser.Close()
+
+		resources, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID)
+		require.NoError(t, err)
+		require.Equal(t, "/tmp", resources[0].Agents[0].Directory)
+		_, err = client.WorkspaceAgent(context.Background(), resources[0].Agents[0].ID)
+		require.NoError(t, err)
 	})
-	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)
-	daemonCloser.Close()
-
-	resources, err := client.WorkspaceResourcesByBuild(context.Background(), workspace.LatestBuild.ID)
-	require.NoError(t, err)
-	_, err = client.WorkspaceAgent(context.Background(), resources[0].Agents[0].ID)
-	require.NoError(t, err)
 }
 
 func TestWorkspaceAgentListen(t *testing.T) {
@@ -165,6 +171,12 @@ func TestWorkspaceAgentTURN(t *testing.T) {
 
 func TestWorkspaceAgentPTY(t *testing.T) {
 	t.Parallel()
+	if runtime.GOOS == "windows" {
+		// This might be our implementation, or ConPTY itself.
+		// It's difficult to find extensive tests for it, so
+		// it seems like it could be either.
+		t.Skip("ConPTY appears to be inconsistent on Windows.")
+	}
 	client := coderdtest.New(t, nil)
 	user := coderdtest.CreateFirstUser(t, client)
 	daemonCloser := coderdtest.NewProvisionerDaemon(t, client)

diff --git a/codersdk/workspaceresources.go b/codersdk/workspaceresources.go
@@ -45,6 +45,7 @@ type WorkspaceAgent struct {
 	EnvironmentVariables map[string]string    `json:"environment_variables"`
 	OperatingSystem      string               `json:"operating_system"`
 	StartupScript        string               `json:"startup_script,omitempty"`
+	Directory            string               `json:"directory,omitempty"`
 }
 
 type WorkspaceAgentResourceMetadata struct {

diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -124,6 +124,8 @@ func (t *terraform) Provision(stream proto.DRPCProvisioner_ProvisionStream) erro
 		"CODER_WORKSPACE_TRANSITION="+strings.ToLower(start.Metadata.WorkspaceTransition.String()),
 		"CODER_WORKSPACE_NAME="+start.Metadata.WorkspaceName,
 		"CODER_WORKSPACE_OWNER="+start.Metadata.WorkspaceOwner,
+		"CODER_WORKSPACE_ID="+start.Metadata.WorkspaceId,
+		"CODER_WORKSPACE_OWNER_ID="+start.Metadata.WorkspaceOwnerId,
 	)
 	for key, value := range provisionersdk.AgentScriptEnv() {
 		env = append(env, key+"="+value)
@@ -330,6 +332,12 @@ func parseTerraformPlan(ctx context.Context, terraform *tfexec.Terraform, planfi
 				agent.StartupScript = startupScript
 			}
 		}
+		if directoryRaw, has := resource.Expressions["dir"]; has {
+			dir, ok := directoryRaw.ConstantValue.(string)
+			if ok {
+				agent.Directory = dir
+			}
+		}
 
 		agents[resource.Address] = agent
 	}
@@ -381,6 +389,7 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
 			Auth            string            `mapstructure:"auth"`
 			OperatingSystem string            `mapstructure:"os"`
 			Architecture    string            `mapstructure:"arch"`
+			Directory       string            `mapstructure:"dir"`
 			ID              string            `mapstructure:"id"`
 			Token           string            `mapstructure:"token"`
 			Env             map[string]string `mapstructure:"env"`
@@ -405,6 +414,7 @@ func parseTerraformApply(ctx context.Context, terraform *tfexec.Terraform, state
 				StartupScript:   attrs.StartupScript,
 				OperatingSystem: attrs.OperatingSystem,
 				Architecture:    attrs.Architecture,
+				Directory:       attrs.Directory,
 			}
 			switch attrs.Auth {
 			case "token":

diff --git a/provisioner/terraform/provision_test.go b/provisioner/terraform/provision_test.go
@@ -160,6 +160,7 @@ provider "coder" {
 			resource "coder_agent" "A" {
 				os = "windows"
 				arch = "arm64"
+				dir = "C:\\System32"
 			}
 			resource "null_resource" "A" {
 				depends_on = [
@@ -184,6 +185,7 @@ provider "coder" {
 							Name:            "A",
 							OperatingSystem: "windows",
 							Architecture:    "arm64",
+							Directory:       "C:\\System32",
 							Auth: &proto.Agent_Token{
 								Token: "",
 							},
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ALTER TABLE ONLY workspace_agents
		DROP COLUMN IF EXISTS directory;