chore: Add alias coder agent (coder#986)

f0ssel · web-flow · commit 027d89dd9b8a · 2022-04-13T20:55:55.000Z
diff --git a/cli/agent.go b/cli/agent.go
diff --git a/cli/agent_test.go b/cli/agent_test.go
@@ -47,7 +47,7 @@ func TestWorkspaceAgent(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, template.ID)
 		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
 
-		cmd, _ := clitest.New(t, "workspaces", "agent", "--auth", "aws-instance-identity", "--url", client.URL.String())
+		cmd, _ := clitest.New(t, "agent", "--auth", "aws-instance-identity", "--url", client.URL.String())
 		ctx, cancelFunc := context.WithCancel(context.Background())
 		defer cancelFunc()
 		go func() {
@@ -101,7 +101,7 @@ func TestWorkspaceAgent(t *testing.T) {
 		workspace := coderdtest.CreateWorkspace(t, client, codersdk.Me, template.ID)
 		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
 
-		cmd, _ := clitest.New(t, "workspaces", "agent", "--auth", "google-instance-identity", "--url", client.URL.String())
+		cmd, _ := clitest.New(t, "agent", "--auth", "google-instance-identity", "--url", client.URL.String())
 		ctx, cancelFunc := context.WithCancel(context.Background())
 		defer cancelFunc()
 		go func() {
diff --git a/cli/gitssh_test.go b/cli/gitssh_test.go
@@ -65,7 +65,7 @@ func TestGitSSH(t *testing.T) {
 		coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
 
 		// start workspace agent
-		cmd, root := clitest.New(t, "workspaces", "agent", "--auth", "aws-instance-identity", "--url", client.URL.String())
+		cmd, root := clitest.New(t, "agent", "--auth", "aws-instance-identity", "--url", client.URL.String())
 		agentClient := &*client
 		clitest.SetupConfig(t, agentClient, root)
 		ctx, cancelFunc := context.WithCancel(context.Background())
diff --git a/cli/root.go b/cli/root.go
@@ -73,6 +73,7 @@ func Root() *cobra.Command {
 		workspaceTunnel(),
 		gitssh(),
 		publickey(),
+		workspaceAgent(),
 	)
 
 	cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coderv2"), "Path to the global `coder` config directory")
diff --git a/cli/workspaces.go b/cli/workspaces.go
@@ -13,7 +13,6 @@ func workspaces() *cobra.Command {
 		Use:     "workspaces",
 		Aliases: []string{"ws"},
 	}
-	cmd.AddCommand(workspaceAgent())
 	cmd.AddCommand(workspaceCreate())
 	cmd.AddCommand(workspaceDelete())
 	cmd.AddCommand(workspaceList())
diff --git a/provisionersdk/agent.go b/provisionersdk/agent.go
@@ -16,7 +16,7 @@ $ProgressPreference = "SilentlyContinue"
 Invoke-WebRequest -Uri ${ACCESS_URL}bin/coder-windows-amd64.exe -OutFile $env:TEMP\sshd.exe
 $env:CODER_AUTH = "${AUTH_TYPE}"
 $env:CODER_URL = "${ACCESS_URL}"
-Start-Process -FilePath $env:TEMP\sshd.exe -ArgumentList "workspaces","agent" -PassThru
+Start-Process -FilePath $env:TEMP\sshd.exe -ArgumentList "agent" -PassThru
 `,
 		},
 		"linux": {
@@ -28,7 +28,7 @@ curl -fsSL ${ACCESS_URL}bin/coder-linux-amd64 -o $BINARY_LOCATION
 chmod +x $BINARY_LOCATION
 export CODER_AUTH="${AUTH_TYPE}"
 export CODER_URL="${ACCESS_URL}"
-exec $BINARY_LOCATION workspaces agent
+exec $BINARY_LOCATION agent
 `,
 		},
 		"darwin": {
@@ -40,7 +40,7 @@ curl -fsSL ${ACCESS_URL}bin/coder-darwin-amd64 -o $BINARY_LOCATION
 chmod +x $BINARY_LOCATION
 export CODER_AUTH="${AUTH_TYPE}"
 export CODER_URL="${ACCESS_URL}"
-exec $BINARY_LOCATION workspaces agent
+exec $BINARY_LOCATION agent
 `,
 		},
 	}
diff --git a/provisionersdk/agent_test.go b/provisionersdk/agent_test.go
@@ -51,6 +51,6 @@ func TestAgentScript(t *testing.T) {
 		require.NoError(t, err)
 		// Because we use the "echo" binary, we should expect the arguments provided
 		// as the response to executing our script.
-		require.Equal(t, "workspaces agent", strings.TrimSpace(string(output)))
+		require.Equal(t, "agent", strings.TrimSpace(string(output)))
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ func Root() *cobra.Command {`
`73`	`73`	`workspaceTunnel(),`
`74`	`74`	`gitssh(),`
`75`	`75`	`publickey(),`
	`76`	`+ workspaceAgent(),`
`76`	`77`	`)`
`77`	`78`
`78`	`79`	cmd.PersistentFlags().String(varGlobalConfig, configdir.LocalConfig("coderv2"), "Path to the global `coder` config directory")
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ func workspaces() *cobra.Command {`
`13`	`13`	`Use: "workspaces",`
`14`	`14`	`Aliases: []string{"ws"},`
`15`	`15`	`}`
`16`		`- cmd.AddCommand(workspaceAgent())`
`17`	`16`	`cmd.AddCommand(workspaceCreate())`
`18`	`17`	`cmd.AddCommand(workspaceDelete())`
`19`	`18`	`cmd.AddCommand(workspaceList())`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ func TestAgentScript(t *testing.T) {`
`51`	`51`	`require.NoError(t, err)`
`52`	`52`	`// Because we use the "echo" binary, we should expect the arguments provided`
`53`	`53`	`// as the response to executing our script.`
`54`		`- require.Equal(t, "workspaces agent", strings.TrimSpace(string(output)))`
	`54`	`+ require.Equal(t, "agent", strings.TrimSpace(string(output)))`
`55`	`55`	`})`
`56`	`56`	`}`