PRs into main (#2041)

* Lambda runtime deprecation updates (#2033) https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-runtime * switching AvailabilityZone from AllowedValues to AllowedPatternRegex fixes #1966 https://aws.amazon.com/blogs/aws/now-open-third-availability-zone-in-the-aws-china-beijing-region/ Co-authored-by: Pat Myron <PatMyron@users.noreply.github.com>
aws-cloudformation · Jun 10, 2021 · 3d30463 · 3d30463
1 parent c989980
commit 3d30463
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 58 deletions.
diff --git a/src/cfnlint/data/AdditionalSpecs/LmbdRuntimeLifecycle.json b/src/cfnlint/data/AdditionalSpecs/LmbdRuntimeLifecycle.json
@@ -40,8 +40,8 @@
         "successor": "nodejs14.x"
     },
     "nodejs10.x": {
-        "eol": "2021-05-31",
-        "deprecated": "2021-06-30",
+        "eol": "2021-07-30",
+        "deprecated": "2021-08-30",
         "successor": "nodejs14.x"
     },
     "python2.7": {
@@ -50,8 +50,8 @@
         "successor": "python3.8"
     },
     "ruby2.5": {
-        "eol": "2021-05-31",
-        "deprecated": "2021-06-30",
+        "eol": "2021-07-30",
+        "deprecated": "2021-08-30",
         "successor": "ruby2.7"
     }
 }
diff --git a/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json b/src/cfnlint/data/ExtendedSpecs/all/03_value_types.json
@@ -4,33 +4,7 @@
     "path": "/ValueTypes",
     "value": {
       "AvailabilityZone": {
-        "AllowedValues": [
-          "af-south-1a", "af-south-1b", "af-south-1c",
-          "ap-east-1a", "ap-east-1b", "ap-east-1c",
-          "ap-northeast-1a", "ap-northeast-1b", "ap-northeast-1c", "ap-northeast-1d",
-          "ap-northeast-2a", "ap-northeast-2b", "ap-northeast-2c", "ap-northeast-2d",
-          "ap-northeast-3a",
-          "ap-south-1a", "ap-south-1b", "ap-south-1c",
-          "ap-southeast-1a", "ap-southeast-1b", "ap-southeast-1c",
-          "ap-southeast-2a", "ap-southeast-2b", "ap-southeast-2c",
-          "ca-central-1a", "ca-central-1b", "ca-central-1d",
-          "cn-north-1a", "cn-north-1b",
-          "cn-northwest-1a", "cn-northwest-1b", "cn-northwest-1c",
-          "eu-central-1a", "eu-central-1b", "eu-central-1c",
-          "eu-north-1a", "eu-north-1b", "eu-north-1c",
-          "eu-south-1a", "eu-south-1b", "eu-south-1c",
-          "eu-west-1a", "eu-west-1b", "eu-west-1c",
-          "eu-west-2a", "eu-west-2b", "eu-west-2c",
-          "eu-west-3a", "eu-west-3b", "eu-west-3c",
-          "me-south-1a", "me-south-1b", "me-south-1c",
-          "sa-east-1a", "sa-east-1b", "sa-east-1c",
-          "us-east-1a", "us-east-1b", "us-east-1c", "us-east-1d", "us-east-1e", "us-east-1f", "us-east-1-bos-1a", "us-east-1-iah-1a", "us-east-1-mia-1a",
-          "us-east-2a", "us-east-2b", "us-east-2c",
-          "us-gov-east-1a", "us-gov-east-1b", "us-gov-east-1c",
-          "us-gov-west-1a", "us-gov-west-1b", "us-gov-west-1c",
-          "us-west-1a", "us-west-1b", "us-west-1c",
-          "us-west-2a", "us-west-2b", "us-west-2c", "us-west-2d", "us-west-2-lax-1a", "us-west-2-lax-1b"
-        ],
+        "AllowedPatternRegex": "[a-z0-9-]+",
         "GetAtt": {
           "AWS::EC2::Instance": "AvailabilityZone",
           "AWS::EC2::Subnet": "AvailabilityZone",
@@ -53,33 +27,7 @@
         }
       },
       "AvailabilityZoneWithAll": {
-        "AllowedValues": [
-          "all", "af-south-1a", "af-south-1b", "af-south-1c",
-          "ap-east-1a", "ap-east-1b", "ap-east-1c",
-          "ap-northeast-1a", "ap-northeast-1b", "ap-northeast-1c", "ap-northeast-1d",
-          "ap-northeast-2a", "ap-northeast-2b", "ap-northeast-2c", "ap-northeast-2d",
-          "ap-northeast-3a",
-          "ap-south-1a", "ap-south-1b", "ap-south-1c",
-          "ap-southeast-1a", "ap-southeast-1b", "ap-southeast-1c",
-          "ap-southeast-2a", "ap-southeast-2b", "ap-southeast-2c",
-          "ca-central-1a", "ca-central-1b", "ca-central-1d",
-          "cn-north-1a", "cn-north-1b",
-          "cn-northwest-1a", "cn-northwest-1b", "cn-northwest-1c",
-          "eu-central-1a", "eu-central-1b", "eu-central-1c",
-          "eu-north-1a", "eu-north-1b", "eu-north-1c",
-          "eu-south-1a", "eu-south-1b", "eu-south-1c",
-          "eu-west-1a", "eu-west-1b", "eu-west-1c",
-          "eu-west-2a", "eu-west-2b", "eu-west-2c",
-          "eu-west-3a", "eu-west-3b", "eu-west-3c",
-          "me-south-1a", "me-south-1b", "me-south-1c",
-          "sa-east-1a", "sa-east-1b", "sa-east-1c",
-          "us-east-1a", "us-east-1b", "us-east-1c", "us-east-1d", "us-east-1e", "us-east-1f", "us-east-1-bos-1a", "us-east-1-iah-1a", "us-east-1-mia-1a",
-          "us-east-2a", "us-east-2b", "us-east-2c",
-          "us-gov-east-1a", "us-gov-east-1b", "us-gov-east-1c",
-          "us-gov-west-1a", "us-gov-west-1b", "us-gov-west-1c",
-          "us-west-1a", "us-west-1b", "us-west-1c",
-          "us-west-2a", "us-west-2b", "us-west-2c", "us-west-2d", "us-west-2-lax-1a", "us-west-2-lax-1b"
-        ],
+        "AllowedPatternRegex": "[a-z0-9-]+",
         "GetAtt": {
           "AWS::EC2::Instance": "AvailabilityZone",
           "AWS::EC2::Subnet": "AvailabilityZone",