Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Cleanups #177

Merged
merged 2 commits into from
Nov 4, 2020
Merged

Cleanups #177

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b0b018
Cleanups
cmoog Nov 4, 2020
0a97c0f
fixup! Cleanups
cmoog Nov 4, 2020
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
Prev Previous commit
fixup! Cleanups
  • Loading branch information
@cmoog
cmoog committed Nov 4, 2020
commit 0a97c0f11d9ec04e59a3437fde6d1a0db2a30103
2 changes: 1 addition & 1 deletion internal/cmd/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func runCommand(ctx context.Context, envName, command string, args []string) err
ctx, cancel := context.WithCancel(ctx)
defer cancel()

conn, err := client.DialWsep(ctx, env)
conn, err := client.DialWsep(ctx, env.ID)
if err != nil {
return xerrors.Errorf("dial websocket: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion internal/sync/singlefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

// SingleFile copies the given file into the remote dir or remote path of the given coder.Environment.
func SingleFile(ctx context.Context, local, remoteDir string, env *coder.Environment, client *coder.Client) error {
conn, err := client.DialWsep(ctx, env)
conn, err := client.DialWsep(ctx, env.ID)
if err != nil {
return xerrors.Errorf("dial remote execer: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions internal/sync/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (s Sync) syncPaths(delete bool, local, remote string) error {
}

func (s Sync) remoteCmd(ctx context.Context, prog string, args ...string) error {
conn, err := s.Client.DialWsep(ctx, &s.Env)
conn, err := s.Client.DialWsep(ctx, s.Env.ID)
if err != nil {
return xerrors.Errorf("dial websocket: %w", err)
}
Expand Down Expand Up @@ -270,7 +270,7 @@ func (s Sync) Version() (string, error) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()

conn, err := s.Client.DialWsep(ctx, &s.Env)
conn, err := s.Client.DialWsep(ctx, s.Env.ID)
if err != nil {
return "", err
}
Expand Down