johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cluster: Ensure credentials are deleted after tests

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2025-10-09 14:56:45 +02:00
parent b46a6aef77
commit 81b8ed8182
5 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/commands/cluster_nodes_remove.go
View File

@@ -1,12 +1,15 @@
package commands
import (
"context"
"fmt"
"time"
"github.com/manifoldco/promptui"
"github.com/urfave/cli/v2"
"github.com/photoprism/photoprism/internal/config"
"github.com/photoprism/photoprism/internal/service/cluster/provisioner"
reg "github.com/photoprism/photoprism/internal/service/cluster/registry"
"github.com/photoprism/photoprism/pkg/clean"
)
@@ -19,6 +22,7 @@ var ClusterNodesRemoveCommand = &cli.Command{
Flags: []cli.Flag{
&cli.BoolFlag{Name: "yes", Aliases: []string{"y"}, Usage: "runs the command non-interactively"},
&cli.BoolFlag{Name: "all-ids", Usage: "delete all records that share the same UUID (admin cleanup)"},
&cli.BoolFlag{Name: "drop-db", Aliases: []string{"d"}, Usage: "drop the node’s provisioned database and user after registry deletion"},
},
Hidden: true, // Required for cluster-management only.
Action: clusterNodesRemoveAction,
@@ -31,28 +35,37 @@ func clusterNodesRemoveAction(ctx *cli.Context) error {
}
key := ctx.Args().First()
if key == "" {
return cli.Exit(fmt.Errorf("node id or name is required"), 2)
}
r, err := reg.NewClientRegistryWithConfig(conf)
if err != nil {
return cli.Exit(err, 1)
}
// Resolve to id for deletion, but also support name.
// Resolve UUID to delete: accept uuid → clientId → name.
uuid := key
if n, err2 := r.FindByNodeUUID(uuid); err2 == nil && n != nil {
uuid = n.UUID
} else if n, err2 := r.FindByClientID(uuid); err2 == nil && n != nil {
uuid = n.UUID
} else if n, err2 := r.FindByName(clean.DNSLabel(key)); err2 == nil && n != nil {
uuid = n.UUID
} else {
var node *reg.Node
if n, findErr := r.FindByNodeUUID(key); findErr == nil && n != nil {
node = n
} else if n, findErr = r.FindByClientID(key); findErr == nil && n != nil {
node = n
} else if name := clean.DNSLabel(key); name != "" {
if n, findErr = r.FindByName(name); findErr == nil && n != nil {
node = n
}
}
if node == nil {
return cli.Exit(fmt.Errorf("node not found"), 3)
}
uuid := node.UUID
confirmed := RunNonInteractively(ctx.Bool("yes"))
if !confirmed {
prompt := promptui.Prompt{Label: fmt.Sprintf("Delete node %s?", clean.Log(uuid)), IsConfirm: true}
@@ -62,6 +75,13 @@ func clusterNodesRemoveAction(ctx *cli.Context) error {
}
}
dropDB := ctx.Bool("drop-db")
dbName, dbUser := "", ""
if dropDB && node.Database != nil {
dbName = node.Database.Name
dbUser = node.Database.User
}
if ctx.Bool("all-ids") {
if err := r.DeleteAllByUUID(uuid); err != nil {
return cli.Exit(err, 1)
@@ -70,7 +90,21 @@ func clusterNodesRemoveAction(ctx *cli.Context) error {
return cli.Exit(err, 1)
}
if dropDB {
if dbName == "" && dbUser == "" {
log.Infof("node %s has been deleted (no database credentials recorded)", clean.Log(uuid))
} else {
dropCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
if err := provisioner.DropCredentials(dropCtx, dbName, dbUser); err != nil {
return cli.Exit(fmt.Errorf("failed to drop database credentials for node %s: %w", clean.Log(uuid), err), 1)
}
log.Infof("node %s database %s and user %s have been dropped", clean.Log(uuid), clean.Log(dbName), clean.Log(dbUser))
}
}
log.Infof("node %s has been deleted", clean.Log(uuid))
return nil
})
}