Merge pull request #25859 from hashicorp/td-python3.6-lambda-runtime-…

…deprecated Fix deprecated Lambda function runtime errors
hashicorp · Jul 18, 2022 · de1f280 · de1f280
2 parents e3ff7e8 + 343a59d
commit de1f280
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/internal/service/lambda/function_test.go b/internal/service/lambda/function_test.go
@@ -2130,26 +2130,31 @@ func TestAccLambdaFunction_runtimes(t *testing.T) {
 	}
 	for _, runtime := range lambda.Runtime_Values() {
 		// EOL runtimes.
+		// https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html#runtime-support-policy.
 		switch runtime {
-		case lambda.RuntimeRuby25:
-			fallthrough
-		case lambda.RuntimeNodejs43Edge:
-			fallthrough
 		case lambda.RuntimeDotnetcore21:
 			fallthrough
-		case lambda.RuntimeDotnetcore20:
+		case lambda.RuntimePython27:
 			fallthrough
-		case lambda.RuntimeDotnetcore10:
+		case lambda.RuntimePython36:
+			fallthrough
+		case lambda.RuntimeRuby25:
 			fallthrough
 		case lambda.RuntimeNodejs10X:
 			fallthrough
 		case lambda.RuntimeNodejs810:
 			fallthrough
 		case lambda.RuntimeNodejs610:
 			fallthrough
+		case lambda.RuntimeNodejs43Edge:
+			fallthrough
 		case lambda.RuntimeNodejs43:
 			fallthrough
 		case lambda.RuntimeNodejs:
+			fallthrough
+		case lambda.RuntimeDotnetcore20:
+			fallthrough
+		case lambda.RuntimeDotnetcore10:
 			continue
 		}
 

diff --git a/internal/service/sns/topic_subscription_test.go b/internal/service/sns/topic_subscription_test.go
@@ -829,7 +829,7 @@ resource "aws_lambda_function" "lambda" {
   role             = aws_iam_role.iam_for_lambda.arn
   handler          = "main.confirm_subscription"
   source_code_hash = filebase64sha256("test-fixtures/lambda_confirm_sns.zip")
-  runtime          = "python3.6"
+  runtime          = "python3.7"
 }
 
 resource "aws_api_gateway_deployment" "test" {
@@ -955,7 +955,7 @@ resource "aws_lambda_function" "lambda" {
   role             = aws_iam_role.iam_for_lambda.arn
   handler          = "main.confirm_subscription"
   source_code_hash = filebase64sha256("test-fixtures/lambda_confirm_sns.zip")
-  runtime          = "python3.6"
+  runtime          = "python3.7"
 }
 
 resource "aws_api_gateway_deployment" "test" {

diff --git a/website/docs/r/api_gateway_integration.html.markdown b/website/docs/r/api_gateway_integration.html.markdown
@@ -106,7 +106,7 @@ resource "aws_lambda_function" "lambda" {
   function_name = "mylambda"
   role          = aws_iam_role.role.arn
   handler       = "lambda.lambda_handler"
-  runtime       = "python3.6"
+  runtime       = "python3.7"
 
   source_code_hash = filebase64sha256("lambda.zip")
 }

diff --git a/website/docs/r/lambda_permission.html.markdown b/website/docs/r/lambda_permission.html.markdown
@@ -84,7 +84,7 @@ resource "aws_lambda_function" "func" {
   function_name = "lambda_called_from_sns"
   role          = aws_iam_role.default.arn
   handler       = "exports.handler"
-  runtime       = "python3.6"
+  runtime       = "python3.7"
 }
 
 resource "aws_iam_role" "default" {
@@ -155,7 +155,7 @@ resource "aws_lambda_function" "logging" {
   function_name = "lambda_called_from_cloudwatch_logs"
   handler       = "exports.handler"
   role          = aws_iam_role.default.arn
-  runtime       = "python3.6"
+  runtime       = "python3.7"
 }
 
 resource "aws_iam_role" "default" {