Merge branch 'dev'

Author: aws-sdk-dotnet-automation

.github/workflows/DetectCDKBootstrapVersionChanges.yml

@@ -12,6 +12,7 @@ jobs:
     - name: Install AWS CDK
       run: |
         npm install -g aws-cdk
+        cdk acknowledge 32775
     - name: Get Staging Bucket Update/Replace Policy
       id: stagingBucketUpdateReplacePolicy
       run: |

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Release 2025-03-28
+
+### AWS.Deploy.CLI (1.28.2)
+* Update the default docker image node version from version 18 to 22
+### AWS.Deploy.Recipes.CDK.Common (1.28.2)
+### AWS.Deploy.ServerMode.Client (1.28.2)
+
 ## Release 2024-12-30
 
 ### AWS.Deploy.CLI (1.28.1)

buildtools/ci.buildspec.yml

@@ -3,7 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 18
+      nodejs: 22
     commands:
       # install .NET SDK
       - curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --channel 6.0

src/AWS.Deploy.CLI/AWS.Deploy.CLI.csproj

@@ -18,7 +18,7 @@
     <NoWarn>$(NoWarn);1570;1591;ASP0000</NoWarn>
     <RollForward>Major</RollForward>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version>1.28.1</Version>
+    <Version>1.28.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AWS.Deploy.DockerEngine/Templates/Dockerfile.Net6.template

@@ -15,7 +15,7 @@ RUN apt-get update -yq \
     && apt-get install -yq ca-certificates curl gnupg \
     && mkdir -p /etc/apt/keyrings \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && apt-get update -yq \
     && apt-get install nodejs -yq
 RUN dotnet publish "{project-name}" -c Release -o /app/publish

src/AWS.Deploy.DockerEngine/Templates/Dockerfile.template

@@ -16,7 +16,7 @@ RUN apt-get update -yq \
     && apt-get install -yq ca-certificates curl gnupg \
     && mkdir -p /etc/apt/keyrings \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && apt-get update -yq \
     && apt-get install nodejs -yq
 RUN dotnet publish "{project-name}" -c Release -o /app/publish -a $TARGETARCH

src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml

@@ -159,6 +159,8 @@ Resources:
                 Fn::Sub: ${FilePublishingRole.Arn}
             Resource: "*"
     Condition: CreateNewKey
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
   FileAssetsBucketEncryptionKeyAlias:
     Condition: CreateNewKey
     Type: AWS::KMS::Alias
@@ -269,6 +271,18 @@ Resources:
               StringLike:
                 aws:sourceArn:
                   Fn::Sub: arn:${AWS::Partition}:lambda:${AWS::Region}:${AWS::AccountId}:function:*
+          - Sid: EmrServerlessImageRetrievalPolicy
+            Effect: Allow
+            Principal:
+              Service: emr-serverless.amazonaws.com
+            Action:
+              - ecr:BatchGetImage
+              - ecr:GetDownloadUrlForLayer
+              - ecr:DescribeImages
+            Condition:
+              StringLike:
+                aws:sourceArn:
+                  Fn::Sub: arn:${AWS::Partition}:emr-serverless:${AWS::Region}:${AWS::AccountId}:/applications/*
   FilePublishingRole:
     Type: AWS::IAM::Role
     Properties:
@@ -615,7 +629,7 @@ Resources:
       Type: String
       Name:
         Fn::Sub: /cdk-bootstrap/${Qualifier}/version
-      Value: "25"
+      Value: "27"
 Outputs:
   BucketName:
     Description: The name of the S3 bucket owned by the CDK toolkit stack

src/AWS.Deploy.Recipes.CDK.Common/AWS.Deploy.Recipes.CDK.Common.csproj

@@ -10,7 +10,7 @@
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/aws/aws-dotnet-deploy</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-    <Version>1.28.1</Version>
+    <Version>1.28.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj

@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/aws/aws-dotnet-deploy</PackageProjectUrl>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\public.snk</AssemblyOriginatorKeyFile>
-    <Version>1.28.1</Version>
+    <Version>1.28.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

testapps/WebAppNet8WithCustomDockerFile/Dockerfile

@@ -17,7 +17,7 @@ RUN apt-get update -yq \
     && apt-get install -yq ca-certificates curl gnupg \
     && mkdir -p /etc/apt/keyrings \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
     && apt-get update -yq \
     && apt-get install nodejs -yq
 RUN dotnet publish "WebAppNet8WithCustomDockerFile.csproj" -c Release -o /app/publish