Update pre-commit hooks (#268)

* Update pre-commit

* Bump version: 3.4.5 → 3.4.6

Author: rezabekf

.bumpversion.cfg

@@ -1,4 +1,4 @@
 [bumpversion]
-current_version = 3.4.5
+current_version = 3.4.6
 commit = True
 tag = False

.github/workflows/unit-tests.yaml

@@ -17,7 +17,7 @@ jobs:
       with:
         python-version: '3.x'
         cache: 'pip' # caching pip dependencies
-    - run: pip install -r requirements.txt
+    - run: pip install pre-commit
     - uses: actions/cache@v3
       env:
         cache-name: pre-commit

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
 
 # General
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v5.0.0
   hooks:
   - id: check-case-conflict
   - id: detect-private-key
@@ -30,13 +30,13 @@ repos:
 
 # CloudFormation
 - repo: https://github.com/aws-cloudformation/cfn-lint
-  rev: v0.79.7
+  rev: v1.20.2
   hooks:
   - id: cfn-lint-rc
     files: code/solutions/.*\.(ya?ml|template)$
 
 - repo: https://github.com/aws-cloudformation/rain
-  rev: v1.4.4
+  rev: v1.19.0
   hooks:
   - id: cfn-format
     files: code/solutions/.*\.(ya?ml|template)$
@@ -55,27 +55,27 @@ repos:
 
     # Python
 - repo: https://github.com/pycqa/pylint
-  rev: v3.0.0a7
+  rev: v3.3.2
   hooks:
     - id: pylint
       args:
         - --errors-only
         - --disable=E0401
 
 - repo: https://github.com/psf/black
-  rev: 23.7.0
+  rev: 24.10.0
   hooks:
     - id: black
 
 - repo: https://github.com/PyCQA/isort
-  rev: 5.12.0
+  rev: 5.13.2
   hooks:
     - id: isort
       args: ["--profile", "black"]
 
 # Shell check
 - repo: https://github.com/shellcheck-py/shellcheck-py
-  rev: v0.9.0.5
+  rev: v0.10.0.1
   hooks:
     - id: shellcheck
       files: solutions/.*\.(sh)$

code/solutions/architecting-templates/application-blue-green.template

@@ -99,22 +99,22 @@ Resources:
     Properties:
       DesiredCapacity: 2
       LaunchTemplate:
-        LaunchTemplateId: !Ref 'LaunchTemplate'
+        LaunchTemplateId: !Ref LaunchTemplate
         Version: !GetAtt LaunchTemplate.LatestVersionNumber
       MaxSize: 4
       MinSize: 2
       Tags:
         - Key: Name
           PropagateAtLaunch: true
-          Value: !Ref 'NameTagValue'
+          Value: !Ref NameTagValue
         - Key: AppName
           PropagateAtLaunch: true
-          Value: !Ref 'AppNameTagValue'
+          Value: !Ref AppNameTagValue
         - Key: Env
           PropagateAtLaunch: true
-          Value: !Ref 'Env'
+          Value: !Ref Env
       TargetGroupARNs:
-        - !Ref 'TargetGroup'
+        - !Ref TargetGroup
       VPCZoneIdentifier:
         - !ImportValue
           Fn::Sub: ${NetworkStackName}-PrivateSubnet1Id
@@ -126,9 +126,9 @@ Resources:
     Properties:
       DefaultActions:
         - Order: 1
-          TargetGroupArn: !Ref 'TargetGroup'
+          TargetGroupArn: !Ref TargetGroup
           Type: forward
-      LoadBalancerArn: !Ref 'LoadBalancer'
+      LoadBalancerArn: !Ref LoadBalancer
       Port: 80
       Protocol: HTTP
 
@@ -188,8 +188,8 @@ Resources:
                 ensureRunning: true
     Properties:
       LaunchTemplateData:
-        ImageId: !Ref 'LatestAmiId'
-        InstanceType: !Ref 'InstanceType'
+        ImageId: !Ref LatestAmiId
+        InstanceType: !Ref InstanceType
         SecurityGroupIds:
           - !ImportValue
             Fn::Sub: ${SecurityGroupStackName}-AppInstancesSecurityGroupId
@@ -203,11 +203,11 @@ Resources:
         - ResourceType: launch-template
           Tags:
             - Key: Name
-              Value: !Ref 'NameTagValue'
+              Value: !Ref NameTagValue
             - Key: AppName
-              Value: !Ref 'AppNameTagValue'
+              Value: !Ref AppNameTagValue
             - Key: Env
-              Value: !Ref 'Env'
+              Value: !Ref Env
 
   LoadBalancer:
     Type: AWS::ElasticLoadBalancingV2::LoadBalancer
@@ -224,11 +224,11 @@ Resources:
           Fn::Sub: ${NetworkStackName}-PublicSubnet2Id
       Tags:
         - Key: Name
-          Value: !Ref 'NameTagValue'
+          Value: !Ref NameTagValue
         - Key: AppName
-          Value: !Ref 'AppNameTagValue'
+          Value: !Ref AppNameTagValue
         - Key: Env
-          Value: !Ref 'Env'
+          Value: !Ref Env
       Type: application
 
   RecordSet:
@@ -242,9 +242,9 @@ Resources:
         Fn::Sub: ${HostedZoneStackName}-HostedZoneId
       Name: !ImportValue
         Fn::Sub: ${HostedZoneStackName}-HostedZoneName
-      SetIdentifier: !Sub '${AppNameTagValue} application managed with the ${AWS::StackName} stack.'
+      SetIdentifier: !Sub ${AppNameTagValue} application managed with the ${AWS::StackName} stack.
       Type: A
-      Weight: !Ref 'RecordSetWeight'
+      Weight: !Ref RecordSetWeight
 
   TargetGroup:
     Type: AWS::ElasticLoadBalancingV2::TargetGroup
@@ -259,11 +259,11 @@ Resources:
       Protocol: HTTP
       Tags:
         - Key: Name
-          Value: !Ref 'NameTagValue'
+          Value: !Ref NameTagValue
         - Key: AppName
-          Value: !Ref 'AppNameTagValue'
+          Value: !Ref AppNameTagValue
         - Key: Env
-          Value: !Ref 'Env'
+          Value: !Ref Env
       TargetType: instance
       UnhealthyThresholdCount: 2
       VpcId: !ImportValue
@@ -272,4 +272,4 @@ Resources:
 Outputs:
   AppUrl:
     Description: URL of the sample app.
-    Value: !Sub 'http://${LoadBalancer.DNSName}'
+    Value: !Sub http://${LoadBalancer.DNSName}

code/solutions/conditions/condition-resource-property.yaml

@@ -26,4 +26,7 @@ Resources:
     Type: AWS::EC2::Instance
     Properties:
       ImageId: !Ref LatestAmiId
-      InstanceType: !If [IsProduction, t2.small, t2.micro]
+      InstanceType: !If
+        - IsProduction
+        - t2.small
+        - t2.micro

code/solutions/cross-stacks/ec2.yaml

@@ -110,12 +110,18 @@ Resources:
       SubnetId: !ImportValue cfn-workshop-PublicSubnet1
       IamInstanceProfile: !ImportValue cfn-workshop-WebServerInstanceProfile
       ImageId: !Ref AmiID
-      InstanceType: !FindInMap [EnvironmentToInstanceType, !Ref EnvironmentType, InstanceType]
+      InstanceType: !FindInMap
+        - EnvironmentToInstanceType
+        - !Ref EnvironmentType
+        - InstanceType
       SecurityGroupIds:
         - !Ref WebServerSecurityGroup
       Tags:
         - Key: Name
-          Value: !Join [' ', [!Ref EnvironmentType, Web Server]]
+          Value: !Join
+            - ' '
+            - - !Ref EnvironmentType
+              - Web Server
       UserData: !Base64
         Fn::Sub: |
           #!/bin/bash -xe

code/solutions/cross-stacks/vpc.yaml

@@ -50,7 +50,9 @@ Resources:
     Properties:
       CidrBlock: !Ref PublicSubnet1Cidr
       VpcId: !Ref VPC
-      AvailabilityZone: !Select [0, !Ref AvailabilityZones]
+      AvailabilityZone: !Select
+        - 0
+        - !Ref AvailabilityZones
       MapPublicIpOnLaunch: true
       Tags:
         - Key: Name
@@ -86,7 +88,9 @@ Resources:
     Properties:
       CidrBlock: !Ref PublicSubnet2Cidr
       VpcId: !Ref VPC
-      AvailabilityZone: !Select [1, !Ref AvailabilityZones]
+      AvailabilityZone: !Select
+        - 1
+        - !Ref AvailabilityZones
       MapPublicIpOnLaunch: true
       Tags:
         - Key: Name

code/solutions/dynamic-references/database.yaml

@@ -30,6 +30,10 @@ Resources:
         rules_to_suppress:
           - id: F80
           - id: F27
+      cfn-lint:
+        config:
+          ignore_checks:
+            - W1011
     Properties:
       DBInstanceClass: db.t3.micro
       AllocatedStorage: "20"

code/solutions/dynamic-references/ec2-instance.yaml

@@ -6,6 +6,9 @@ Resources:
   Instance:
     Type: AWS::EC2::Instance
     Properties:
-      AvailabilityZone: !Select ["0", !GetAZs ""]
+      AvailabilityZone: !Select
+        - 0
+        - !GetAZs
+          Ref: AWS::Region
       InstanceType: t2.micro
       ImageId: '{{resolve:ssm:/golden-images/amazon-linux-2}}'

code/solutions/dynamic-references/lambda-function.yaml

@@ -16,7 +16,7 @@ Resources:
                 - lambda.amazonaws.com
         Version: "2012-10-17"
       ManagedPolicyArns:
-        - !Sub 'arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole'
+        - !Sub arn:${AWS::Partition}:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
       Path: /
 
   DatabaseFunction: