Add SES exception for boto MatchingEventTypes (#3843)

* Turn MatchingEventTypes into an exception
aws-cloudformation · Nov 28, 2024 · a1c8868 · a1c8868
1 parent 6846123
commit a1c8868
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 27 deletions.
diff --git a/scripts/boto/_automated_patches.py b/scripts/boto/_automated_patches.py
@@ -9,7 +9,7 @@
 
 from _types import AllPatches, Patch, ResourcePatches
 
-from cfnlint.schema.resolver import RefResolver
+from cfnlint.schema.resolver import RefResolutionError, RefResolver
 
 skip = [
     "account",
@@ -144,7 +144,7 @@ def _nested_objects(
     start_path: str,
     source: list[str],
 ):
-    results = {}
+    results: dict[str, Patch] = {}
     for member, member_data in shape_data.get("members", {}).items():
         for p_name, p_data in schema_data.get("properties", {}).items():
             if p_name in skip_property_names:
@@ -162,7 +162,10 @@ def _nested_objects(
                     if "$ref" not in p_data:
                         break
                     path = p_data["$ref"][1:]
-                    p_data = resolver.resolve_from_url(p_data["$ref"])
+                    try:
+                        p_data = resolver.resolve_from_url(p_data["$ref"])
+                    except RefResolutionError:
+                        return results
 
                 # skip if we already have an enum or pattern
                 if any([p_data.get(field) for field in _fields]):

diff --git a/scripts/boto/update_schemas_from_boto.py b/scripts/boto/update_schemas_from_boto.py
@@ -28,6 +28,10 @@
     "batch",
 ]
 
+exceptions = {
+    "ses": ["/definitions/EventDestination/properties/MatchingEventTypes/items"]
+}
+
 
 def configure_logging():
     """Setup Logging"""
@@ -88,6 +92,9 @@ def build_resource_type_patches(
                         )
                         continue
                 if value:
+                    if patch.source[0] in exceptions:
+                        if path in exceptions[patch.source[0]]:
+                            continue
                     if patch.source[0] in case_insensitive_services and field == "enum":
                         field = "enumCaseInsensitive"
                         value = [v.lower() for v in value]

diff --git a/...nt/data/schemas/patches/extensions/all/aws_ses_configurationseteventdestination/boto.json b/...nt/data/schemas/patches/extensions/all/aws_ses_configurationseteventdestination/boto.json
@@ -1,18 +1,4 @@
 [
- {
-  "op": "add",
-  "path": "/definitions/EventDestination/properties/MatchingEventTypes/items/enum",
-  "value": [
-   "bounce",
-   "click",
-   "complaint",
-   "delivery",
-   "open",
-   "reject",
-   "renderingFailure",
-   "send"
-  ]
- },
  {
   "op": "add",
   "path": "/definitions/DimensionConfiguration/properties/DimensionValueSource/enum",

diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ses-configurationseteventdestination.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ses-configurationseteventdestination.json
@@ -82,16 +82,6 @@
     "MatchingEventTypes": {
      "insertionOrder": false,
      "items": {
-      "enum": [
-       "bounce",
-       "click",
-       "complaint",
-       "delivery",
-       "open",
-       "reject",
-       "renderingFailure",
-       "send"
-      ],
       "type": "string"
      },
      "type": "array",