Merge branch 'main' into create-pull-request/maintenance-v1

aws-cloudformation · Dec 2, 2024 · 9e3ce0a · 9e3ce0a
2 parents 84a1dfa + 4cf5831
commit 9e3ce0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/scripts/update_schemas_from_aws_api.py b/scripts/update_schemas_from_aws_api.py
@@ -155,6 +155,12 @@ def write_db_instance(results):
             continue
 
         engine_versions = sorted(results.get(engine))
+        if engine == "postgres":
+            for engine_version in engine_versions.copy():
+                major_engine_version = ".".join(engine_version.split(".")[0:1])
+                if major_engine_version not in engine_versions:
+                    engine_versions.append(major_engine_version)
+            engine_versions = sorted(engine_versions)
         if engine == "aurora-mysql":
             for engine_version in engine_versions.copy():
                 sub_engine_version = ".".join(engine_version.split(".")[0:2])
@@ -258,7 +264,6 @@ def elasticache_api():
     for page in elasticache_client.get_paginator(
         "describe_cache_engine_versions"
     ).paginate():
-        print(page)
         for version in page.get("CacheEngineVersions"):
             engine = version.get("Engine")
             engine_version = version.get("EngineVersion")

diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json
@@ -466,10 +466,12 @@
     "properties": {
      "EngineVersion": {
       "enum": [
+       "11",
        "11.22",
        "11.22-rds.20240418",
        "11.22-rds.20240509",
        "11.22-rds.20240808",
+       "12",
        "12.15",
        "12.16",
        "12.17",
@@ -478,6 +480,7 @@
        "12.20",
        "12.21",
        "12.22",
+       "13",
        "13.11",
        "13.12",
        "13.13",
@@ -486,26 +489,30 @@
        "13.16",
        "13.17",
        "13.18",
+       "14",
        "14.10",
        "14.11",
        "14.12",
        "14.13",
        "14.14",
        "14.15",
        "14.9",
+       "15",
        "15.10",
        "15.4",
        "15.5",
        "15.6",
        "15.7",
        "15.8",
        "15.9",
+       "16",
        "16.1",
        "16.2",
        "16.3",
        "16.4",
        "16.5",
        "16.6",
+       "17",
        "17.1",
        "17.2"
       ]