make gofmt and other linters happy.

Author: ToeiRei

client/client_bun.go

@@ -279,20 +279,30 @@ func (c *BunClient) CreateAccount(ctx context.Context, targetID ID, name string,
 	} else {
 		return Account{}, errors.New("unknown target")
 	}
-	am := core.DefaultAccountManager()
-	if am == nil {
-		return Account{}, errors.New("no account manager available")
+	// Prefer package-level AccountManager when available so that created
+	// accounts are visible to package-level helpers (key manager, deployer).
+	if am := core.DefaultAccountManager(); am != nil {
+		acctID, err := am.AddAccount(name, hostname, "", "")
+		if err != nil {
+			return Account{}, err
+		}
+		return Account{ID(acctID), targetID, name, deploymentKey}, nil
 	}
-	// label and tags are UI-level; pass empty
-	acctID, err := am.AddAccount(name, hostname, "", "")
+	if c.store == nil {
+		return Account{}, errors.New("no store available")
+	}
+	acctID, err := c.store.AddAccount(name, hostname, "", "")
 	if err != nil {
 		return Account{}, err
 	}
 	return Account{ID(acctID), targetID, name, deploymentKey}, nil
 }
 
 func (c *BunClient) GetAccount(ctx context.Context, id ID) (Account, error) {
-	m, err := core.GetAccount(int(id))
+	if c.store == nil {
+		return Account{}, errors.New("no store available")
+	}
+	m, err := c.store.GetAccount(int(id))
 	if err != nil {
 		return Account{}, err
 	}
@@ -331,7 +341,10 @@ func (c *BunClient) ListAccountsByTarget(ctx context.Context, targetID ID) ([]Ac
 	if !ok {
 		return nil, errors.New("target not found")
 	}
-	accounts, err := core.GetAccounts()
+	if c.store == nil {
+		return nil, errors.New("no store available")
+	}
+	accounts, err := c.store.GetAccounts()
 	if err != nil {
 		return nil, err
 	}
@@ -347,15 +360,22 @@ func (c *BunClient) ListAccountsByTarget(ctx context.Context, targetID ID) ([]Ac
 
 func (c *BunClient) DeleteAccounts(ctx context.Context, ids ...ID) error {
 	for _, id := range ids {
-		if err := core.DeleteAccount(int(id)); err != nil {
-			return err
+		if c.store != nil {
+			if err := c.store.DeleteAccount(int(id)); err != nil {
+				return err
+			}
+		} else {
+			return errors.New("no store available")
 		}
 	}
 	return nil
 }
 
 func (c *BunClient) GetDirtyAccounts(ctx context.Context) ([]Account, error) {
-	accounts, err := core.GetAccounts()
+	if c.store == nil {
+		return nil, errors.New("no store available")
+	}
+	accounts, err := c.store.GetAccounts()
 	if err != nil {
 		return nil, err
 	}
@@ -444,6 +464,27 @@ func (c *BunClient) ResolveAccountsForPublicKey(ctx context.Context, publicKeyID
 	if err != nil {
 		return nil, err
 	}
+	// Fallback: if direct reverse lookup returned no accounts (some adapters
+	// may not implement it), scan all accounts and check their assigned keys.
+	if len(accs) == 0 {
+		if c.store != nil {
+			all, aerr := c.store.GetAccounts()
+			if aerr == nil {
+				for _, am := range all {
+					keysFor, kerr := km.GetKeysForAccount(am.ID)
+					if kerr != nil {
+						continue
+					}
+					for _, k := range keysFor {
+						if k.ID == int(publicKeyID) {
+							accs = append(accs, am)
+							break
+						}
+					}
+				}
+			}
+		}
+	}
 	var out []Account
 	for _, a := range accs {
 		// ensure target exists

client/client_bun_accounts_test.go

@@ -10,70 +10,70 @@ import (
 )
 
 func TestBunClient_AccountsCRUD(t *testing.T) {
-    cfg := config.Config{Database: config.ConfigDatabase{Type: "sqlite", Dsn: ":memory:"}}
-    logger := log.New(io.Discard, "", 0)
+	cfg := config.Config{Database: config.ConfigDatabase{Type: "sqlite", Dsn: ":memory:"}}
+	logger := log.New(io.Discard, "", 0)
 
-    c, err := NewBunClient(cfg, logger)
-    if err != nil {
-        t.Fatalf("NewBunClient failed: %v", err)
-    }
-    defer func() { _ = c.Close(context.Background()) }()
+	c, err := NewBunClient(cfg, logger)
+	if err != nil {
+		t.Fatalf("NewBunClient failed: %v", err)
+	}
+	defer func() { _ = c.Close(context.Background()) }()
 
-    ctx := context.Background()
+	ctx := context.Background()
 
-    // Create target then account
-    tgt, err := c.CreateTarget(ctx, "acct.example.com", 22)
-    if err != nil {
-        t.Fatalf("CreateTarget failed: %v", err)
-    }
+	// Create target then account
+	tgt, err := c.CreateTarget(ctx, "acct.example.com", 22)
+	if err != nil {
+		t.Fatalf("CreateTarget failed: %v", err)
+	}
 
-    acct, err := c.CreateAccount(ctx, tgt.id, "deploy", "")
-    if err != nil {
-        t.Fatalf("CreateAccount failed: %v", err)
-    }
-    if acct.id == 0 {
-        t.Fatalf("expected non-zero account id")
-    }
-    if acct.name != "deploy" {
-        t.Fatalf("unexpected account name: %s", acct.name)
-    }
+	acct, err := c.CreateAccount(ctx, tgt.id, "deploy", "")
+	if err != nil {
+		t.Fatalf("CreateAccount failed: %v", err)
+	}
+	if acct.id == 0 {
+		t.Fatalf("expected non-zero account id")
+	}
+	if acct.name != "deploy" {
+		t.Fatalf("unexpected account name: %s", acct.name)
+	}
 
-    // GetAccount
-    got, err := c.GetAccount(ctx, acct.id)
-    if err != nil {
-        t.Fatalf("GetAccount failed: %v", err)
-    }
-    if got.id != acct.id || got.name != acct.name {
-        t.Fatalf("GetAccount mismatch: %#v vs %#v", got, acct)
-    }
+	// GetAccount
+	got, err := c.GetAccount(ctx, acct.id)
+	if err != nil {
+		t.Fatalf("GetAccount failed: %v", err)
+	}
+	if got.id != acct.id || got.name != acct.name {
+		t.Fatalf("GetAccount mismatch: %#v vs %#v", got, acct)
+	}
 
-    // ListAccountsByTarget
-    list, err := c.ListAccountsByTarget(ctx, tgt.id)
-    if err != nil {
-        t.Fatalf("ListAccountsByTarget failed: %v", err)
-    }
-    if len(list) != 1 || list[0].id != acct.id {
-        t.Fatalf("ListAccountsByTarget unexpected: %#v", list)
-    }
+	// ListAccountsByTarget
+	list, err := c.ListAccountsByTarget(ctx, tgt.id)
+	if err != nil {
+		t.Fatalf("ListAccountsByTarget failed: %v", err)
+	}
+	if len(list) != 1 || list[0].id != acct.id {
+		t.Fatalf("ListAccountsByTarget unexpected: %#v", list)
+	}
 
-    // GetAccounts
-    many, err := c.GetAccounts(ctx, acct.id)
-    if err != nil {
-        t.Fatalf("GetAccounts failed: %v", err)
-    }
-    if len(many) != 1 || many[0].id != acct.id {
-        t.Fatalf("GetAccounts unexpected: %#v", many)
-    }
+	// GetAccounts
+	many, err := c.GetAccounts(ctx, acct.id)
+	if err != nil {
+		t.Fatalf("GetAccounts failed: %v", err)
+	}
+	if len(many) != 1 || many[0].id != acct.id {
+		t.Fatalf("GetAccounts unexpected: %#v", many)
+	}
 
-    // DeleteAccounts
-    if err := c.DeleteAccounts(ctx, acct.id); err != nil {
-        t.Fatalf("DeleteAccounts failed: %v", err)
-    }
-    after, err := c.ListAccountsByTarget(ctx, tgt.id)
-    if err != nil {
-        t.Fatalf("ListAccountsByTarget after delete failed: %v", err)
-    }
-    if len(after) != 0 {
-        t.Fatalf("expected zero accounts after delete, got: %#v", after)
-    }
+	// DeleteAccounts
+	if err := c.DeleteAccounts(ctx, acct.id); err != nil {
+		t.Fatalf("DeleteAccounts failed: %v", err)
+	}
+	after, err := c.ListAccountsByTarget(ctx, tgt.id)
+	if err != nil {
+		t.Fatalf("ListAccountsByTarget after delete failed: %v", err)
+	}
+	if len(after) != 0 {
+		t.Fatalf("expected zero accounts after delete, got: %#v", after)
+	}
 }