From be9f6131124aac214f687ad372be2b532cbf63fb Mon Sep 17 00:00:00 2001
From: Apfelwurm <Alexander@volzit.de>
Date: Fri, 7 Mar 2025 17:00:53 +0100
Subject: [PATCH] fix #507

---
 cli/server/add.go                 | 3 +--
 pkg/client/client.go              | 2 +-
 tests/integration/server_add.bats | 7 +++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cli/server/add.go b/cli/server/add.go
index 2a99b650..13bf6dd4 100644
--- a/cli/server/add.go
+++ b/cli/server/add.go
@@ -103,8 +103,7 @@ developer machine. The domain is then set to "default".`,
 
 		if _, err := client.New(name, timeout); err != nil {
 			cleanUp(name)
-			log.Debugf("ssh %s error: %s", name, sshPkg.Fatal(name, err))
-			log.Fatalf("can't ssh to %s, make sure \"ssh %s\" works", name, name)
+			log.Fatalf("%s error: %s", name, sshPkg.Fatal(name, err))
 		}
 
 		if created {
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 315a2732..6d136467 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -89,7 +89,7 @@ func New(serverName string, opts ...Opt) (*client.Client, error) {
 
 	info, err := cl.Info(context.Background())
 	if err != nil {
-		return cl, sshPkg.Fatal(serverName, err)
+		return cl, fmt.Errorf("%s, make sure \"ssh %s\" works", sshPkg.Fatal(serverName, err), serverName)
 	}
 
 	if info.Swarm.LocalNodeState == "inactive" {
diff --git a/tests/integration/server_add.bats b/tests/integration/server_add.bats
index 6de57779..cd6ef1f8 100644
--- a/tests/integration/server_add.bats
+++ b/tests/integration/server_add.bats
@@ -51,6 +51,13 @@ teardown(){
   assert_output --partial 'swarm mode not enabled on local server'
 }
 
+@test "create notexisting server fails with could not resolve hostname" {
+  run $ABRA server add notexisting
+  assert_failure
+  assert_not_exists "$ABRA_DIR/servers/default"
+  assert_output --partial 'could not resolve hostname for'
+}
+
 # bats test_tags=slow
 @test "cleanup when cannot add server" {
   run $ABRA server add example.com
-- 
2.47.2