feat: display user@host:port in error message

tenstad · Apr 14, 2024 · 84863d9 · 84863d9
1 parent 4d420f5
commit 84863d9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/internal/provider/connection.go b/internal/provider/connection.go
@@ -3,7 +3,6 @@ package provider
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"time"
@@ -76,8 +75,7 @@ var connectionSchemaResource = &schema.Resource{
 }
 
 func ConnectionFromResourceData(ctx context.Context, d *schema.ResourceData) (string, *ssh.ClientConfig, error) {
-	_, ok := d.GetOk("conn")
-	if !ok {
+	if _, ok := d.GetOk("conn"); !ok {
 		return "", nil, fmt.Errorf("resouce does not have a connection configured")
 	}
 
@@ -102,7 +100,7 @@ func ConnectionFromResourceData(ctx context.Context, d *schema.ResourceData) (st
 
 	private_key_path, ok := d.GetOk("conn.0.private_key_path")
 	if ok {
-		content, err := ioutil.ReadFile(private_key_path.(string))
+		content, err := os.ReadFile(private_key_path.(string))
 		if err != nil {
 			return "", nil, fmt.Errorf("couldn't read private key: %s", err.Error())
 		}

diff --git a/internal/provider/remote_client.go b/internal/provider/remote_client.go
@@ -304,7 +304,7 @@ func (c *RemoteClient) DeleteFileShell(path string) error {
 func NewRemoteClient(host string, clientConfig *ssh.ClientConfig) (*RemoteClient, error) {
 	client, err := ssh.Dial("tcp", host, clientConfig)
 	if err != nil {
-		return nil, fmt.Errorf("couldn't establish a connection to the remote server: %s", err.Error())
+		return nil, fmt.Errorf("couldn't establish a connection to the remote server '%s@%s': %s", clientConfig.User, host, err.Error())
 	}
 
 	return &RemoteClient{