Merge branch 'master' into master

intuit · Oct 6, 2023 · 27e7c33 · 27e7c33
2 parents 465291f + 35b7144
commit 27e7c33
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Modelled as a state machine, with the help of AWS step functions, Trapheus resto
 </p>
 <p align="center"><a href="https://circleci.com/gh/intuit/Trapheus"><img src="https://circleci.com/gh/intuit/Trapheus.svg?style=svg" alt="TravisCI Build Status"/></a>
 <a href = "https://coveralls.io/github/intuit/Trapheus?branch=master"><img src= "https://coveralls.io/repos/github/intuit/Trapheus/badge.svg?branch=master" alt = "Coverage"/></a>
-  <a href="http://www.serverless.com"><img src="http://public.serverless.com/badges/v3.svg" alt="serverless badge"/></a>
+  <a href="https://www.serverless.com"><img src="https://github.com/intuit/Trapheus/assets/112308320/c7764b65-fb72-46ed-824b-c82c6374ec8b" alt="serverless badge"/></a>
   <a href="https://github.com/intuit/Trapheus/releases"><img src="https://img.shields.io/github/v/release/intuit/trapheus.svg" alt="release badge"/></a>
 </p>
 
@@ -36,7 +36,7 @@ Modelled as a state machine, with the help of AWS step functions, Trapheus resto
 
 The app requires the following AWS resources to exist before installation:
 
-1. `python3.7` installed on local machine following [this](https://www.python.org/downloads/).
+1. `python3.11` installed on local machine following [this](https://www.python.org/downloads/).
 
 2. Configure [AWS SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/event-publishing-create-configuration-set.html)
 

diff --git a/docs/README.fr.md b/docs/README.fr.md
@@ -43,7 +43,7 @@ Modelled as a state machine, with the help of AWS step functions, Trapheus resto
 
 L'application nécessite que les ressources AWS suivantes existent avant l'installation :
 
-1.  `python3.7`installé sur la machine locale suivante[ce](https://www.python.org/downloads/).
+1.  `python3.11`installé sur la machine locale suivante[ce](https://www.python.org/downloads/).
 
 2.  Configurer[AWS SES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/event-publishing-create-configuration-set.html)
     -   Configurez l'e-mail de l'expéditeur et du destinataire SES ([SES Console](https://console.aws.amazon.com/ses/)->Adresses e-mail).

diff --git a/docs/README.zh-CN.md b/docs/README.zh-CN.md
@@ -43,7 +43,7 @@ Modelled as a state machine, with the help of AWS step functions, Trapheus resto
 
 该应用程序在安装前需要以下 AWS 资源：
 
-1.  `python3.7`安装在本地计算机上如下[这](https://www.python.org/downloads/).
+1.  `python3.11`安装在本地计算机上如下[这](https://www.python.org/downloads/).
 
 2.  配置[AWSSES](https://docs.aws.amazon.com/ses/latest/DeveloperGuide/event-publishing-create-configuration-set.html)
     -   配置 SES 发件人和收件人电子邮件（[SES控制台](https://console.aws.amazon.com/ses/)->电子邮件地址）。

diff --git a/template.yaml b/template.yaml
@@ -7,7 +7,7 @@ Description: >
 
 Globals:
   Function:
-    Runtime: python3.7
+    Runtime: python3.11
     Timeout: 900
     Environment:
       Variables:
@@ -171,6 +171,10 @@ Resources:
       Description: Dependencies on util methods used in lambdas of the state machine
       ContentUri: src/common/common.zip
       CompatibleRuntimes:
+        - python3.11
+        - python3.10
+        - python3.9
+        - python3.8
         - python3.7
         - python3.6
       LicenseInfo: 'MIT'
@@ -181,7 +185,7 @@ Resources:
       FunctionName: "lambda-function-rename-dbinstance"
       Description: Lambda functions required to execute rename of a database instance.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/rename/
       Handler: rename_function.lambda_rename_dbinstance
       MemorySize: 128
@@ -200,7 +204,7 @@ Resources:
       FunctionName: "lambda-function-get-dbinstance-status-sf"
       Description: Lambda function which provides information on status of db instance post any operation.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/checkstatus/
       Handler: get_dbstatus_function.lambda_get_dbinstance_status
       MemorySize: 128
@@ -219,7 +223,7 @@ Resources:
       FunctionName: "lambda-function-restore-dbinstance-sf"
       Description: Lambda functions required to execute database restore.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/restore/
       Handler: restore_function.lambda_restore_dbinstance
       MemorySize: 128
@@ -238,7 +242,7 @@ Resources:
       FunctionName: "lambda-function-delete-dbinstance-sf"
       Description: Lambda functions required to execute database instance deletion.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/delete/
       Handler: delete_function.lambda_delete_dbinstance
       MemorySize: 128
@@ -257,7 +261,7 @@ Resources:
       FunctionName: "lambda-function-dbsnapshot-sf"
       Description: Lambda functions required to take snapshot of a database instance.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/snapshot/
       Handler: snapshot_function.lambda_create_dbinstance_snapshot
       MemorySize: 128
@@ -276,7 +280,7 @@ Resources:
       FunctionName: "lambda-function-send-emailalert-sf"
       Description: Lambda functions required to enable alerts in case of any failure of state machine.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/emailalert/
       Handler: email_function.lambda_handler
       MemorySize: 128
@@ -301,7 +305,7 @@ Resources:
       FunctionName: "lambda-function-send-slackalert-sf"
       Description: Lambda functions required to enable slack alerts in case of any failure of state machine.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/slacknotification/
       Handler: slack_notification.lambda_handler
       MemorySize: 128
@@ -324,7 +328,7 @@ Resources:
       FunctionName: "lambda-function-dbcluster-rename-sf"
       Description: Lambda functions required to execute database cluster rename.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/rename/
       Handler: cluster_rename_function.lambda_rename_dbcluster
       MemorySize: 128
@@ -343,7 +347,7 @@ Resources:
       FunctionName: "lambda-function-dbcluster-restore-sf"
       Description: Lambda functions required to execute database cluster restore.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/restore/
       Handler: cluster_restore_function.lambda_restore_dbcluster
       MemorySize: 128
@@ -362,7 +366,7 @@ Resources:
       FunctionName: "lambda-function-dbcluster-status-sf"
       Description: Lambda function which provides information on status of db cluster post any operation.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/checkstatus/
       Handler: get_dbcluster_status_function.lambda_get_cluster_status
       MemorySize: 128
@@ -381,7 +385,7 @@ Resources:
       FunctionName: "lambda-function-dbcluster-delete-sf"
       Description: Lambda functions required to execute deletion of database cluster.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/delete/
       Handler: cluster_delete_function.lambda_delete_dbcluster
       MemorySize: 128
@@ -400,7 +404,7 @@ Resources:
       FunctionName: "lambda-function-dbcluster-snapshot-sf"
       Description: Lambda functions required to take snapshot of database cluster.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/snapshot/
       Handler: cluster_snapshot_function.lambda_create_cluster_snapshot
       MemorySize: 128
@@ -459,7 +463,7 @@ Resources:
       FunctionName: !Sub ${ProjectName}-snapshot-export-sf
       Description: Lambda functions required to start export task of RDS snapshot to s3.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/export/
       Handler: export_snapshot_s3_function.lambda_export_rds_snapshot_to_s3
       MemorySize: 128
@@ -480,7 +484,7 @@ Resources:
       FunctionName: !Sub ${ProjectName}-cluster-snapshot-export-sf
       Description: Lambda functions required to start export task of RDS snapshot to s3.
       Role: !GetAtt LambdaExecutionRole.Arn
-      Runtime: python3.7
+      Runtime: python3.11
       CodeUri: src/export/
       Handler: export_cluster_snapshot_s3_function.lambda_export_rds_cluster_snapshot_to_s3
       MemorySize: 128