PBM-1522 Check full db name instead of a prefix (#1106)

t-yrka · web-flow · commit 3ffcd43c859e · 2025-03-19T11:20:29.000+01:00
Make sure to not skip other databases than 'admin'.
diff --git a/pbm/restore/logical.go b/pbm/restore/logical.go
@@ -1408,7 +1408,7 @@ func (r *Restore) swapUsers(ctx context.Context, exclude *topo.AuthInfo, nss []s
 	for _, ns := range nss {
 		// ns can be "*.*" or "admin.pbmRUsers" or "admin.pbmRRoles"
 		db, _ := util.ParseNS(ns)
-		if len(db) == 0 || strings.HasPrefix(db, defs.DB) {
+		if len(db) == 0 || db == defs.DB {
 			continue
 		}
 		dbs = append(dbs, db)

Original file line number	Diff line number	Diff line change
`@@ -1408,7 +1408,7 @@ func (r Restore) swapUsers(ctx context.Context, exclude topo.AuthInfo, nss []s`
`1408`	`1408`	`for _, ns := range nss {`
`1409`	`1409`	`// ns can be "." or "admin.pbmRUsers" or "admin.pbmRRoles"`
`1410`	`1410`	`db, _ := util.ParseNS(ns)`
`1411`		`- if len(db) == 0 \|\| strings.HasPrefix(db, defs.DB) {`
	`1411`	`+ if len(db) == 0 \|\| db == defs.DB {`
`1412`	`1412`	`continue`
`1413`	`1413`	`}`
`1414`	`1414`	`dbs = append(dbs, db)`