[lambda] Replace all occurrences of nodejs14 with nodejs20

hashicorp · Feb 24, 2024 · 322cc1c · 322cc1c
1 parent b9d9303
commit 322cc1c
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 37 deletions.
diff --git a/internal/service/lambda/function_test.go b/internal/service/lambda/function_test.go
@@ -683,12 +683,12 @@ func TestAccLambdaFunction_versionedUpdate(t *testing.T) {
 				PreConfig: func() {
 					timeBeforeUpdate = time.Now()
 				},
-				Config: testAccFunctionConfig_versionedNodeJs14xRuntime(path, rName),
+				Config: testAccFunctionConfig_versionedNodeJs20xRuntime(path, rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckFunctionExists(ctx, resourceName, &conf),
 					resource.TestCheckResourceAttr(resourceName, "version", versionUpdated),
 					acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, versionUpdated)),
-					resource.TestCheckResourceAttr(resourceName, "runtime", string(types.RuntimeNodejs14x)),
+					resource.TestCheckResourceAttr(resourceName, "runtime", string(types.RuntimeNodejs20x)),
 					func(s *terraform.State) error {
 						return testAccCheckAttributeIsDateAfter(s, resourceName, "last_modified", timeBeforeUpdate)
 					},
@@ -3064,7 +3064,7 @@ resource "aws_lambda_function" "test" {
 `, fileName, rName, publish))
 }
 
-func testAccFunctionConfig_versionedNodeJs14xRuntime(fileName, rName string) string {
+func testAccFunctionConfig_versionedNodeJs20xRuntime(fileName, rName string) string {
 	return acctest.ConfigCompose(
 		acctest.ConfigLambdaBase(rName, rName, rName),
 		fmt.Sprintf(`
@@ -3074,7 +3074,7 @@ resource "aws_lambda_function" "test" {
   publish       = true
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
 }
 `, fileName, rName))
 }

diff --git a/internal/service/lambda/function_url_data_source_test.go b/internal/service/lambda/function_url_data_source_test.go
@@ -111,7 +111,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   handler       = "exports.example"
   role          = aws_iam_role.lambda.arn
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
 }
 
 resource "aws_lambda_function_url" "test" {

diff --git a/internal/service/lambda/function_url_test.go b/internal/service/lambda/function_url_test.go
@@ -425,7 +425,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
 }
 
 resource "aws_lambda_function_url" "test" {
@@ -442,7 +442,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
 }
 
 resource "aws_lambda_function_url" "test" {
@@ -468,7 +468,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
 }
 
 resource "aws_lambda_function_url" "test" {
@@ -494,7 +494,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
   publish       = true
 }
 
@@ -529,7 +529,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
 }
 
 resource "aws_lambda_function_url" "test" {
@@ -547,7 +547,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[1]q
   role          = aws_iam_role.iam_for_lambda.arn
   handler       = "exports.example"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs20.x"
   publish       = true
 }
 

diff --git a/internal/service/lambda/invocation_test.go b/internal/service/lambda/invocation_test.go
@@ -330,7 +330,7 @@ func TestAccLambdaInvocation_lifecycle_scopeCreateOnlyToCRUD(t *testing.T) {
 func TestAccLambdaInvocation_terraformKey(t *testing.T) {
 	ctx := acctest.Context(t)
 	resourceName := "aws_lambda_invocation.test"
-	fName := "lambda_invocation_crud"
+	fName := "lambda_invocation"
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 
 	inputJSON := `{"key1":"value1","key2":"value2"}`
@@ -466,7 +466,7 @@ resource "aws_lambda_function" "test" {
   function_name = %[2]q
   role          = aws_iam_role.test.arn
   handler       = "%[1]s.handler"
-  runtime       = "nodejs14.x"
+  runtime       = "nodejs18.x"
 
   environment {
     variables = {

diff --git a/internal/service/lambda/layer_version_test.go b/internal/service/lambda/layer_version_test.go
@@ -305,7 +305,7 @@ func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) {
 		CheckDestroy:             acctest.CheckDestroyNoop, // this purposely leaves dangling resources, since skip_destroy = true
 		Steps: []resource.TestStep{
 			{
-				Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs14.x"),
+				Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs18.x"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckLayerVersionExists(ctx, resourceName),
 					acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:1", rName)),
@@ -314,7 +314,7 @@ func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs16.x"),
+				Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs20.x"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckLayerVersionExists(ctx, resourceName),
 					acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:2", rName)),
@@ -436,7 +436,7 @@ resource "aws_lambda_layer_version" "test" {
   filename   = "test-fixtures/lambdatest.zip"
   layer_name = %[1]q
 
-  compatible_runtimes = ["nodejs14.x", "nodejs16.x"]
+  compatible_runtimes = ["nodejs18.x", "nodejs20.x"]
 }
 `, rName)
 }

diff --git a/internal/service/lambda/test-fixtures/lambda_invocation_crud.js b/internal/service/lambda/test-fixtures/lambda_invocation_crud.js
diff --git a/internal/service/lambda/test-fixtures/lambda_invocation_crud.mjs b/internal/service/lambda/test-fixtures/lambda_invocation_crud.mjs
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { SSMClient, PutParameterCommand } from "@aws-sdk/client-ssm";
+
+const ssmClient = new SSMClient();
+
+export const handler = async (event) => {
+    let tf_key = "tf";
+    if (tf_key in event) {
+        if (event[tf_key].action == "delete" && process.env.TEST_DATA != "") {
+            try {
+                await ssmClient.send(new PutParameterCommand({
+                    Name: process.env.TEST_DATA,
+                    Value: JSON.stringify(event),
+                    Type: "String"
+                }));
+            } catch (error) {
+                console.error("Error putting parameter:", error);
+                throw error;
+            }
+        }
+    }
+    return event;
+}
diff --git a/internal/service/lambda/test-fixtures/lambda_invocation_crud.zip b/internal/service/lambda/test-fixtures/lambda_invocation_crud.zip