mirror of https://github.com/coder/coder.git
chore: Add alias `coder agent` (#986)
This commit is contained in:
parent
300c6d0824
commit
027d89dd9b
|
@ -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() {
|
|
@ -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())
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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())
|
||||
|
|
|
@ -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
|
||||
`,
|
||||
},
|
||||
}
|
||||
|
|
|
@ -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)))
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue