Merge in upstream changes

aws-cloudformation · Jun 13, 2023 · d6ed258 · d6ed258
1 parent 9ce2122
commit d6ed258
Show file tree

Hide file tree

Showing 120 changed files with 18,071 additions and 7,421 deletions.
diff --git a/scripts/fix_data_files.py b/scripts/fix_data_files.py
@@ -14,9 +14,10 @@
 from cfnlint.helpers import format_json_string
 
 modules = [
-    "ExtendedSpecs",
+    "AdditionalSchemas",
     "AdditionalSpecs",
     "CfnLintCli",
+    "ExtendedProviderSchemas",
     "Serverless",
     "ProviderSchemasPatches",
 ]

diff --git a/scripts/update_specs_from_pricing.py b/scripts/update_specs_from_pricing.py
@@ -14,6 +14,7 @@
 import logging
 
 import boto3
+from botocore.client import Config
 
 LOGGER = logging.getLogger("cfnlint")
 
@@ -56,7 +57,8 @@
 }
 
 session = boto3.session.Session()
-client = session.client("pricing", region_name="us-east-1")
+config = Config(retries={"max_attempts": 10})
+client = session.client("pricing", region_name="us-east-1", config=config)
 
 
 def configure_logging():
@@ -271,7 +273,11 @@ def main():
     """main function"""
     configure_logging()
 
-    # write_output('EC2InstanceType', get_results('AmazonEC2', ['Compute Instance', 'Compute Instance (bare metal)']))
+    write_output(
+        "aws-ec2-instance",
+        "instancetype-enum",
+        get_results("AmazonEC2", ["Compute Instance", "Compute Instance (bare metal)"]),
+    )
     write_output("aws-amazonmq-broker", "instancetype-enum", get_mq_pricing())
     write_output("aws-rds-dbinstance", "dbinstanceclass-enum", get_rds_pricing())
     write_output(