Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/pro/cluster/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ func (cmd *ListClustersCmd) Run(
var buf bytes.Buffer
err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "listClusters",
Command: provider.Exec.Proxy.List.Clusters,
Context: devsyConfig.DefaultContext,
Options: opts,
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ func (cmd *HealthCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "health",
Command: provider.Exec.Proxy.Health,
Context: devsyConfig.DefaultContext,
Options: devsyConfig.ProviderOptions(provider.Name),
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/project/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ func (cmd *ListProjectsCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "listProjects",
Command: provider.Exec.Proxy.List.Projects,
Context: devsyConfig.DefaultContext,
Options: devsyConfig.ProviderOptions(provider.Name),
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/self.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func (cmd *SelfCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "getSelf",
Command: provider.Exec.Proxy.Get.Self,
Context: devsyConfig.DefaultContext,
Options: devsyConfig.ProviderOptions(provider.Name),
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/template/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ func (cmd *ListTemplatesCmd) Run(
var buf bytes.Buffer
err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "listTemplates",
Command: provider.Exec.Proxy.List.Templates,
Context: devsyConfig.DefaultContext,
Options: opts,
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func (cmd *VersionCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "getVersion",
Command: providerConfig.Exec.Proxy.Get.Version,
Context: devsyConfig.DefaultContext,
Options: opts,
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/workspace/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ func (cmd *CreateWorkspaceCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "createWorkspace",
Command: provider.Exec.Proxy.Create.Workspace,
Context: devsyConfig.DefaultContext,
Options: opts,
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/workspace/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func (cmd *ListWorkspacesCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "listWorkspaces",
Command: provider.Exec.Proxy.List.Workspaces,
Context: devsyConfig.DefaultContext,
Options: devsyConfig.ProviderOptions(provider.Name),
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/workspace/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ func (cmd *UpdateWorkspaceCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "updateWorkspace",
Command: provider.Exec.Proxy.Update.Workspace,
Context: devsyConfig.DefaultContext,
Options: opts,
Expand Down
1 change: 0 additions & 1 deletion cmd/pro/workspace/watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ func (cmd *WatchWorkspacesCmd) Run(

err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: cancelCtx,
Name: "watchWorkspaces",
Command: providerConfig.Exec.Proxy.Watch.Workspaces,
Context: devsyConfig.DefaultContext,
Options: opts,
Expand Down
1 change: 0 additions & 1 deletion cmd/provider/configure_shared.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ func initProvider(
) error {
err := clientimplementation.RunCommandWithBinaries(clientimplementation.CommandOptions{
Ctx: ctx,
Name: "init",
Command: provider.Exec.Init,
Context: devsyConfig.DefaultContext,
Options: devsyConfig.ProviderOptions(provider.Name),
Expand Down
1 change: 0 additions & 1 deletion pkg/client/clientimplementation/machine_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ func (e *machineExecutor) execute(ctx context.Context, cfg execConfig) error {

err := RunCommandWithBinaries(CommandOptions{
Ctx: ctx,
Name: cfg.name,
Command: cfg.command,
Context: e.client.machine.Context,
Machine: e.client.machine,
Expand Down
10 changes: 0 additions & 10 deletions pkg/client/clientimplementation/proxy_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ type proxyExecutor struct {
client *proxyClient
}

// execParams defines parameters for proxy command execution.
type execParams struct {
name string
command types.StrArray
extraEnv map[string]string
stdin io.Reader
Expand All @@ -76,7 +74,6 @@ type execParams struct {
func (e *proxyExecutor) execute(ctx context.Context, params execParams) error {
return RunCommandWithBinaries(CommandOptions{
Ctx: ctx,
Name: params.name,
Command: params.command,
Context: e.client.workspace.Context,
Workspace: e.client.workspace,
Expand Down Expand Up @@ -249,7 +246,6 @@ func (s *proxyClient) Create(
stderr io.Writer,
) error {
err := s.executor.execute(ctx, execParams{
name: "createWorkspace",
command: s.config.Exec.Proxy.Create.Workspace,
stdin: stdin,
stdout: stdout,
Expand All @@ -263,7 +259,6 @@ func (s *proxyClient) Create(

func (s *proxyClient) Ssh(ctx context.Context, opt client.SshOptions) error {
return s.executor.executeWithJSONLog(ctx, execParams{
name: "ssh",
command: s.config.Exec.Proxy.Ssh,
extraEnv: EncodeOptions(opt, config.EnvFlagsSSH),
stdin: opt.Stdin,
Expand All @@ -276,7 +271,6 @@ func (s *proxyClient) Stop(ctx context.Context, opt client.StopOptions) error {
defer s.m.Unlock()

return s.executor.executeWithJSONLog(ctx, execParams{
name: "stop",
command: s.config.Exec.Proxy.Stop,
stdout: io.Discard,
})
Expand All @@ -294,7 +288,6 @@ func (s *proxyClient) Up(ctx context.Context, opt client.UpOptions) error {
}

return s.executor.executeWithJSONLog(ctx, execParams{
name: "up",
command: s.config.Exec.Proxy.Up,
extraEnv: opts,
stdin: opt.Stdin,
Expand Down Expand Up @@ -350,7 +343,6 @@ func (s *proxyClient) Delete(ctx context.Context, opt client.DeleteOptions) erro
}

err := s.executor.executeWithJSONLog(ctx, execParams{
name: "delete",
command: s.config.Exec.Proxy.Delete,
extraEnv: EncodeOptions(opt, config.EnvFlagsDelete),
stdout: io.Discard,
Expand Down Expand Up @@ -381,7 +373,6 @@ func (s *proxyClient) Status(
buf := &bytes.Buffer{}
err := RunCommandWithBinaries(CommandOptions{
Ctx: ctx,
Name: "status",
Command: s.config.Exec.Proxy.Status,
Context: s.workspace.Context,
Workspace: s.workspace,
Expand Down Expand Up @@ -422,7 +413,6 @@ func (s *proxyClient) updateInstance(ctx context.Context) error {
}

return s.executor.execute(ctx, execParams{
name: "updateWorkspace",
command: s.config.Exec.Proxy.Update.Workspace,
stdin: os.Stdin,
stdout: os.Stdout,
Expand Down
Loading
Loading