fix: Ensure the session token is properly passed to instance identity (#4923)

kylecarbs · web-flow · commit 1898f67fe086 · 2022-11-06T16:46:51.000-06:00
Fixes #4921.
diff --git a/cli/agent.go b/cli/agent.go
@@ -165,7 +165,7 @@ func workspaceAgent() *cobra.Command {
 						return "", err
 					}
 					client.SessionToken = resp.SessionToken
-					return "", nil
+					return resp.SessionToken, nil
 				},
 				EnvironmentVariables: map[string]string{
 					"GIT_ASKPASS": executablePath,
diff --git a/cli/agent_test.go b/cli/agent_test.go
@@ -2,8 +2,11 @@ package cli_test
 
 import (
 	"context"
+	"runtime"
+	"strings"
 	"testing"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -194,6 +197,23 @@ func TestWorkspaceAgent(t *testing.T) {
 			_, err := dialer.Ping(ctx)
 			return err == nil
 		}, testutil.WaitMedium, testutil.IntervalFast)
+
+		sshClient, err := dialer.SSHClient()
+		require.NoError(t, err)
+		defer sshClient.Close()
+		session, err := sshClient.NewSession()
+		require.NoError(t, err)
+		defer session.Close()
+		key := "CODER_AGENT_TOKEN"
+		command := "sh -c 'echo $" + key + "'"
+		if runtime.GOOS == "windows" {
+			command = "cmd.exe /c echo %" + key + "%"
+		}
+		token, err := session.CombinedOutput(command)
+		require.NoError(t, err)
+		_, err = uuid.Parse(strings.TrimSpace(string(token)))
+		require.NoError(t, err)
+
 		cancelFunc()
 		err = <-errC
 		require.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func workspaceAgent() *cobra.Command {`
`165`	`165`	`return "", err`
`166`	`166`	`}`
`167`	`167`	`client.SessionToken = resp.SessionToken`
`168`		`- return "", nil`
	`168`	`+ return resp.SessionToken, nil`
`169`	`169`	`},`
`170`	`170`	`EnvironmentVariables: map[string]string{`
`171`	`171`	`"GIT_ASKPASS": executablePath,`