Skip to content

[cloud] Fix password ssh key #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2023
Merged

[cloud] Fix password ssh key #568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions internal/cloud/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ func Shell(w io.Writer, projectDir string, githubUsername string) error {
}

if vmHostname == "" {
stepVM := stepper.Start(w, "Creating a virtual machine on the cloud...")
color.New(color.FgGreen).Fprintln(w, "Creating a virtual machine on the cloud...")
// Inspect the ssh ControlPath to check for existing connections
vmHostname = vmHostnameFromSSHControlPath()
if vmHostname != "" {
debug.Log("Using vmHostname from ssh socket: %v", vmHostname)
stepVM.Success("Detected existing virtual machine")
color.New(color.FgGreen).Fprintln(w, "Detected existing virtual machine")
} else {
var region, vmUser string
vmUser, vmHostname, region, err = getVirtualMachine(sshCmd)
Expand All @@ -91,7 +91,7 @@ func Shell(w io.Writer, projectDir string, githubUsername string) error {
if vmUser != "" {
username = vmUser
}
stepVM.Success("Created a virtual machine in %s", fly.RegionName(region))
color.New(color.FgGreen).Fprintf(w, "Created a virtual machine in %s\n", fly.RegionName(region))

// We save the username to local file only after we get a successful response
// from the gateway, because the gateway will verify that the user's SSH keys
Expand All @@ -104,13 +104,13 @@ func Shell(w io.Writer, projectDir string, githubUsername string) error {
}
debug.Log("vm_hostname: %s", vmHostname)

s2 := stepper.Start(w, "Starting file syncing...")
color.New(color.FgGreen).Fprintln(w, "Starting file syncing...")
err = syncFiles(username, vmHostname, projectDir)
if err != nil {
s2.Fail("Starting file syncing [FAILED]")
color.New(color.FgRed).Fprintln(w, "Starting file syncing [FAILED]")
return err
}
s2.Success("File syncing started")
color.New(color.FgGreen).Fprintln(w, "File syncing started")

s3 := stepper.Start(w, "Connecting to virtual machine...")
time.Sleep(1 * time.Second)
Expand Down