From 709212e8d8ca1592aaab2ded14313eab0e7d5610 Mon Sep 17 00:00:00 2001
From: Troy Ameigh <55170274+troy-ameigh@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:31:12 -0500
Subject: [PATCH 1/2] Updated to fix Python issue, Bucket retention and
 dockerfile issue for static tests.

---
 .project_automation/static_tests/Dockerfile | 6 +-----
 templates/git2s3.template.yaml              | 8 ++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.project_automation/static_tests/Dockerfile b/.project_automation/static_tests/Dockerfile
index eaa5935..164f7a3 100644
--- a/.project_automation/static_tests/Dockerfile
+++ b/.project_automation/static_tests/Dockerfile
@@ -1,8 +1,4 @@
 FROM public.ecr.aws/codebuild/amazonlinux2-x86_64-standard:4.0
 RUN git clone https://github.com/aws-quickstart/qs-cfn-lint-rules.git /tmp/qs-cfn-lint-rules
-<<<<<<< before updating
-RUN cd /tmp/qs-cfn-lint-rules && git checkout 8268db9df3407ccf5383def635bc22e0f99d6b39 && pip install .
-#RUN cfn-lint -u
-=======
 RUN cd /tmp/qs-cfn-lint-rules && pip install .
->>>>>>> after updating
+#RUN cfn-lint -u
\ No newline at end of file
diff --git a/templates/git2s3.template.yaml b/templates/git2s3.template.yaml
index 22208d4..fa81722 100644
--- a/templates/git2s3.template.yaml
+++ b/templates/git2s3.template.yaml
@@ -115,7 +115,7 @@ Parameters:
     Type: String
     Default: ''
   ExcludeGit:
-    Description: Choose False to omit the .git directory from the Git repository .zip file.
+    Description: Choose True to omit the .git directory from the Git repository .zip file.
     Type: String
     Default: 'True'
     AllowedValues: ['True', 'False']
@@ -146,6 +146,8 @@ Conditions:
 Resources:
   LambdaZipsBucket:
     Type: AWS::S3::Bucket
+    DeletionPolicy: Retain
+    UpdateReplacePolicy: Retain
     Properties:
       BucketEncryption:
         ServerSideEncryptionConfiguration:
@@ -220,7 +222,7 @@ Resources:
     Properties:
       Description: Copies objects from a source S3 bucket to a destination.
       Handler: index.handler
-      Runtime: python3.7
+      Runtime: python3.12
       Role: !GetAtt 'CopyZipsRole.Arn'
       Timeout: 240
       Code:
@@ -285,6 +287,8 @@ Resources:
 
   KeyBucket:
     Type: AWS::S3::Bucket
+    DeletionPolicy: Retain
+    UpdateReplacePolicy: Retain
     Properties:
       Tags: []
       BucketEncryption:

From ea1e8648d0e8d93fb69ad936348a2c16842419fc Mon Sep 17 00:00:00 2001
From: Troy Ameigh <55170274+troy-ameigh@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:51:50 -0500
Subject: [PATCH 2/2] Fixing Python

---
 templates/git2s3.template.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/git2s3.template.yaml b/templates/git2s3.template.yaml
index fa81722..fa9f733 100644
--- a/templates/git2s3.template.yaml
+++ b/templates/git2s3.template.yaml
@@ -222,7 +222,7 @@ Resources:
     Properties:
       Description: Copies objects from a source S3 bucket to a destination.
       Handler: index.handler
-      Runtime: python3.12
+      Runtime: python3.9
       Role: !GetAtt 'CopyZipsRole.Arn'
       Timeout: 240
       Code: