Merge branch 'master' into imdsv2-ec2

Author: michaelwittig

.github/workflows/lint.yml

@@ -13,15 +13,15 @@ jobs:
     - uses: 'actions/checkout@v4'
     - uses: 'actions/setup-python@v5'
       with:
-        python-version: '3.12'
+        python-version: '3.13'
     - name: yamlllint
       run: |
-        pip install yamllint==1.33.0
+        pip install yamllint==1.37.1
         yamllint .
     - name: cfn-lint
       run: |
-        pip install cfn-lint==0.85.0
-        cfn-lint -i W2001 W3045 W4002 W6001 W8003 E3026 -t '**/*.yaml'
+        pip install cfn-lint==1.39.1
+        cfn-lint -i E1022 E3003 E3014 E3026 E3032 W1011 W2001 W2010 W3045 W6001 W8003 -t '**/*.yaml'
     - name: license
       run: |
         find . -type f -name '*.yaml' -not -name '.readthedocs.yaml' | while read file; do set -ex && grep -q 'LICENSE-2.0' "$file"; done;

ec2/al2-mutable-private.yaml

@@ -1369,7 +1369,8 @@ Resources:
                 files:
                 - '/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json'
                 packages:
-                - cloudwatch
+                  yum:
+                  - cloudwatch
         ssh-access:
           files:
             '/opt/authorized_keys_command.sh':

ec2/al2-mutable-public.yaml

@@ -1379,7 +1379,8 @@ Resources:
                 files:
                 - '/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json'
                 packages:
-                - cloudwatch
+                  yum:
+                  - cloudwatch
         ssh-access:
           files:
             '/opt/authorized_keys_command.sh':

fargate/service-cloudmap.yaml

@@ -447,7 +447,7 @@ Resources:
         - HasProxyImage
         - Name: proxy
           Image: !Ref ProxyImage
-          Command: !If [HasProxyCommand, !Ref ProxyCommand, !Ref 'AWS::NoValue']
+          Command: !If [HasProxyCommand, [!Ref ProxyCommand], !Ref 'AWS::NoValue']
           PortMappings:
           - ContainerPort: !Ref ProxyPort
             Protocol: tcp
@@ -484,7 +484,7 @@ Resources:
         - HasSidecarImage
         - Name: sidecar
           Image: !Ref SidecarImage
-          Command: !If [HasSidecarCommand, !Ref SidecarCommand, !Ref 'AWS::NoValue']
+          Command: !If [HasSidecarCommand, [!Ref SidecarCommand], !Ref 'AWS::NoValue']
           PortMappings:
           - ContainerPort: !Ref SidecarPort
             Protocol: tcp

fargate/service-cluster-alb.yaml

@@ -586,7 +586,7 @@ Resources:
         - HasProxyImage
         - Name: proxy
           Image: !Ref ProxyImage
-          Command: !If [HasProxyCommand, !Ref ProxyCommand, !Ref 'AWS::NoValue']
+          Command: !If [HasProxyCommand, [!Ref ProxyCommand], !Ref 'AWS::NoValue']
           PortMappings:
           - ContainerPort: !Ref ProxyPort
             Protocol: tcp
@@ -623,7 +623,7 @@ Resources:
         - HasSidecarImage
         - Name: sidecar
           Image: !Ref SidecarImage
-          Command: !If [HasSidecarCommand, !Ref SidecarCommand, !Ref 'AWS::NoValue']
+          Command: !If [HasSidecarCommand, [!Ref SidecarCommand], !Ref 'AWS::NoValue']
           PortMappings:
           - ContainerPort: !Ref SidecarPort
             Protocol: tcp

fargate/service-dedicated-alb.yaml

@@ -722,7 +722,7 @@ Resources:
         - HasProxyImage
         - Name: proxy
           Image: !Ref ProxyImage
-          Command: !If [HasProxyCommand, !Ref ProxyCommand, !Ref 'AWS::NoValue']
+          Command: !If [HasProxyCommand, [!Ref ProxyCommand], !Ref 'AWS::NoValue']
           PortMappings:
           - ContainerPort: !Ref ProxyPort
             Protocol: tcp
@@ -759,7 +759,7 @@ Resources:
         - HasSidecarImage
         - Name: sidecar
           Image: !Ref SidecarImage
-          Command: !If [HasSidecarCommand, !Ref SidecarCommand, !Ref 'AWS::NoValue']
+          Command: !If [HasSidecarCommand, [!Ref SidecarCommand], !Ref 'AWS::NoValue']
           PortMappings:
           - ContainerPort: !Ref SidecarPort
             Protocol: tcp