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

resource/aws_lambda_function: Recompute Lambda function version and qualified_arn on publish #3032

Merged
merged 3 commits into from
Feb 24, 2018
Merged

resource/aws_lambda_function: Recompute Lambda function version and qualified_arn on publish #3032

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
485acc1
resource/aws_lambda_function: Recompute Lambda function version on pu…
mdlavin Jan 17, 2018
db5bc3a
resource/aws_lambda_function: Recompute qualified_arn and last_modifi…
mdlavin Jan 18, 2018
963dddf
resource/aws_lambda_function: Update last_modified on any source code…
mdlavin Jan 19, 2018
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
22 changes: 21 additions & 1 deletion aws/resource_aws_lambda_function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,21 @@ func resourceAwsLambdaFunction() *schema.Resource {

"tags": tagsSchema(),
},

CustomizeDiff: updateComputedAttributesOnPublish,
}
}

func updateComputedAttributesOnPublish(d *schema.ResourceDiff, meta interface{}) error {
publish := d.Get("publish").(bool)
if publish && needsFunctionCodeUpdate(d) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are two other attributes that need to be SetNewComputed:

  • last_modified - This need to be recomputed any time there is a change to the Lambda code, even if publish =false
  • qualified_arn - This needs to be updated only if publish = true

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the feedback. I implemented the changes for last_modified and qualified_arn. In this version I only updated last_modified during the publish, but I see your point about it being needed more often than that.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if you did the following. It would make sure the last_modified was updated even if publish is set to false.

	if needsFunctionCodeUpdate(d) {
		d.SetNewComputed("last_modified")

		if publish {
			d.SetNewComputed("version")
			d.SetNewComputed("qualified_arn")
		}
	}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check out the new commit. It should cover your scenario now too

d.SetNewComputed("version")
d.SetNewComputed("qualified_arn")
d.SetNewComputed("last_modified")
}
return nil
}

// resourceAwsLambdaFunction maps to:
// CreateFunction in the API / SDK
func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) error {
Expand Down Expand Up @@ -521,6 +533,14 @@ func resourceAwsLambdaFunctionDelete(d *schema.ResourceData, meta interface{}) e
return nil
}

type resourceDiffer interface {
HasChange(string) bool
}

func needsFunctionCodeUpdate(d resourceDiffer) bool {
return d.HasChange("filename") || d.HasChange("source_code_hash") || d.HasChange("s3_bucket") || d.HasChange("s3_key") || d.HasChange("s3_object_version")
}

// resourceAwsLambdaFunctionUpdate maps to:
// UpdateFunctionCode in the API / SDK
func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) error {
Expand Down Expand Up @@ -664,7 +684,7 @@ func resourceAwsLambdaFunctionUpdate(d *schema.ResourceData, meta interface{}) e
d.SetPartial("timeout")
}

if d.HasChange("filename") || d.HasChange("source_code_hash") || d.HasChange("s3_bucket") || d.HasChange("s3_key") || d.HasChange("s3_object_version") {
if needsFunctionCodeUpdate(d) {
codeReq := &lambda.UpdateFunctionCodeInput{
FunctionName: aws.String(d.Id()),
Publish: aws.Bool(d.Get("publish").(bool)),
Expand Down
109 changes: 105 additions & 4 deletions aws/resource_aws_lambda_function_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"regexp"
"strings"
"testing"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/lambda"
Expand Down Expand Up @@ -287,7 +288,7 @@ func TestAccAWSLambdaFunction_versioned(t *testing.T) {
CheckDestroy: testAccCheckLambdaFunctionDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSLambdaConfigVersioned(funcName, policyName, roleName, sgName),
Config: testAccAWSLambdaConfigVersioned("test-fixtures/lambdatest.zip", funcName, policyName, roleName, sgName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", funcName, &conf),
testAccCheckAwsLambdaFunctionName(&conf, funcName),
Expand All @@ -302,6 +303,58 @@ func TestAccAWSLambdaFunction_versioned(t *testing.T) {
})
}

func TestAccAWSLambdaFunction_versionedUpdate(t *testing.T) {
var conf lambda.GetFunctionOutput

path, zipFile, err := createTempFile("lambda_localUpdate")
if err != nil {
t.Fatal(err)
}
defer os.Remove(path)

rString := acctest.RandString(8)
funcName := fmt.Sprintf("tf_acc_lambda_func_versioned_%s", rString)
policyName := fmt.Sprintf("tf_acc_policy_lambda_func_versioned_%s", rString)
roleName := fmt.Sprintf("tf_acc_role_lambda_func_versioned_%s", rString)
sgName := fmt.Sprintf("tf_acc_sg_lambda_func_versioned_%s", rString)

var timeBeforeUpdate time.Time

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckLambdaFunctionDestroy,
Steps: []resource.TestStep{
{
Config: testAccAWSLambdaConfigVersioned("test-fixtures/lambdatest.zip", funcName, policyName, roleName, sgName),
},
{
PreConfig: func() {
testAccCreateZipFromFiles(map[string]string{"test-fixtures/lambda_func_modified.js": "lambda.js"}, zipFile)
timeBeforeUpdate = time.Now()
},
Config: testAccAWSLambdaConfigVersioned(path, funcName, policyName, roleName, sgName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAwsLambdaFunctionExists("aws_lambda_function.lambda_function_test", funcName, &conf),
testAccCheckAwsLambdaFunctionName(&conf, funcName),
testAccCheckAwsLambdaFunctionArnHasSuffix(&conf, ":"+funcName),
resource.TestMatchResourceAttr("aws_lambda_function.lambda_function_test", "version",
regexp.MustCompile("^2$")),
resource.TestMatchResourceAttr("data.template_file.function_version", "rendered",
regexp.MustCompile("^2$")),
resource.TestMatchResourceAttr("aws_lambda_function.lambda_function_test", "qualified_arn",
regexp.MustCompile(":"+funcName+":[0-9]+$")),
resource.TestMatchResourceAttr("data.template_file.qualified_arn", "rendered",
regexp.MustCompile(fmt.Sprintf(":function:%s:2$", funcName))),
func(s *terraform.State) error {
return testAccCheckAttributeIsDateAfter(s, "data.template_file.last_modified", "rendered", timeBeforeUpdate)
},
),
},
},
})
}

func TestAccAWSLambdaFunction_DeadLetterConfig(t *testing.T) {
var conf lambda.GetFunctionOutput

Expand Down Expand Up @@ -1050,6 +1103,30 @@ func testAccCheckAwsLambdaSourceCodeHash(function *lambda.GetFunctionOutput, exp
}
}

func testAccCheckAttributeIsDateAfter(s *terraform.State, name string, key string, before time.Time) error {
rs, ok := s.RootModule().Resources[name]
if !ok {
return fmt.Errorf("Resource %s not found", name)
}

v, ok := rs.Primary.Attributes[key]
if !ok {
return fmt.Errorf("%s: Attribute '%s' not found", name, key)
}

const ISO8601UTC = "2006-01-02T15:04:05Z0700"
timeValue, err := time.Parse(ISO8601UTC, v)
if err != nil {
return err
}

if !before.Before(timeValue) {
return fmt.Errorf("Expected time attribute %s.%s with value %s was not before %s", name, key, v, before.Format(ISO8601UTC))
}

return nil
}

func testAccCreateZipFromFiles(files map[string]string, zipFile *os.File) error {
zipFile.Truncate(0)
zipFile.Seek(0, 0)
Expand Down Expand Up @@ -1366,17 +1443,41 @@ resource "aws_lambda_function" "lambda_function_test" {
`, funcName)
}

func testAccAWSLambdaConfigVersioned(funcName, policyName, roleName, sgName string) string {
func testAccAWSLambdaConfigVersioned(fileName, funcName, policyName, roleName, sgName string) string {
return fmt.Sprintf(baseAccAWSLambdaConfig(policyName, roleName, sgName)+`
resource "aws_lambda_function" "lambda_function_test" {
filename = "test-fixtures/lambdatest.zip"
filename = "%s"
function_name = "%s"
publish = true
role = "${aws_iam_role.iam_for_lambda.arn}"
handler = "exports.example"
runtime = "nodejs4.3"
}
`, funcName)

data "template_file" "function_version" {
template = "$${function_version}"

vars {
function_version = "${aws_lambda_function.lambda_function_test.version}"
}
}

data "template_file" "last_modified" {
template = "$${last_modified}"

vars {
last_modified = "${aws_lambda_function.lambda_function_test.last_modified}"
}
}

data "template_file" "qualified_arn" {
template = "$${qualified_arn}"

vars {
qualified_arn = "${aws_lambda_function.lambda_function_test.qualified_arn}"
}
}
`, fileName, funcName)
}

func testAccAWSLambdaConfigWithTracingConfig(funcName, policyName, roleName, sgName string) string {
Expand Down