cfnlint v1 compatibility upgrade

.github/workflows/publish.yml

@@ -5,32 +5,37 @@ on:
     types:
       - published
 
+# Add concurrency to prevent multiple simultaneous runs
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 permissions:
   contents: write
 
 jobs:
   run_tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set release notes tag
         run: |
           export RELEASE_TAG_VERSION=${{ github.event.release.tag_name }}
           echo "RELEASE_TAG_VERSION=${RELEASE_TAG_VERSION:1}" >> $GITHUB_ENV
       - name: Check version tags
         run: make release-check
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.12'
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.16
+          go-version: '1.21'
       - name: Setup TFLint
         uses: terraform-linters/setup-tflint@v2
         with:
-          tflint_version: v0.29.0
+          tflint_version: v0.50.0
       - name: Install dependencies
         run: make dev
       - name: Run all checks
@@ -40,32 +45,32 @@ jobs:
     needs: run_tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set release notes tag
         run: |
           export RELEASE_TAG_VERSION=${{ github.event.release.tag_name }}
           echo "RELEASE_TAG_VERSION=${RELEASE_TAG_VERSION:1}" >> $GITHUB_ENV
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.12'
       - name: Install dependencies
         run: make -C cfn-lint-serverless dev
       - name: Upload to PyPi
         run: make -C cfn-lint-serverless release
         env:
           PYPI_USERNAME: __token__
-          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+          PYPI_TOKEN: ${{ secrets.PIPY_TOKEN24 }}
 
   publish_go:
     needs: run_tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.16
+          go-version: '1.21'
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:

.github/workflows/tests.yml

@@ -2,29 +2,32 @@ name: tests
 
 on:
   pull_request:
-    branches:
-      - main
+    branches: [main]
   push:
-    branches:
-      - main
+    branches: [main]
+
+# Add concurrency to prevent parallel runs on same ref
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   cfn-lint-tests:
     strategy:
+      fail-fast: false
       max-parallel: 4
       matrix:
-        python-version: [3.8, 3.9]
-        os:
-          - ubuntu-latest
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     env:
       FOLDER: cfn-lint-serverless
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
       - name: Install dependencies
         run: make -C $FOLDER dev
       - name: Formatting and Linting
@@ -38,23 +41,24 @@ jobs:
 
   tflint-tests:
     strategy:
+      fail-fast: false
       max-parallel: 4
       matrix:
-        golang-version: [1.14, 1.15, 1.16]
-        os:
-          - ubuntu-latest
+        go-version: ['1.20', '1.21', '1.22']
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     env:
       FOLDER: tflint-ruleset-aws-serverless
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
+          cache: true
       - name: Install dependencies
         run: make -C $FOLDER dev
       - name: Formatting and Linting
         run: make -C $FOLDER lint
       - name: Tests
         run: make -C $FOLDER test
+

.gitignore

@@ -163,3 +163,5 @@ dmypy.json
 .prof
 
 # End of https://www.toptal.com/developers/gitignore/api/python,go
+
+cfn-lint-serverless/.idea/**

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/api_gateway.py

@@ -2,7 +2,6 @@
 Rules for API Gateway resources
 """
 
-
 import json
 import re
 from typing import List

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

@@ -2,7 +2,6 @@
 Rules for AppSync resources
 """
 
-
 from cfnlint.rules import CloudFormationLintRule, RuleMatch
 
 

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

@@ -2,7 +2,6 @@
 Rules for EventBridge resources
 """
 
-
 from cfnlint.rules import CloudFormationLintRule, RuleMatch
 
 

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

@@ -2,7 +2,6 @@
 Rules for Lambda resources
 """
 
-
 from collections import defaultdict
 from typing import Dict, List, Union
 
@@ -22,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/rules/sns.py

@@ -2,7 +2,6 @@
 Rules for SNS resources
 """
 
-
 from cfnlint.rules import CloudFormationLintRule, RuleMatch
 
 

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

@@ -2,7 +2,6 @@
 Rules for SQS resources
 """
 
-
 from cfnlint.rules import CloudFormationLintRule, RuleMatch
 
 from ..utils import Value

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

@@ -2,7 +2,6 @@
 Rules for Step Functions resources
 """
 
-
 from cfnlint.rules import CloudFormationLintRule, RuleMatch
 
 

cfn-lint-serverless/cfn_lint_serverless/utils.py

@@ -2,7 +2,6 @@
 Utilities 
 """
 
-
 import re
 from typing import List, Tuple, TypeVar, Union
 
@@ -20,14 +19,11 @@ 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
         """
+
+        return None if value is None else super(Value, cls).__new__(cls)
 
-        if value is None:
-            return None
-
-        return super(Value, cls).__new__(cls)
 
     def __init__(self, value: Union[dict, str]):
         """
@@ -46,7 +42,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:
@@ -56,11 +52,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"])
 
@@ -102,27 +98,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