more fixes

lucacome · lucacome · commit 1002d63ff89a · 2025-10-22T10:17:01.000-07:00
diff --git a/tailout/connect.go b/tailout/connect.go
@@ -45,6 +45,7 @@ func (app *App) Connect(ctx context.Context, args []string) error {
 			return fmt.Errorf("node %s not found", nodeConnect)
 		}
 		deviceToConnectTo = tailoutDevices[i]
+		nodeConnect = deviceToConnectTo.NodeID
 	case !nonInteractive:
 		if len(tailoutDevices) == 0 {
 			return errors.New("no tailout node found in your tailnet")
diff --git a/tailout/create.go b/tailout/create.go
@@ -276,7 +276,7 @@ sudo echo "sudo shutdown" | at now + ` + strconv.Itoa(10) + ` minutes`
 
 	identity, err := stsSvc.GetCallerIdentity(ctx, &sts.GetCallerIdentityInput{})
 	if err != nil {
-		return instance, fmt.Errorf("failed to get account ID: %w", err)
+		return nil, fmt.Errorf("failed to get account ID: %w", err)
 	}
 
 	fmt.Printf(`Creating tailout node in AWS with the following parameters:

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func (app *App) Connect(ctx context.Context, args []string) error {`
`45`	`45`	`return fmt.Errorf("node %s not found", nodeConnect)`
`46`	`46`	`}`
`47`	`47`	`deviceToConnectTo = tailoutDevices[i]`
	`48`	`+ nodeConnect = deviceToConnectTo.NodeID`
`48`	`49`	`case !nonInteractive:`
`49`	`50`	`if len(tailoutDevices) == 0 {`
`50`	`51`	`return errors.New("no tailout node found in your tailnet")`
Original file line number	Diff line number	Diff line change
@@ -276,7 +276,7 @@ sudo echo "sudo shutdown" \| at now + ` + strconv.Itoa(10) + ` minutes`
`276`	`276`
`277`	`277`	`identity, err := stsSvc.GetCallerIdentity(ctx, &sts.GetCallerIdentityInput{})`
`278`	`278`	`if err != nil {`
`279`		`- return instance, fmt.Errorf("failed to get account ID: %w", err)`
	`279`	`+ return nil, fmt.Errorf("failed to get account ID: %w", err)`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	fmt.Printf(`Creating tailout node in AWS with the following parameters: