@@ -78,7 +78,7 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
78
78
}
79
79
}
80
80
81
- hasDatabaseUserWithAccess , err := db .HasDatabaseUserWithAccess (ctx , database .Spec .Username , database .Spec .Database )
81
+ hasDatabaseUserWithAccess , err := db .HasDatabaseUserWithAccess (ctx , database .Spec .Database , database .Spec .Username )
82
82
if err != nil {
83
83
log .Error (err , "Can't check if user has access to database" )
84
84
return ctrl.Result {}, err
@@ -87,7 +87,7 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
87
87
if ! hasDatabaseUserWithAccess {
88
88
log .Info ("Create new user '" + database .Spec .Username + "' with access to the database '" + database .Spec .Database + "'" )
89
89
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 )
91
91
if err != nil {
92
92
log .Error (err , "Can't create database user with access to database" )
93
93
return ctrl.Result {}, err
@@ -176,15 +176,15 @@ func (r *DatabaseReconciler) finalizeDatabase(ctx context.Context, log logr.Logg
176
176
177
177
defer db .Close (ctx )
178
178
179
- hasDatabaseUserWithAccess , err := db .HasDatabaseUserWithAccess (ctx , database .Spec .Username , database .Spec .Database )
179
+ hasDatabaseUserWithAccess , err := db .HasDatabaseUserWithAccess (ctx , database .Spec .Database , database .Spec .Username )
180
180
if err != nil {
181
181
return err
182
182
}
183
183
184
184
if hasDatabaseUserWithAccess {
185
185
log .Info ("Remove user '" + database .Spec .Username + "' and its access to the database '" + database .Spec .Database + "'" )
186
186
187
- err = db .DeleteDatabaseUser (ctx , database .Spec .Username , database .Spec .Database )
187
+ err = db .DeleteDatabaseUser (ctx , database .Spec .Database , database .Spec .Username )
188
188
if err != nil {
189
189
return err
190
190
}
0 commit comments