set finalizer when user is expired (#2346)

s-urbaniak · web-flow · commit 15ebedeb0c4c · 2025-05-22T08:23:00.000+02:00
diff --git a/internal/controller/atlasdatabaseuser/databaseuser.go b/internal/controller/atlasdatabaseuser/databaseuser.go
@@ -92,7 +92,8 @@ func (r *AtlasDatabaseUserReconciler) dbuLifeCycle(ctx *workflow.Context, dbUser
 			return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserConnectionSecretsNotDeleted, true, err)
 		}
 
-		return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserExpired, false, errors.New("an expired user cannot be managed"))
+		ctx.SetConditionFromResult(api.DatabaseUserReadyType, workflow.Terminate(workflow.DatabaseUserExpired, errors.New("an expired user cannot be managed")))
+		return r.unmanage(ctx, atlasProject.ID, atlasDatabaseUser)
 	}
 
 	scopesAreValid, err := r.areDeploymentScopesValid(ctx, deploymentService, atlasProject.ID, atlasDatabaseUser)
diff --git a/test/e2e/db_users_test.go b/test/e2e/db_users_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package e2e
+package e2e_test
 
 import (
 	"context"

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ func (r AtlasDatabaseUserReconciler) dbuLifeCycle(ctx workflow.Context, dbUser`
`92`	`92`	`return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserConnectionSecretsNotDeleted, true, err)`
`93`	`93`	`}`
`94`	`94`
`95`		`- return r.terminate(ctx, atlasDatabaseUser, api.DatabaseUserReadyType, workflow.DatabaseUserExpired, false, errors.New("an expired user cannot be managed"))`
	`95`	`+ ctx.SetConditionFromResult(api.DatabaseUserReadyType, workflow.Terminate(workflow.DatabaseUserExpired, errors.New("an expired user cannot be managed")))`
	`96`	`+ return r.unmanage(ctx, atlasProject.ID, atlasDatabaseUser)`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`scopesAreValid, err := r.areDeploymentScopesValid(ctx, deploymentService, atlasProject.ID, atlasDatabaseUser)`