provider/aws: implement CloudFront Lambda Function Associations (supersedes #10985) #11291

catsby · 2017-01-19T15:18:36Z

Continue the work done in #10985 with just a few tweaks to restore the TypeSet in lambda_function_association.

Should also fix #11295

stack72 · 2017-01-19T15:30:43Z

Solid work - this LGTM! Nice to see this coming in - it should unblock some people :)

MrGossett · 2017-01-19T15:35:01Z

Thanks!

MrGossett · 2017-01-19T15:49:19Z

builtin/providers/aws/cloudfront_distribution_configuration_structure_test.go

@@ -44,6 +49,35 @@ func trustedSignersConf() []interface{} {
 	return []interface{}{"1234567890EX", "1234567891EX"}
 }

+func lambdaSetHash(v interface{}) int {


This is essentially where my PR was at 9c5a25d on Jan 5. I was derailed by the comment from @apparentlymart asking to remove the hash function.

Sorry this got delayed 2 weeks as a result 🤓

Sorry this got delayed 2 weeks as a result

Nah it's not your fault.

@apparentlymart was correct in that the manually added Set function should be omitted, unless there's a really good reason.

That doesn't make it his fault either 😄

The problem here was reconstructing "sets" in code in the test instead of configuration. All the previous examples I found in the codebase were simple set's of strings which is trivial to reconstruct, but NewSet is more difficult with sets that have a more complicated schema.

Like I said you did 99% of the work here I just needed to do some battlefield surgery 😄

Roger. Thanks again 😄

@MrGossett So.... funny enough, I had to reinstate that lambda set hash you were asked to remove 😆

From Martin's comment:

We only really continue to support explicit Set for compatibility with schemas that predate the automatic hashing.

This is true, but unfortunately lambda_function_association is being added as a sub param to two params that do themselves have custom hash function for the IDs.

So, I had to add lambda_function_association to the two CacheBehaviorHash (?) method(s), but to do so, I'd need to hash them... so I needed that method 😐

So anyway it's re-added

catsby · 2017-01-19T16:34:44Z

Ran some test:

=== RUN   TestAccAWSCloudFrontDistribution_importBasic
--- PASS: TestAccAWSCloudFrontDistribution_importBasic (1587.37s)
=== RUN   TestAccAWSCloudFrontDistribution_S3Origin
--- PASS: TestAccAWSCloudFrontDistribution_S3Origin (1626.38s)
=== RUN   TestAccAWSCloudFrontDistribution_S3OriginWithTags
--- PASS: TestAccAWSCloudFrontDistribution_S3OriginWithTags (1734.81s)

catsby · 2017-01-19T17:13:15Z

Hold off on this - need to investigate something

…t (including limits)

catsby · 2017-01-19T21:58:32Z

I added documentation and the lambda_function_association objects to the cacheBehaviorHash methods to track them, and added docs in 6d4f400

catsby · 2017-01-19T23:02:05Z

Hey @stack72 when you get a chance can you look this over? Not sure about the TravisCI error 🤔

tomelliff · 2017-01-20T08:29:57Z

website/source/docs/providers/aws/r/cloudfront_distribution.html.markdown

    handles query strings, cookies and headers (maximum one).

+  * `lambda_function_association` (Optional) - A complext config that triggers a lambda function with


Typo on complext

tomelliff · 2017-01-20T08:30:20Z

website/source/docs/providers/aws/r/cloudfront_distribution.html.markdown

+Lambda@Edge](http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/what-is-lambda-at-edge.html) 
+for more information
+
+  * `event_type` (Required) - The specific event to trigger this functionon.


Typo on functionon

stack72 · 2017-01-20T11:38:22Z

@catsby the travis fail is because of this

--- FAIL: TestCloudFrontStructure_flattenDefaultCacheBehavior (0.00s)
panic: interface conversion: interface {} is []interface {}, not *schema.Set [recovered]
	panic: interface conversion: interface {} is []interface {}, not *schema.Set

…nctions may be a set or an []interface{}

stack72 · 2017-01-20T17:46:35Z

LGTM!

MrGossett · 2017-01-20T19:51:31Z

website/source/docs/providers/aws/r/cloudfront_distribution.html.markdown

+for more information
+
+  * `event_type` (Required) - The specific event to trigger this function.
+  Valid values: `viewwer-request`, `origin-request`, `viewer-response`,


typo: viewwer-request

fixed, thanks!

MrGossett · 2017-01-20T20:25:48Z

builtin/providers/aws/cloudfront_distribution_configuration_structure.go

@@ -294,6 +311,9 @@ func flattenCacheBehavior(cb *cloudfront.CacheBehavior) map[string]interface{} {
 	if len(cb.TrustedSigners.Items) > 0 {
 		m["trusted_signers"] = flattenTrustedSigners(cb.TrustedSigners)
 	}
+	if len(cb.LambdaFunctionAssociations.Items) > 0 {
+		m["lambda_function_association"] = flattenLambdaFunctionAssociations(cb.LambdaFunctionAssociations)


is this supposed to be plural? lambda_function_associations

no, it's a key in the schema. If it were plural then the config to use it would be

lambda_funcation_associations { event_type = "blah" arn = "blah" } lambda_funcation_associations { event_type = "blah" arn = "blah" } ...

Makes sense.

MrGossett · 2017-01-20T21:06:45Z

builtin/providers/aws/cloudfront_distribution_configuration_structure_test.go

@@ -337,6 +363,9 @@ func TestCloudFrontStructure_flattenCacheBehavior(t *testing.T) {
 	if out["target_origin_id"] != "myS3Origin" {
 		t.Fatalf("Expected out[target_origin_id] to be myS3Origin, got %v", out["target_origin_id"])
 	}
+	if reflect.DeepEqual(out["lambda_function_associations"], in["lambda_function_associations"]) != true {


I have a feeling this is passing because reflect.DeepEqual is comparing nil to nil. The singular version is used in defaultCacheBehaviorConf, so the plural lambda_function_associations doesn't exist.

makes sense, I'll investigate

fixed in fd3f4bb

ghost · 2020-04-17T02:34:03Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you have found a problem that seems similar to this, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

MrGossett added 5 commits December 31, 2016 20:51

implement CloudFront Lambda function associations

39520ab

add lambda_arn to lambda func association hash

fa7eecf

update lambda function association test for new hash order

9c5a25d

lambda_function_association attribute as []interface{}

32f7a86

lambda_function_association as List not Set

25f9aeb

catsby added the provider/aws label Jan 19, 2017

catsby mentioned this pull request Jan 19, 2017

provider/aws: implement CloudFront Lambda Function Associations #10985

Closed

tweaks to restore TypeSet functionality

2cf64ef

catsby force-pushed the pr-10985 branch from d17ef8f to 2cf64ef Compare January 19, 2017 15:22

fix hash problem

5400f7c

MrGossett reviewed Jan 19, 2017

View reviewed changes

MrGossett mentioned this pull request Jan 19, 2017

Error destroying aws cloudfront distribution #10938

Closed

restore lambdasethash, include in cache behavior id hash, and documen…

6d4f400

…t (including limits)

catsby mentioned this pull request Jan 19, 2017

Applying a change to trusted_signers in default_cache_behavior in aws_cloudfront_distribution plans OK but produces error on apply #11295

Closed

tomelliff reviewed Jan 20, 2017

View reviewed changes

fix issue where, depending on a creation of flattening, the lambda fu…

9175340

…nctions may be a set or an []interface{}

catsby force-pushed the pr-10985 branch from 75b3ae3 to 9175340 Compare January 20, 2017 17:26

fix docs

75fa825

stack72 approved these changes Jan 20, 2017

View reviewed changes

MrGossett reviewed Jan 20, 2017

View reviewed changes

catsby added 2 commits January 20, 2017 16:20

fix up a test to actually compare them

fd3f4bb

fix doc typo

9d8b1c1

catsby merged commit 7c5b3a5 into master Jan 20, 2017

catsby deleted the pr-10985 branch January 20, 2017 22:34

catsby mentioned this pull request Jan 23, 2017

Crash during apply #11248

Closed

ghost locked and limited conversation to collaborators Apr 17, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

provider/aws: implement CloudFront Lambda Function Associations (supersedes #10985) #11291

provider/aws: implement CloudFront Lambda Function Associations (supersedes #10985) #11291

catsby commented Jan 19, 2017 •

edited

Loading

stack72 commented Jan 19, 2017

MrGossett commented Jan 19, 2017

MrGossett Jan 19, 2017

catsby Jan 19, 2017 •

edited

Loading

MrGossett Jan 19, 2017

catsby Jan 19, 2017

MrGossett Jan 19, 2017

catsby commented Jan 19, 2017

catsby commented Jan 19, 2017

catsby commented Jan 19, 2017

catsby commented Jan 19, 2017

tomelliff Jan 20, 2017

tomelliff Jan 20, 2017

stack72 commented Jan 20, 2017

stack72 commented Jan 20, 2017

MrGossett Jan 20, 2017

catsby Jan 20, 2017

MrGossett Jan 20, 2017

catsby Jan 20, 2017

MrGossett Jan 20, 2017

MrGossett Jan 20, 2017

catsby Jan 20, 2017

catsby Jan 20, 2017

ghost commented Apr 17, 2020

		handles query strings, cookies and headers (maximum one).

		* `lambda_function_association` (Optional) - A complext config that triggers a lambda function with

provider/aws: implement CloudFront Lambda Function Associations (supersedes #10985) #11291

provider/aws: implement CloudFront Lambda Function Associations (supersedes #10985) #11291

Conversation

catsby commented Jan 19, 2017 • edited Loading

stack72 commented Jan 19, 2017

MrGossett commented Jan 19, 2017

Choose a reason for hiding this comment

catsby Jan 19, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

catsby commented Jan 19, 2017

catsby commented Jan 19, 2017

catsby commented Jan 19, 2017

catsby commented Jan 19, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stack72 commented Jan 20, 2017

stack72 commented Jan 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost commented Apr 17, 2020

catsby commented Jan 19, 2017 •

edited

Loading

catsby Jan 19, 2017 •

edited

Loading