cfnlint v1 compatibility upgrade

.github/workflows/tests.yml

@@ -65,3 +65,4 @@ jobs:
         run: make -C $FOLDER lint
       - name: Tests
         run: make -C $FOLDER test
+

.vscode/settings.json

@@ -0,0 +1,44 @@
+{
+    "yaml.schemas": {
+        "file:///Users/sliedig/Library/Application%20Support/Code/User/globalStorage/amazonwebservices.aws-toolkit-vscode/sam.schema.json": [
+            "resources/templates/lambda.yaml",
+            "resources/templates/sns.yaml",
+            "resources/templates/cognito-user-pool.yaml",
+            "example/template.yaml",
+            "examples/SimpleLambda/template.yaml",
+            "benchmark/template.yaml",
+            "blog/account-a-web-store/template.yaml",
+            "blog/account-c-invoice-processing/template.yaml",
+            "patterns/multi-bus-multi-account-pattern/blue-service-account/blue-service-app/template.yaml",
+            "patterns/multi-bus-multi-account-pattern/orange-service-account/orange-service-app/template.yaml",
+            "patterns/single-bus-multi-account-pattern/orange-service-account/orange-service-app/template.yaml",
+            "patterns/multi-bus-multi-account-pattern/purple-service-account/purple-service-app/template.yaml",
+            "patterns/single-bus-multi-account-pattern/purple-service-account/purple-service-app/template.yaml",
+            "patterns/single-bus-multi-account-pattern/blue-service-account/blue-service-app/template.yaml",
+            "src/backend/template.yaml",
+            "sam-app/template.yaml",
+            "sam-app-github/template.yaml",
+            "sam-pipelines-demo-rakuten/template.yaml",
+            "sam/app-control-concurrency-with-dynamodb/template.yaml",
+            "sam/app-decompose-for-parallelism/template.yaml",
+            "sam/app-s3-athena-dataprocessing/template.yaml",
+            "sam/app-order-management/template.yaml",
+            "backend/template.yaml",
+            "packaged.yaml",
+            "template.yaml",
+            "src/property-contract/template.yaml",
+            "src/unicorn-property/template.yaml",
+            "src/unicorn-properties-sam/unicorn-properties/template.yaml",
+            "src/unicorn-properties-sam/unicorn-contracts/template.yaml",
+            "src/unicorn-properties-sam/unicorn-properties-web/template.yaml"
+        ],
+        "file:/Users/sliedig/Library/Application Support/Code/User/globalStorage/amazonwebservices.aws-toolkit-vscode/sam.schema.json": [
+            "example/template.yaml",
+            "benchmark/template.yaml",
+            "resources/templates/lambda.yaml",
+            "resources/templates/sns.yaml",
+            "resources/templates/cognito-user-pool.yaml"
+        ],
+        "https://www.artillery.io/schema.json": []
+    }
+}

cfn-lint-serverless/README.md

@@ -15,4 +15,4 @@ Usage
 
 ```bash
 cfn-lint template.yaml -a cfn_lint_serverless.rules
-```
+```

cfn-lint-serverless/cfn_lint_serverless/rules/lambda_.py

@@ -21,7 +21,7 @@ class LambdaTracingRule(CloudFormationLintRule):
     source_url = "https://awslabs.github.io/serverless-rules/rules/lambda/tracing/"
     tags = ["lambda"]
 
-    _message = "Lambda function {} should have TracingConfig.Mode set to 'Active'."
+    _message = "Lambda function {} should have Tracing property set to 'Active'."
 
     def match(self, cfn):
         """

cfn-lint-serverless/cfn_lint_serverless/utils.py

@@ -18,14 +18,10 @@ class Value:
     def __new__(cls, value: Union[None, dict, str]) -> Union[None, TValue]:
         """
         Create a new Value object
-
         If the 'value' passed is None, this will return None instead of a class object
         """
 
-        if value is None:
-            return None
-
-        return super(Value, cls).__new__(cls)
+        return None if value is None else super(Value, cls).__new__(cls)
 
     def __init__(self, value: Union[dict, str]):
         """
@@ -44,7 +40,7 @@ def __init__(self, value: Union[dict, str]):
 
         # Not a dict - return an error here
         elif not isinstance(value, dict):
-            raise ValueError("'value' should be of type str or dict, got '%s'" % type(value))
+            raise ValueError(f"'value' should be of type str or dict, got '{type(value)}'")
 
         # 'Ref' intrinsic function
         elif "Ref" in value:
@@ -54,11 +50,11 @@ def __init__(self, value: Union[dict, str]):
         elif "Fn::GetAtt" in value:
             self.id, self.references = self._get_from_getatt(value["Fn::GetAtt"])
 
-        # 'Fn::Join' intrisic function
+        # 'Fn::Join' intrinsic function
         elif "Fn::Join" in value:
             self.id, self.references = self._get_from_join(value["Fn::Join"])
 
-        # 'Fn::Sub' intrisic function
+        # 'Fn::Sub' intrinsic function
         elif "Fn::Sub" in value:
             self.id, self.references = self._get_from_sub(value["Fn::Sub"])
 
@@ -100,27 +96,20 @@ def _get_from_sub(self, value: Union[str, list]) -> Tuple[str, List[str]]:
         Return the name and references from a 'Fn::Sub' intrinsic function
         """
 
-        pattern = value
-        variables = {}
-
         if isinstance(value, list):
-            pattern = value[0]
-            # Using Value() here to get nested references
-            variables = {k: Value(v) for k, v in value[1].items()}
+            pattern, variables = value[0], {k: Value(v) for k, v in value[1].items()}
+        else:
+            pattern, variables = value, {}
 
         references = []
 
         for match in SUB_PATTERN.findall(pattern):
             if match in variables:
-                # Variable with reference(s)
-                if len(variables[match].references) > 0:
+                if variables[match].references:
                     references.extend(variables[match].references)
-                # Hard-coded variable
                 else:
-                    # Replace with hard-coded value in value ID
                     pattern = pattern.replace(f"${{{match}}}", variables[match].id)
-            # No matching variable
             else:
                 references.append(match)
 
-        return (pattern, references)
+        return pattern, references

cfn-lint-serverless/tests/test_templates.py

@@ -42,10 +42,10 @@ def test_rule_with_templates(rules):
     """
 
     # Retrieve all serverless rule IDs
-    rule_ids = set([r.id for r in rules if r.id[1] == "S"])
+    rule_ids = {r.id for r in rules if r.id[1] == "S"}
 
     # Retrieve all rule IDs for tests
-    test_rule_ids = set([t[1] for t in templates])
+    test_rule_ids = {t[1] for t in templates}
 
     assert rule_ids == test_rule_ids
 
@@ -70,7 +70,7 @@ def test_template(filename, rule, mode, rules):
     match_ids = [match.rule.id for match in matches]
 
     # No non-serverless errors
-    assert len([m for m in match_ids if m[1] != "S"]) == 0
+    assert not [m for m in match_ids if m[1] != "S"]
 
     if mode == "fail":
         assert rule in match_ids

docs/cfn-lint.md

@@ -41,7 +41,7 @@ If the template fulfills the requirements for all rules, `cfn-lint` will return
     ES4000 EventBridge rule ConsumerFunctionTrigger should have a DeadLetterConfig.Arn property for all its Targets.
     template.yaml:5:1
 
-    WS1000 Lambda function ConsumerFunction should have TracingConfig.Mode set to 'Active'.
+    WS1000 Lambda function ConsumerFunction should have Tracing property set to 'Active'.
     template.yaml:7:3
 
     WS1004 Lambda function ConsumerFunction does not have a corresponding log group with a Retention property

examples/cdk/README.md

@@ -2,7 +2,7 @@
 CDK Example
 ===========
 
-xample on how to use cfn-lint-serverless with [AWS CDK](https://docs.aws.amazon.com/cdk/latest/guide/home.html).
+Example on how to use cfn-lint-serverless with [AWS CDK](https://docs.aws.amazon.com/cdk/latest/guide/home.html).
 
 Usage
 -----

examples/cdk/setup.py

@@ -19,10 +19,10 @@
     packages=setuptools.find_packages(where="cdk"),
 
     install_requires=[
-        "aws-cdk.core==1.106.1",
+        "aws-cdk.core==1.204.0",
     ],
 
-    python_requires=">=3.6",
+    python_requires=">=3.8",
 
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -31,9 +31,10 @@
 
         "Programming Language :: JavaScript",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",        
+        "Programming Language :: Python :: 3.10",        
+        "Programming Language :: Python :: 3.11",        
 
         "Topic :: Software Development :: Code Generators",
         "Topic :: Utilities",

tflint-ruleset-aws-serverless/go.mod

@@ -1,8 +1,37 @@
 module github.com/awslabs/serverless-rules/tflint-ruleset-aws-serverless
 
-go 1.15
+go 1.23
 
 require (
-	github.com/hashicorp/hcl/v2 v2.12.0
-	github.com/terraform-linters/tflint-plugin-sdk v0.9.1
+	github.com/hashicorp/hcl/v2 v2.23.0
+	github.com/terraform-linters/tflint-plugin-sdk v0.21.0
+)
+
+require (
+	github.com/agext/levenshtein v1.2.1 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/fatih/color v1.13.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/hashicorp/go-hclog v1.6.3 // indirect
+	github.com/hashicorp/go-plugin v1.6.1 // indirect
+	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77 // indirect
+	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
+	github.com/oklog/run v1.0.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/zclconf/go-cty v1.15.0 // indirect
+	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/net v0.27.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.23.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
+	google.golang.org/grpc v1.65.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 )