From 91f0511a8df89f0bc4cd0d3932deb49a2058c4e8 Mon Sep 17 00:00:00 2001 From: Havrileck Alexandre Date: Thu, 22 Feb 2024 21:54:22 +0100 Subject: [PATCH] style: Fix linter errors --- .../postgresql/postgresqluser_controller.go | 12 ++++++++---- .../postgresql/postgresqluserrole_controller.go | 3 --- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/controller/postgresql/postgresqluser_controller.go b/internal/controller/postgresql/postgresqluser_controller.go index 6136602..ca82e5b 100644 --- a/internal/controller/postgresql/postgresqluser_controller.go +++ b/internal/controller/postgresql/postgresqluser_controller.go @@ -269,16 +269,18 @@ func (r *PostgresqlUserReconciler) Reconcile(ctx context.Context, req ctrl.Reque // Update status instance.Status.LastPasswordChangedTime = time.Now().Format(time.RFC3339) } else if !r.isSecretValid(secrFound, generatedSecret) { // Check if secret must be updated because invalid - // Update password in pg reqLogger.Info("Updating password in Postgresql Engine") + // Update password in pg err = pgInstance.UpdatePassword(role, password) + // Check error if err != nil { return r.manageError(ctx, reqLogger, instance, originalPatch, err) } - // Need to update secret reqLogger.Info("Updating secret because secret has changed", "Secret.Namespace", generatedSecret.Namespace, "Secret.Name", generatedSecret.Name) + // Need to update secret err = r.updatePGUserSecret(ctx, secrFound, generatedSecret) + // Check error if err != nil { return r.manageError(ctx, reqLogger, instance, originalPatch, err) } @@ -295,22 +297,24 @@ func (r *PostgresqlUserReconciler) Reconcile(ctx context.Context, req ctrl.Reque // Check if is time to change now := time.Now() lastChange, err := time.Parse(time.RFC3339, instance.Status.LastPasswordChangedTime) + // Check error if err != nil { return r.manageError(ctx, reqLogger, instance, originalPatch, err) } if now.Sub(lastChange) >= dur { // Need to change password - - // Update password in pg reqLogger.Info("Updating password in Postgresql Engine") + // Update password in pg err = pgInstance.UpdatePassword(role, password) + // Check error if err != nil { return r.manageError(ctx, reqLogger, instance, originalPatch, err) } // Need to update secret reqLogger.Info("Updating secret", "Secret.Namespace", generatedSecret.Namespace, "Secret.Name", generatedSecret.Name) err = r.updatePGUserSecret(ctx, secrFound, generatedSecret) + // Check error if err != nil { return r.manageError(ctx, reqLogger, instance, originalPatch, err) } diff --git a/internal/controller/postgresql/postgresqluserrole_controller.go b/internal/controller/postgresql/postgresqluserrole_controller.go index 3b9f77e..b6f582d 100644 --- a/internal/controller/postgresql/postgresqluserrole_controller.go +++ b/internal/controller/postgresql/postgresqluserrole_controller.go @@ -755,7 +755,6 @@ func (r *PostgresqlUserRoleReconciler) createOrUpdateWorkSecretForManagedMode( / string(workSec.Data[UsernameSecretKey]) == "" || string(workSec.Data[PasswordSecretKey]) == "" { // Check if role have been changed or if work secret have been edited // Need to perform changes - // Update flags passwordChanged = true oldUsername = string(workSec.Data[UsernameSecretKey]) @@ -802,7 +801,6 @@ func (r *PostgresqlUserRoleReconciler) createOrUpdateWorkSecretForManagedMode( / if now.Sub(lastChange) >= dur { // Need to change username/password with a new one - // Get old username oldUsername = string(workSec.Data[UsernameSecretKey]) // Prepare data @@ -1173,7 +1171,6 @@ func (r *PostgresqlUserRoleReconciler) validateInstance( } } else { // Validate Managed one - // Must have a role prefix if instance.Spec.RolePrefix == "" { return errors.NewBadRequest("PostgresqlUserRole is in managed mode without any RolePrefix")