fixes integration tests

Author: TiberiuGC

test/e2e/ip_set.py

@@ -56,5 +56,5 @@ def get(
     try:
         resp = c.get_ip_set(Name=name, Id=id, Scope=scope)
         return resp["IPSet"]
-    except c.exceptions.BadRequestException:
+    except c.exceptions.WAFNonexistentItemException:
         return None

test/e2e/requirements.txt

@@ -1 +1 @@
-acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@66d07f4daa2ce12d92f07cb332d5342a0aea4feb
+acktest @ git+https://github.com/aws-controllers-k8s/test-infra.git@3aedc6b0bf8bbcfdaf0bddb322d5c6adf04c329a

test/e2e/tests/test_ip_set.py

@@ -80,9 +80,8 @@ def test_crud(self, simple_ip_set):
         ip_set_name = cr["spec"]["name"]
 
         assert "status" in cr
-        assert "ackResourceMetadata" in cr["status"]
-        assert "arn" in cr["status"]["ackResourceMetadata"]
-        ip_set_id = cr["status"]["ackResourceMetadata"]["id"]
+        assert "id" in cr["status"]
+        ip_set_id = cr["status"]["id"]
 
         latest = ip_set.get(ip_set_name, ip_set_id)
         assert latest is not None
@@ -95,8 +94,10 @@ def test_crud(self, simple_ip_set):
 
         # update the CR
         updates = {
-            "spec": {"addresses": [addresses[0], addresses[1], "192.0.0.0/16"]},
-            "spec": {"description": "updated description"},
+            "spec": {
+                "addresses": [addresses[0], addresses[1], "192.0.0.0/16"],
+                "description": "updated description",
+            },
         }
         k8s.patch_custom_resource(ref, updates)
         time.sleep(MODIFY_WAIT_SECONDS)
@@ -111,5 +112,6 @@ def test_crud(self, simple_ip_set):
         assert description == "updated description"
 
         # delete the CR
-        simple_ip_set
-        ip_set.wait_until_deleted(ip_set_name)
+        _, deleted = k8s.delete_custom_resource(ref, DELETE_WAIT_SECONDS)
+        assert deleted
+        ip_set.wait_until_deleted(ip_set_name, ip_set_id)