Merge pull request #803 from aws/dev

chore: release 1.17
aws · Nov 17, 2023 · 03abb11 · 03abb11
2 parents f2eed03 + d5d9258
commit 03abb11
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/.github/workflows/DetectCDKBootstrapVersionChanges.yml b/.github/workflows/DetectCDKBootstrapVersionChanges.yml
@@ -14,6 +14,24 @@ jobs:
     - name: Install AWS CDK
       run: |
         npm install -g aws-cdk
+    - name: Get Staging Bucket Update/Replace Policy
+      id: stagingBucketUpdateReplacePolicy
+      run: |
+        echo "::set-output name=update-replace-policy::$(yq '.Resources.StagingBucket.UpdateReplacePolicy' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')"
+    - name: Get Staging Bucket Deletion Policy
+      id: stagingBucketDeletionPolicy
+      run: |
+        echo "::set-output name=deletion-policy::$(yq '.Resources.StagingBucket.DeletionPolicy' 'src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml')"
+    - name: Fail If Update/Replace Policy Not 'Delete'
+      if: steps.stagingBucketUpdateReplacePolicy.outputs.update-replace-policy != 'Delete'
+      run: |
+        echo "The 'UpdateReplacePolicy' of the 'StaginBucket' in the CDK bootstrap template should be 'Delete'."
+        exit 1
+    - name: Fail If Deletion Policy Not 'Delete'
+      if: steps.stagingBucketDeletionPolicy.outputs.deletion-policy != 'Delete'
+      run: |
+        echo "The 'DeletionPolicy' of the 'StaginBucket' in the CDK bootstrap template should be 'Delete'."
+        exit 1
     - name: Save New CDK Bootstrap Template
       run: |
         cdk bootstrap --show-template > newTemplate.yml

diff --git a/THIRD_PARTY_LICENSES b/THIRD_PARTY_LICENSES
@@ -320,7 +320,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ------
 
-** Newtonsoft.Json; version 13.0.3 -- https://www.nuget.org/packages/Newtonsoft.Json/
+** Newtonsoft.Json; version 13.0.1 -- https://www.nuget.org/packages/Newtonsoft.Json/
 Copyright (c) 2007 James Newton-King
 ** YamlDotNet; version 13.4.0 -- https://www.nuget.org/packages/YamlDotNet
 Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Antoine Aubry and

diff --git a/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj b/src/AWS.Deploy.Common/AWS.Deploy.Common.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.200.42" />
     <PackageReference Include="AWSSDK.SimpleNotificationService" Version="3.7.200.42" />
     <PackageReference Include="AWSSDK.SQS" Version="3.7.200.43" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="AWSSDK.ElasticBeanstalk" Version="3.7.200.42" />
     <PackageReference Include="AWSSDK.ElasticLoadBalancingV2" Version="3.7.201.27" />
   </ItemGroup>

diff --git a/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj b/src/AWS.Deploy.Orchestration/AWS.Deploy.Orchestration.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.TemplateEngine.IDE" Version="5.0.1" />
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="5.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
     <PackageReference Include="YamlDotNet" Version="13.4.0" />
   </ItemGroup>

diff --git a/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml b/src/AWS.Deploy.Orchestration/CDK/CDKBootstrapTemplate.yaml
@@ -204,8 +204,8 @@ Resources:
             Status: Enabled
             NoncurrentVersionExpiration:
               NoncurrentDays: 365
-    UpdateReplacePolicy: Retain
-    DeletionPolicy: Retain
+    UpdateReplacePolicy: Delete
+    DeletionPolicy: Delete
   StagingBucketPolicy:
     Type: AWS::S3::BucketPolicy
     Properties:
@@ -584,7 +584,7 @@ Resources:
       Type: String
       Name:
         Fn::Sub: /cdk-bootstrap/${Qualifier}/version
-      Value: "18"
+      Value: "19"
 Outputs:
   BucketName:
     Description: The name of the S3 bucket owned by the CDK toolkit stack

diff --git a/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj b/src/AWS.Deploy.ServerMode.Client/AWS.Deploy.ServerMode.Client.csproj
@@ -17,7 +17,9 @@
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="3.7.202.11" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.22" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <!-- We are pining Newtonsoft.Json to 13.0.1 to maintain compatibility with the VS Toolkit. 
+    https://devblogs.microsoft.com/visualstudio/using-newtonsoft-json-in-a-visual-studio-extension/-->
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.16",
+  "version": "1.17",
   "publicReleaseRefSpec": [
     ".*"
   ],