Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Lambda Layers - New Version Every Run #25647 #32535

Merged
merged 3 commits into from
Aug 11, 2023
Merged

Lambda Layers - New Version Every Run #25647 #32535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eac11f
Lambda Layers - New Version Every Run #25647
IlyesDemineExtVeolia Jul 17, 2023
03eeb6b
Add changelog
YakDriver Aug 11, 2023
4eafa7f
Update tests
YakDriver Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/32535.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_lambda_layer_version: Fix bug causing new version to be created on every apply when `source_code_hash` is used but not changed
```
1 change: 0 additions & 1 deletion internal/service/lambda/layer_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ func ResourceLayerVersion() *schema.Resource {
"source_code_hash": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Computed: true,
},
"source_code_size": {
Expand Down
100 changes: 75 additions & 25 deletions internal/service/lambda/layer_version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

func TestAccLambdaLayerVersion_basic(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -59,7 +59,7 @@ func TestAccLambdaLayerVersion_basic(t *testing.T) {

func TestAccLambdaLayerVersion_update(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -70,27 +70,67 @@ func TestAccLambdaLayerVersion_update(t *testing.T) {
Steps: []resource.TestStep{
{
Config: testAccLayerVersionConfig_createBeforeDestroy(rName, "test-fixtures/lambdatest.zip"),
Check: testAccCheckLayerVersionExists(ctx, resourceName, rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:1", rName)),
),
},

{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"filename", "source_code_hash", "skip_destroy"},
},

{
Config: testAccLayerVersionConfig_createBeforeDestroy(rName, "test-fixtures/lambdatest_modified.zip"),
Check: testAccCheckLayerVersionExists(ctx, resourceName, rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:2", rName)),
),
},
},
})
}

func TestAccLambdaLayerVersion_sourceCodeHash(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(ctx, t) },
ErrorCheck: acctest.ErrorCheck(t, lambda.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckLayerVersionDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccLayerVersionConfig_sourceCodeHash(rName, "test-fixtures/lambdatest.zip"),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:1", rName)),
),
},
{
Config: testAccLayerVersionConfig_sourceCodeHash(rName, "test-fixtures/lambdatest.zip"),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:1", rName)),
),
},
{
Config: testAccLayerVersionConfig_sourceCodeHash(rName, "test-fixtures/lambdatest_modified.zip"),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:2", rName)),
),
},
},
})
}

func TestAccLambdaLayerVersion_s3(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -116,7 +156,7 @@ func TestAccLambdaLayerVersion_s3(t *testing.T) {

func TestAccLambdaLayerVersion_compatibleRuntimes(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -145,7 +185,7 @@ func TestAccLambdaLayerVersion_compatibleRuntimes(t *testing.T) {

func TestAccLambdaLayerVersion_compatibleArchitectures(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -196,7 +236,7 @@ func TestAccLambdaLayerVersion_compatibleArchitectures(t *testing.T) {

func TestAccLambdaLayerVersion_description(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
testDescription := "test description"

Expand Down Expand Up @@ -226,7 +266,7 @@ func TestAccLambdaLayerVersion_description(t *testing.T) {

func TestAccLambdaLayerVersion_licenseInfo(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
testLicenseInfo := "MIT"

Expand Down Expand Up @@ -256,7 +296,7 @@ func TestAccLambdaLayerVersion_licenseInfo(t *testing.T) {

func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) {
ctx := acctest.Context(t)
resourceName := "aws_lambda_layer_version.lambda_layer_test"
resourceName := "aws_lambda_layer_version.test"
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -269,7 +309,7 @@ func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) {
Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs14.x"),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:2", rName)),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:1", rName)),
resource.TestCheckResourceAttr(resourceName, "compatible_runtimes.#", "1"),
resource.TestCheckResourceAttr(resourceName, "skip_destroy", "true"),
),
Expand All @@ -278,7 +318,7 @@ func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) {
Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs16.x"),
Check: resource.ComposeTestCheckFunc(
testAccCheckLayerVersionExists(ctx, resourceName, rName),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:1", rName)),
acctest.CheckResourceAttrRegionalARN(resourceName, "arn", "lambda", fmt.Sprintf("layer:%s:2", rName)),
resource.TestCheckResourceAttr(resourceName, "compatible_runtimes.#", "1"),
resource.TestCheckResourceAttr(resourceName, "skip_destroy", "true"),
),
Expand Down Expand Up @@ -350,7 +390,7 @@ func testAccCheckLayerVersionExists(ctx context.Context, res, layerName string)

func testAccLayerVersionConfig_basic(rName string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q
}
Expand All @@ -369,7 +409,7 @@ resource "aws_s3_object" "lambda_code" {
source = "test-fixtures/lambdatest.zip"
}

resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
s3_bucket = aws_s3_bucket.lambda_bucket.id
s3_key = aws_s3_object.lambda_code.id
layer_name = %[1]q
Expand All @@ -379,7 +419,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_createBeforeDestroy(rName string, filename string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = %[1]q
layer_name = %[2]q
source_code_hash = filebase64sha256(%[1]q)
Expand All @@ -391,9 +431,19 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {
`, filename, rName)
}

func testAccLayerVersionConfig_sourceCodeHash(rName string, filename string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "test" {
filename = %[1]q
layer_name = %[2]q
source_code_hash = filebase64sha256(%[1]q)
}
`, filename, rName)
}

func testAccLayerVersionConfig_compatibleRuntimes(rName string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q

Expand All @@ -404,7 +454,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_compatibleArchitecturesNone(rName string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q
}
Expand All @@ -413,7 +463,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_compatibleArchitecturesX86Arm(rName string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q
compatible_architectures = ["x86_64", "arm64"]
Expand All @@ -423,7 +473,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_compatibleArchitecturesX86(rName string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q
compatible_architectures = ["x86_64"]
Expand All @@ -433,7 +483,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_compatibleArchitecturesArm(rName string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q
compatible_architectures = ["arm64"]
Expand All @@ -443,7 +493,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_description(rName string, description string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q

Expand All @@ -454,7 +504,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_licenseInfo(rName string, licenseInfo string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q

Expand All @@ -465,7 +515,7 @@ resource "aws_lambda_layer_version" "lambda_layer_test" {

func testAccLayerVersionConfig_skipDestroy(rName, compatRuntime string) string {
return fmt.Sprintf(`
resource "aws_lambda_layer_version" "lambda_layer_test" {
resource "aws_lambda_layer_version" "test" {
filename = "test-fixtures/lambdatest.zip"
layer_name = %[1]q
compatible_runtimes = [%[2]q]
Expand Down
Loading