From 2c1d2e7b24cd96d9a12d13cb1aeb305ff6d84093 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 26 Mar 2024 20:10:15 +0200
Subject: [PATCH] Don't prompt parameters unnecessarily when using
 --no-override-config

---
 cmd/bbctl/run.go | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/cmd/bbctl/run.go b/cmd/bbctl/run.go
index f3fda72..2e99f7e 100644
--- a/cmd/bbctl/run.go
+++ b/cmd/bbctl/run.go
@@ -228,11 +228,7 @@ func runBridge(ctx *cli.Context) error {
 	}
 	bridgeName := ctx.Args().Get(0)
 
-	cfg, err := doGenerateBridgeConfig(ctx, bridgeName)
-	if err != nil {
-		return err
-	}
-
+	var err error
 	dataDir := GetEnvConfig(ctx).BridgeDataDir
 	var bridgeDir string
 	compile := ctx.Bool("compile")
@@ -266,7 +262,34 @@ func runBridge(ctx *cli.Context) error {
 		_, err = os.Stat(configPath)
 		doWriteConfig = errors.Is(err, fs.ErrNotExist)
 	}
+
+	var cfg *generatedBridgeConfig
+	if !doWriteConfig {
+		whoami, err := getCachedWhoami(ctx)
+		if err != nil {
+			return fmt.Errorf("failed to get whoami: %w", err)
+		}
+		existingBridge, ok := whoami.User.Bridges[bridgeName]
+		if !ok || existingBridge.BridgeState.BridgeType == "" {
+			log.Printf("Existing bridge type not found, falling back to generating new config")
+			doWriteConfig = true
+		} else if reg, err := doRegisterBridge(ctx, bridgeName, existingBridge.BridgeState.BridgeType, true); err != nil {
+			log.Printf("Failed to get existing bridge registration: %v", err)
+			log.Printf("Falling back to generating new config")
+			doWriteConfig = true
+		} else {
+			cfg = &generatedBridgeConfig{
+				BridgeType:   existingBridge.BridgeState.BridgeType,
+				RegisterJSON: reg,
+			}
+		}
+	}
+
 	if doWriteConfig {
+		cfg, err = doGenerateBridgeConfig(ctx, bridgeName)
+		if err != nil {
+			return err
+		}
 		err = os.WriteFile(configPath, []byte(cfg.Config), 0600)
 		if err != nil {
 			return fmt.Errorf("failed to save config: %w", err)