Enforce a requeue on delete for DBInstance and DBCluster

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-08-22T23:47:01Z"
-  build_hash: 1045a5e99038b11b0630ca2f2f69c3bae4bedba6
-  go_version: go1.25.0
-  version: v0.51.0-1-g1045a5e
+  build_date: "2025-09-03T20:10:59Z"
+  build_hash: 1d9076d0211773ff8ab8682b28b912c7ece10676
+  go_version: go1.24.5
+  version: v0.51.0-2-g1d9076d
 api_directory_checksum: 90b0d1adcc91f4a1b1f1b436e3ac0c30d9271678
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: ecb60f0fe79237eb820e68d823e6da2bf0829140
+  file_checksum: 746b45e4dfa86a7e3fc4979703205281a4b71e8f
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -157,6 +157,8 @@ resources:
         template_path: hooks/db_cluster/sdk_delete_pre_build_request.go.tpl
       sdk_delete_post_build_request:
         template_path: hooks/db_cluster/sdk_delete_post_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: hooks/common/sdk_delete_post_request.go.tpl
       sdk_file_end:
         template_path: hooks/db_cluster/sdk_file_end.go.tpl
     exceptions:
@@ -310,6 +312,8 @@ resources:
         template_path: hooks/db_instance/sdk_delete_pre_build_request.go.tpl
       sdk_delete_post_build_request:
         template_path: hooks/db_instance/sdk_delete_post_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: hooks/common/sdk_delete_post_request.go.tpl
       sdk_file_end:
         template_path: hooks/db_instance/sdk_file_end.go.tpl
     exceptions:

generator.yaml

@@ -157,6 +157,8 @@ resources:
         template_path: hooks/db_cluster/sdk_delete_pre_build_request.go.tpl
       sdk_delete_post_build_request:
         template_path: hooks/db_cluster/sdk_delete_post_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: hooks/common/sdk_delete_post_request.go.tpl
       sdk_file_end:
         template_path: hooks/db_cluster/sdk_file_end.go.tpl
     exceptions:
@@ -310,6 +312,8 @@ resources:
         template_path: hooks/db_instance/sdk_delete_pre_build_request.go.tpl
       sdk_delete_post_build_request:
         template_path: hooks/db_instance/sdk_delete_post_build_request.go.tpl
+      sdk_delete_post_request:
+        template_path: hooks/common/sdk_delete_post_request.go.tpl
       sdk_file_end:
         template_path: hooks/db_instance/sdk_file_end.go.tpl
     exceptions:

templates/hooks/common/sdk_delete_post_request.go.tpl

@@ -0,0 +1,4 @@
+    if err == nil {
+		_ = resp
+        err = ackrequeue.Needed(fmt.Errorf("wait for DBInstance deletion"))
+    }

test/e2e/tests/test_db_instance.py

@@ -94,12 +94,11 @@ def postgres14_t3_micro_instance(k8s_secret):
 
     yield (ref, cr, secret.name)
 
-    # Try to delete, if doesn't already exist
-    try:
-        _, deleted = k8s.delete_custom_resource(ref, 3, 10)
-    except:
-        pass
+    k8s.delete_custom_resource(ref)
+    assert k8s.get_resource_exists(ref)
     db_instance.wait_until_deleted(db_instance_id)
+    time.sleep(60)
+    assert not k8s.get_resource_exists(ref)
 
 @service_marker
 @pytest.mark.canary

test/e2e/tests/test_references.py

@@ -287,25 +287,24 @@ def test_references(
         # we try to delete the DB Parameter Group before the DB Instance, the
         # cascading delete protection of resource references will mean the DB
         # Parameter Group won't be deleted.
-        _, deleted = k8s.delete_custom_resource(
-            db_instance_ref,
-            period_length=DELETE_INSTANCE_TIMEOUT_SECONDS,
-        )
-        assert deleted
+        k8s.delete_custom_resource(db_instance_ref)
+        # ensure db_instance does not disappear immidiately from k8s
+        assert k8s.get_resource_exists(db_instance_ref)
 
         # Wait a bit before trying to delete the cluster since the instance is
         # part of the cluster and sometimes the delete cluster complains if
         # it's too soon after deleting the last DB instance in it.
+        db_instance.wait_until_deleted(db_instance_id)
         time.sleep(60)
+        # ensure db_instance is removed from k8s once it is removed from AWS
+        assert not k8s.get_resource_exists(db_instance_ref)
 
-        db_instance.wait_until_deleted(db_instance_id)
 
         # Same for the DB cluster because it refers to the DB cluster
         # parameter group...
-        _, deleted = k8s.delete_custom_resource(
-            db_cluster_ref,
-            period_length=DELETE_CLUSTER_TIMEOUT_SECONDS,
-        )
-        assert deleted
+        k8s.delete_custom_resource(db_cluster_ref)
+        assert k8s.get_resource_exists(db_cluster_ref)
 
         db_cluster.wait_until_deleted(db_cluster_id)
+        time.sleep(60)
+        assert not k8s.get_resource_exists(db_cluster_ref)