Skip to content

Commit 04aaf51

Browse files
committed
Cluster: Persist database credentials in cluster_nodes_register.go
Signed-off-by: Michael Mayer <[email protected]>
1 parent b644be3 commit 04aaf51

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

internal/api/cluster_nodes_register.go

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,24 @@ func ClusterNodesRegister(router *gin.RouterGroup) {
239239
}
240240
haveCreds = true
241241

242-
if req.RotateDatabase {
242+
if n.Database == nil {
243+
n.Database = &cluster.NodeDatabase{}
244+
}
245+
246+
n.Database.Name = creds.Name
247+
n.Database.User = creds.User
248+
n.Database.Driver = provisioner.DatabaseDriver
249+
if creds.RotatedAt != "" {
243250
n.Database.RotatedAt = creds.RotatedAt
244-
n.Database.Driver = provisioner.DatabaseDriver
245-
if putErr := regy.Put(n); putErr != nil {
246-
event.AuditErr([]string{clientIp, string(acl.ResourceCluster), "node", "%s", "persist node", status.Error(putErr)}, clean.Log(name))
247-
AbortUnexpectedError(c)
248-
return
249-
}
251+
}
252+
253+
if putErr := regy.Put(n); putErr != nil {
254+
event.AuditErr([]string{clientIp, string(acl.ResourceCluster), "node", "%s", "persist node", status.Error(putErr)}, clean.Log(name))
255+
AbortUnexpectedError(c)
256+
return
257+
}
258+
259+
if req.RotateDatabase {
250260
event.AuditInfo([]string{clientIp, string(acl.ResourceCluster), "node", "%s", "rotate database", status.Succeeded}, clean.Log(name))
251261
}
252262
}

0 commit comments

Comments
 (0)