Merge branch 'main' into better-status-condition

Author: graindcafe

internal/controller/user/reconcile.go

@@ -446,6 +446,16 @@ func (r *S3UserReconciler) handleUpdate(
 			  s3v1alpha1.Reconciling,
 			  fmt.Sprintf("The user %s will be deleted from the S3 backend, then recreated (through another reconcile), the secret %s will be kept.", userResource.Name, currentUserSecret.Name))
 
+
+			}
+		} else {
+			logger.Info(
+				"The user will be deleted from the S3 backend, then recreated (through another reconcile), the secret will be kept.",
+				"userResource",
+				userResource.Name,
+				"NamespacedName",
+				req.NamespacedName.String(),
+			)
 		}
 
 		err = s3Client.DeleteUser(userResource.Spec.AccessKey)
@@ -644,6 +654,7 @@ func (r *S3UserReconciler) handleCreate(
 		if r.OverrideExistingSecret || r.ReadExistingSecret {
 			if r.ReadExistingSecret {
 				// Case 3.2a : read existing secret instead of updating it
+
 				r.SetProgressingCondition(ctx,
 						  req,
 						  userResource,

internal/controller/user/reconcile_test.go

@@ -400,6 +400,7 @@ func TestHandleUpdate(t *testing.T) {
 				Name:      "existing-valid-user",
 			}, s3UserResourceUpdated)
 			assert.NoError(t, err)
+
 			var conditions = s3UserResourceUpdated.Status.Conditions
 			var lastCondition = conditions[len(conditions) - 1]
 			assert.Equal(t, s3v1alpha1.Reconciled, lastCondition.Reason)