Merge pull request #21347 from vespa-engine/mpolden/return-error-on-service-wait

Improve error handling of unavailable service

2 files changed, 6 insertions, 7 deletions

diff --git a/client/go/cmd/deploy.go b/client/go/cmd/deploy.go
index e35188933e1..14b6e969df7 100644
--- a/client/go/cmd/deploy.go
+++ b/client/go/cmd/deploy.go
@@ -87,8 +87,7 @@ $ vespa deploy -t cloud -z perf.aws-us-east-1c`,
 				opts.Deployment.Zone.Environment, opts.Deployment.Zone.Region,
 				sessionOrRunID)))
 		}
-		waitForQueryService(sessionOrRunID)
-		return nil
+		return waitForQueryService(sessionOrRunID)
 	},
 }
 
@@ -157,14 +156,14 @@ var activateCmd = &cobra.Command{
 			return err
 		}
 		printSuccess("Activated ", color.Cyan(pkg.Path), " with session ", sessionID)
-		waitForQueryService(sessionID)
-		return nil
+		return waitForQueryService(sessionID)
 	},
 }
 
-func waitForQueryService(sessionOrRunID int64) {
+func waitForQueryService(sessionOrRunID int64) error {
 	if waitSecsArg > 0 {
 		log.Println()
-		waitForService("query", sessionOrRunID)
+		return waitForService("query", sessionOrRunID)
 	}
+	return nil
 }
diff --git a/client/go/cmd/helpers.go b/client/go/cmd/helpers.go
index 03cdaecbfce..6cddfd09f54 100644
--- a/client/go/cmd/helpers.go
+++ b/client/go/cmd/helpers.go
@@ -119,7 +119,7 @@ func getService(service string, sessionOrRunID int64, cluster string) (*vespa.Se
 	}
 	s, err := t.Service(service, timeout, sessionOrRunID, cluster)
 	if err != nil {
-		return nil, fmt.Errorf("service %s not found: %w", service, err)
+		return nil, fmt.Errorf("service '%s' is unavailable: %w", service, err)
 	}
 	return s, nil
 }