Merge pull request #1115 from jmpsec/fix-provision-quick-add

Fix `provision.sh` running a CLI error as a command

Author: javuto

cmd/cli/environment.go

@@ -366,7 +366,7 @@ func quickAddEnvironment(ctx context.Context, cmd *cli.Command) error {
 	// Get environment name
 	envName := cmd.String("name")
 	if envName == "" {
-		fmt.Println("❌ environment name is required")
+		fmt.Fprintln(os.Stderr, "❌ environment name is required")
 		os.Exit(1)
 	}
 	var env environments.TLSEnvironment
@@ -389,7 +389,7 @@ func quickAddEnvironment(ctx context.Context, cmd *cli.Command) error {
 	case targetPowershell:
 		oneLiner, _ = environments.QuickAddOneLinerPowershell(insecure, env)
 	default:
-		fmt.Printf("❌ invalid target! It can be %s or %s\n", targetShell, targetPowershell)
+		fmt.Fprintf(os.Stderr, "❌ invalid target! It can be %s or %s\n", targetShell, targetPowershell)
 		os.Exit(1)
 	}
 	fmt.Printf("%s\n", oneLiner)

cmd/cli/main.go

@@ -2316,6 +2316,9 @@ func main() {
 	}
 	// Run the app
 	if err := app.Run(context.Background(), os.Args); err != nil {
-		log.Fatal().Msgf("❌ %v", err)
+		// Errors go to stderr: stdout can carry output meant to be run or piped
+		// (for example the quick-add one-liner).
+		fmt.Fprintf(os.Stderr, "❌ %v\n", err)
+		os.Exit(1)
 	}
 }

deploy/provision.sh

@@ -680,7 +680,14 @@ else
   # Enroll host in environment
   if [[ "$ENROLL" == true ]]; then
     log "Adding host in environment $ENVIRONMENT"
-    eval $( "$DEST_PATH"/bin/osctrl-cli --db -D "$__db_conf" env node-actions -n "$ENVIRONMENT" quick-add)
+    # Run the one-liner only if osctrl-cli produced it. A failure prints its
+    # error instead of the one-liner, and that must never reach eval.
+    if ! __quick_add=$("$DEST_PATH"/bin/osctrl-cli --db -D "$__db_conf" env node-actions -n "$ENVIRONMENT" quick-add 2>&1); then
+      log "Could not generate the quick-add one-liner for environment $ENVIRONMENT:"
+      echo "$__quick_add"
+      exit 1
+    fi
+    eval "$__quick_add"
   fi
 fi