Skip to content

Commit 0a173f3

Browse files
committed
fix: correct argument order
1 parent 96f1696 commit 0a173f3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

controllers/database_controller.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
7878
}
7979
}
8080

81-
hasDatabaseUserWithAccess, err := db.HasDatabaseUserWithAccess(ctx, database.Spec.Username, database.Spec.Database)
81+
hasDatabaseUserWithAccess, err := db.HasDatabaseUserWithAccess(ctx, database.Spec.Database, database.Spec.Username)
8282
if err != nil {
8383
log.Error(err, "Can't check if user has access to database")
8484
return ctrl.Result{}, err
@@ -87,7 +87,7 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
8787
if !hasDatabaseUserWithAccess {
8888
log.Info("Create new user '" + database.Spec.Username + "' with access to the database '" + database.Spec.Database + "'")
8989

90-
err = db.CreateDatabaseUser(ctx, database.Spec.Username, database.Spec.Password, database.Spec.Database)
90+
err = db.CreateDatabaseUser(ctx, database.Spec.Database, database.Spec.Username, database.Spec.Password)
9191
if err != nil {
9292
log.Error(err, "Can't create database user with access to database")
9393
return ctrl.Result{}, err
@@ -176,15 +176,15 @@ func (r *DatabaseReconciler) finalizeDatabase(ctx context.Context, log logr.Logg
176176

177177
defer db.Close(ctx)
178178

179-
hasDatabaseUserWithAccess, err := db.HasDatabaseUserWithAccess(ctx, database.Spec.Username, database.Spec.Database)
179+
hasDatabaseUserWithAccess, err := db.HasDatabaseUserWithAccess(ctx, database.Spec.Database, database.Spec.Username)
180180
if err != nil {
181181
return err
182182
}
183183

184184
if hasDatabaseUserWithAccess {
185185
log.Info("Remove user '" + database.Spec.Username + "' and its access to the database '" + database.Spec.Database + "'")
186186

187-
err = db.DeleteDatabaseUser(ctx, database.Spec.Username, database.Spec.Database)
187+
err = db.DeleteDatabaseUser(ctx, database.Spec.Database, database.Spec.Username)
188188
if err != nil {
189189
return err
190190
}

0 commit comments

Comments
 (0)