From a9965c676425d4b86d8cb792cfd8d5919459f214 Mon Sep 17 00:00:00 2001 From: Grigorii Merkushev Date: Wed, 8 Feb 2023 15:27:55 +0100 Subject: [PATCH 1/6] wip: lambda for aws s3 matadata --- lambda/.gitignore | 2 ++ lambda/go.mod | 5 +++++ lambda/go.sum | 6 ++++++ lambda/lambda.go | 21 +++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 lambda/.gitignore create mode 100644 lambda/go.mod create mode 100644 lambda/go.sum create mode 100644 lambda/lambda.go diff --git a/lambda/.gitignore b/lambda/.gitignore new file mode 100644 index 0000000..f546738 --- /dev/null +++ b/lambda/.gitignore @@ -0,0 +1,2 @@ +Archive.zip +lambda \ No newline at end of file diff --git a/lambda/go.mod b/lambda/go.mod new file mode 100644 index 0000000..a40fa70 --- /dev/null +++ b/lambda/go.mod @@ -0,0 +1,5 @@ +module github.com/newrelic/infrastructure-publish-action/lambda + +go 1.18 + +require github.com/aws/aws-lambda-go v1.37.0 diff --git a/lambda/go.sum b/lambda/go.sum new file mode 100644 index 0000000..d51f37b --- /dev/null +++ b/lambda/go.sum @@ -0,0 +1,6 @@ +github.com/aws/aws-lambda-go v1.37.0 h1:WXkQ/xhIcXZZ2P5ZBEw+bbAKeCEcb5NtiYpSwVVzIXg= +github.com/aws/aws-lambda-go v1.37.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/lambda/lambda.go b/lambda/lambda.go new file mode 100644 index 0000000..1727895 --- /dev/null +++ b/lambda/lambda.go @@ -0,0 +1,21 @@ +package main + +import ( + "context" + "fmt" + "github.com/aws/aws-lambda-go/events" + "github.com/aws/aws-lambda-go/lambda" +) + +func handler(ctx context.Context, s3Event events.S3Event) { + for _, record := range s3Event.Records { + s3 := record.S3 + fmt.Printf("[%s - %s] Bucket = %s, Key = %s \n", record.EventSource, record.EventTime, s3.Bucket.Name, s3.Object.Key) + } +} + +func main() { + fmt.Printf("starting aws s3 metadata rewrite tool\n") + // Make the handler available for Remote Procedure Call by AWS Lambda + lambda.Start(handler) +} From 6a804d8a012fc3c0e7f4ad539011e7e7ce4a0e32 Mon Sep 17 00:00:00 2001 From: Roger Coll Date: Wed, 8 Feb 2023 16:41:33 +0100 Subject: [PATCH 2/6] feat: modify s3 object metadata --- lambda/.gitignore | 4 +-- lambda/Makefile | 11 ++++++++ lambda/go.mod | 13 ++++++++- lambda/go.sum | 46 ++++++++++++++++++++++++++++++ lambda/lambda.go | 47 ++++++++++++++++++++++++++++--- lambda/lambda_test.go | 65 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 179 insertions(+), 7 deletions(-) create mode 100644 lambda/Makefile create mode 100644 lambda/lambda_test.go diff --git a/lambda/.gitignore b/lambda/.gitignore index f546738..6805ca4 100644 --- a/lambda/.gitignore +++ b/lambda/.gitignore @@ -1,2 +1,2 @@ -Archive.zip -lambda \ No newline at end of file +*.zip +lambda diff --git a/lambda/Makefile b/lambda/Makefile new file mode 100644 index 0000000..ddb2f16 --- /dev/null +++ b/lambda/Makefile @@ -0,0 +1,11 @@ +lambda: lambda.go + GOARCH=amd64 GOOS=linux go build + +lambda.zip: lambda + zip lambda.zip lambda + +.PHONY: build +build: lambda lambda.zip + +clean: + rm lambda.zip lambda diff --git a/lambda/go.mod b/lambda/go.mod index a40fa70..460f2b6 100644 --- a/lambda/go.mod +++ b/lambda/go.mod @@ -2,4 +2,15 @@ module github.com/newrelic/infrastructure-publish-action/lambda go 1.18 -require github.com/aws/aws-lambda-go v1.37.0 +require ( + github.com/aws/aws-lambda-go v1.37.0 + github.com/aws/aws-sdk-go v1.44.196 + github.com/stretchr/testify v1.7.2 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/lambda/go.sum b/lambda/go.sum index d51f37b..cb6d859 100644 --- a/lambda/go.sum +++ b/lambda/go.sum @@ -1,6 +1,52 @@ github.com/aws/aws-lambda-go v1.37.0 h1:WXkQ/xhIcXZZ2P5ZBEw+bbAKeCEcb5NtiYpSwVVzIXg= github.com/aws/aws-lambda-go v1.37.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM= +github.com/aws/aws-sdk-go v1.44.196 h1:e3h9M7fpnRHwHOohYmYjgVbcCBvkxKwZiT7fGrxRn28= +github.com/aws/aws-sdk-go v1.44.196/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lambda/lambda.go b/lambda/lambda.go index 1727895..ae34661 100644 --- a/lambda/lambda.go +++ b/lambda/lambda.go @@ -5,17 +5,56 @@ import ( "fmt" "github.com/aws/aws-lambda-go/events" "github.com/aws/aws-lambda-go/lambda" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/s3" ) -func handler(ctx context.Context, s3Event events.S3Event) { +const ( + surrogateKey = "infrastructure_metadata" + fastlySurrogate = "x-amz-meta-surrogate-key" +) + +func handler(ctx context.Context, s3Event events.S3Event) error { + // debugging + //data, err := json.Marshal(s3Event) + //if err != nil { + // return err + //} + //fmt.Printf("%s\f", data) + + sess, err := session.NewSession(&aws.Config{ + Region: aws.String("us-east-1")}, + ) + if err != nil { + return fmt.Errorf("error getting s3 session: %w", err) + } + + s3 := s3.New(sess) for _, record := range s3Event.Records { - s3 := record.S3 - fmt.Printf("[%s - %s] Bucket = %s, Key = %s \n", record.EventSource, record.EventTime, s3.Bucket.Name, s3.Object.Key) + s3Record := record.S3 + _, err := s3.CopyObject(modifyMetadata(s3Record)) + if err != nil { + return fmt.Errorf("error while coping metadata to s3 object: %w", err) + } + fmt.Printf("Modified object file %s\n", s3Record.Object.Key) + } + + fmt.Println("SUCCEED: All S3 Objects metadata updated") + return nil +} + +func modifyMetadata(record events.S3Entity) *s3.CopyObjectInput { + return &s3.CopyObjectInput{ + Bucket: aws.String(record.Bucket.Name), + Key: aws.String(record.Object.Key), + CopySource: aws.String(record.Bucket.Name + "/" + record.Object.Key), + Metadata: map[string]*string{fastlySurrogate: aws.String(surrogateKey)}, + MetadataDirective: aws.String("REPLACE"), } } func main() { fmt.Printf("starting aws s3 metadata rewrite tool\n") - // Make the handler available for Remote Procedure Call by AWS Lambda lambda.Start(handler) } diff --git a/lambda/lambda_test.go b/lambda/lambda_test.go new file mode 100644 index 0000000..790b2c0 --- /dev/null +++ b/lambda/lambda_test.go @@ -0,0 +1,65 @@ +package main + +import ( + "encoding/json" + "github.com/aws/aws-lambda-go/events" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/s3" + "github.com/stretchr/testify/assert" + "testing" +) + +func TestLambdaHandler(t *testing.T) { + testData := ` +{ + "Records": [ + { + "eventVersion": "2.0", + "eventSource": "aws:s3", + "awsRegion": "us-east-1", + "eventTime": "1970-01-01T00:00:00.123Z", + "eventName": "ObjectCreated:Put", + "userIdentity": { + "principalId": "EXAMPLE" + }, + "requestParameters": { + "sourceIPAddress": "127.0.0.1" + }, + "responseElements": { + "x-amz-request-id": "C3D13FC810", + "x-amz-id-2": "FMyUY8/IgAtTv8V5Wp6S7S/JRWeUWerMOjpD" + }, + "s3": { + "s3SchemaVersion": "1.0", + "configurationId": "testCigRule", + "bucket": { + "name": "sourcebucket", + "ownerIdentity": { + "principalId": "EXAMPLE" + }, + "arn": "arn:aws:s3:::mybucket" + }, + "object": { + "key": "Happy%20Face.jpg", + "size": 1024, + "versionId": "version", + "eTag": "d41d8cd98f00be", + "sequencer": "Happy Sequencer" + } + } + } + ] +} +` + eventData := events.S3Event{} + err := json.Unmarshal([]byte(testData), &eventData) + assert.NoError(t, err) + expectedObject := s3.CopyObjectInput{ + Bucket: aws.String("sourcebucket"), + Key: aws.String("Happy%20Face.jpg"), + CopySource: aws.String("sourcebucket/Happy%20Face.jpg"), + Metadata: map[string]*string{"x-amz-meta-surrogate-key": aws.String("test_1")}, + MetadataDirective: aws.String("REPLACE"), + } + assert.Equal(t, expectedObject, *modifyMetadata(eventData.Records[0].S3)) +} From b3a6b32a802d75e22e6bad6821a1fd91e62ce6fd Mon Sep 17 00:00:00 2001 From: Grigorii Merkushev Date: Wed, 8 Feb 2023 17:20:11 +0100 Subject: [PATCH 3/6] wip: terraform --- lambda/.gitignore | 1 + lambda/terraform/main.tf | 118 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 lambda/terraform/main.tf diff --git a/lambda/.gitignore b/lambda/.gitignore index 6805ca4..d48748f 100644 --- a/lambda/.gitignore +++ b/lambda/.gitignore @@ -1,2 +1,3 @@ *.zip lambda +terraform/.terraform \ No newline at end of file diff --git a/lambda/terraform/main.tf b/lambda/terraform/main.tf new file mode 100644 index 0000000..d5d784e --- /dev/null +++ b/lambda/terraform/main.tf @@ -0,0 +1,118 @@ +variable "function_name" { + default = "infrastructure-s3-matadata-updater" +} +variable "handler_name" { + default = "lambda" +} +variable "runtime" { + default = "gp1.x" +} +variable "timeout" { + default = "10" +} +variable "aws_s3_bucket_id" { + default = "" +} + + + +#resource "aws_cloudwatch_log_group" "example" { +# name = "/aws/lambda/${var.function_name}" +# retention_in_days = 14 +#} + + +######################################### +# Creating Lambda IAM resource +######################################### + +resource "aws_iam_role" "lambda_iam" { + name = "${var.function_name}-role" + + assume_role_policy = < Date: Fri, 10 Feb 2023 17:05:38 +0100 Subject: [PATCH 4/6] feat: create s3 lambda notification --- lambda/Makefile | 19 ++++++- lambda/terraform/main.tf | 109 ++++++++++++++++++++++++++++++++------- 2 files changed, 108 insertions(+), 20 deletions(-) diff --git a/lambda/Makefile b/lambda/Makefile index ddb2f16..b2dc940 100644 --- a/lambda/Makefile +++ b/lambda/Makefile @@ -1,11 +1,26 @@ +TERRAFORM_DIR := ./terraform + lambda: lambda.go GOARCH=amd64 GOOS=linux go build lambda.zip: lambda - zip lambda.zip lambda + zip $@ lambda .PHONY: build build: lambda lambda.zip +.PHONY: init +init: clean lambda.zip + terraform -chdir=$(TERRAFORM_DIR) init + +.PHONY: plan +plan: init + terraform -chdir=$(TERRAFORM_DIR) plan + +.PHONY: apply +apply: init + terraform -chdir=$(TERRAFORM_DIR) apply + +.PHONY: clean clean: - rm lambda.zip lambda + rm -f lambda.zip lambda diff --git a/lambda/terraform/main.tf b/lambda/terraform/main.tf index d5d784e..3e6d02c 100644 --- a/lambda/terraform/main.tf +++ b/lambda/terraform/main.tf @@ -4,22 +4,63 @@ variable "function_name" { variable "handler_name" { default = "lambda" } + variable "runtime" { - default = "gp1.x" + default = "go1.x" } + variable "timeout" { default = "10" } + variable "aws_s3_bucket_id" { - default = "" + default = "caos-fastly-lambda-test" } +variable "aws_s3_bucket_arn" { + default = "arn:aws:s3:::caos-fastly-lambda-test" +} +variable "s3_notifications" { + default = { + bucket = { + name = "caos-fastly-lambda-test" + filters = [ + { + name = "infrastructure agent apt" + filter_prefix = "/infrastructure_agent/linux/apt" + filter_suffix = "" + }, + { + name = "rpm data" + filter_prefix = "/infrastructure/linux/rpm" + filter_suffix = ".repodata" + } + ] + } + } +} -#resource "aws_cloudwatch_log_group" "example" { -# name = "/aws/lambda/${var.function_name}" -# retention_in_days = 14 -#} + +######################################### +# Set AWS Provider region +######################################### + +provider "aws" { + region = "us-east-1" +} + + + +resource "aws_cloudwatch_log_group" "lambda_log_group" { + name = "/aws/lambda/${var.function_name}" + retention_in_days = 14 +} + +resource "aws_iam_role_policy_attachment" "function_logging_policy_attachment" { + role = aws_iam_role.lambda_iam.id + policy_arn = aws_iam_policy.lambda_function_policy.arn +} ######################################### @@ -45,9 +86,8 @@ resource "aws_iam_role" "lambda_iam" { EOF } -resource "aws_iam_role_policy" "revoke_keys_role_policy" { +resource "aws_iam_policy" "lambda_function_policy" { name = "${var.function_name}-policy" - role = aws_iam_role.lambda_iam.id policy = < item} + bucket = each.value.name - bucket = var.aws_s3_bucket_id - lambda_function { - lambda_function_arn = aws_lambda_function.test_lambda.arn - events = ["s3:ObjectCreated:Put", "s3:ObjectCreated:Post"] - filter_prefix = each.key + dynamic "lambda_function" { + for_each = [for item in each.value.filters: { + suffix = item.filter_suffix + prefix = item.filter_prefix + }] + + content { + lambda_function_arn = aws_lambda_function.test_lambda.arn + events = ["s3:ObjectCreated:Put"] + filter_prefix = lambda_function.value.prefix + filter_suffix = lambda_function.value.suffix + } } + + dynamic "lambda_function" { + for_each = [for item in each.value.filters: { + suffix = item.filter_suffix + prefix = item.filter_prefix + }] + + content { + lambda_function_arn = aws_lambda_function.test_lambda.arn + events = ["s3:ObjectCreated:Post"] + filter_prefix = lambda_function.value.prefix + filter_suffix = lambda_function.value.suffix + } + } + + depends_on = [aws_lambda_permission.allow_bucket] } From de697e9b3017526b03ac8cf83101cf3a967e87db Mon Sep 17 00:00:00 2001 From: Grigorii Merkushev Date: Wed, 15 Feb 2023 16:59:46 +0100 Subject: [PATCH 5/6] update triggers --- lambda/terraform/main.tf | 90 +++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 25 deletions(-) diff --git a/lambda/terraform/main.tf b/lambda/terraform/main.tf index 3e6d02c..9da0288 100644 --- a/lambda/terraform/main.tf +++ b/lambda/terraform/main.tf @@ -21,24 +21,60 @@ variable "aws_s3_bucket_arn" { default = "arn:aws:s3:::caos-fastly-lambda-test" } + variable "s3_notifications" { default = { bucket = { - name = "caos-fastly-lambda-test" - filters = [ - { - name = "infrastructure agent apt" - filter_prefix = "/infrastructure_agent/linux/apt" - filter_suffix = "" - }, - { - name = "rpm data" - filter_prefix = "/infrastructure/linux/rpm" - filter_suffix = ".repodata" - } - ] - } + name = "caos-fastly-lambda-test" + filters = [ + { + name = "apt metadata" + filter_prefix = "infrastructure_agent/linux/apt/dists/" + filter_suffix = "" + }, + { + name = "yum rpm data xml" + filter_prefix = "infrastructure_agent/linux/yum/" + filter_suffix = "xml" + }, + { + name = "yum rpm data xml.asc" + filter_prefix = "infrastructure_agent/linux/yum/" + filter_suffix = "asc" + }, + { + name = "yum rpm data bz2" + filter_prefix = "infrastructure_agent/linux/yum/" + filter_suffix = "bz2" + }, + { + name = "yum rpm data bz2" + filter_prefix = "infrastructure_agent/linux/yum/" + filter_suffix = "gz" + }, + { + name = "zypp rpm data xml" + filter_prefix = "infrastructure_agent/linux/zypp/" + filter_suffix = "xml" + }, + { + name = "zypp rpm data xml.asc" + filter_prefix = "infrastructure_agent/linux/zypp/" + filter_suffix = "asc" + }, + { + name = "zypp rpm data bz2" + filter_prefix = "infrastructure_agent/linux/zypp/" + filter_suffix = "bz2" + }, + { + name = "zypp rpm data bz2" + filter_prefix = "infrastructure_agent/linux/zypp/" + filter_suffix = "gz" + }, + ] } + } } @@ -47,11 +83,10 @@ variable "s3_notifications" { ######################################### provider "aws" { - region = "us-east-1" + region = "us-east-1" } - resource "aws_cloudwatch_log_group" "lambda_log_group" { name = "/aws/lambda/${var.function_name}" retention_in_days = 14 @@ -102,6 +137,7 @@ resource "aws_iam_policy" "lambda_function_policy" { ], "Effect": "Allow", "Resource": "*" + }, { "Sid": "VisualEditor1", @@ -135,13 +171,13 @@ terraform { resource "aws_lambda_function" "test_lambda" { function_name = var.function_name role = aws_iam_role.lambda_iam.arn - handler = "src/${var.handler_name}.lambda_handler" + handler = var.handler_name runtime = var.runtime timeout = var.timeout filename = "../lambda.zip" source_code_hash = filebase64sha256("../lambda.zip") - depends_on = [aws_cloudwatch_log_group.lambda_log_group] - tags = { + depends_on = [aws_cloudwatch_log_group.lambda_log_group] + tags = { owning_team = "CAOS" } } @@ -156,14 +192,16 @@ resource "aws_lambda_permission" "allow_bucket" { # Adding S3 bucket as trigger resource "aws_s3_bucket_notification" "aws-lambda-trigger-post" { - for_each = {for item in var.s3_notifications: item.name => item} - bucket = each.value.name + for_each = {for item in var.s3_notifications : item.name => item} + bucket = each.value.name dynamic "lambda_function" { - for_each = [for item in each.value.filters: { + for_each = [ + for item in each.value.filters : { suffix = item.filter_suffix prefix = item.filter_prefix - }] + } + ] content { lambda_function_arn = aws_lambda_function.test_lambda.arn @@ -174,10 +212,12 @@ resource "aws_s3_bucket_notification" "aws-lambda-trigger-post" { } dynamic "lambda_function" { - for_each = [for item in each.value.filters: { + for_each = [ + for item in each.value.filters : { suffix = item.filter_suffix prefix = item.filter_prefix - }] + } + ] content { lambda_function_arn = aws_lambda_function.test_lambda.arn From 6ab326638211ff963aec03e4e435fcd17331e941 Mon Sep 17 00:00:00 2001 From: Roger Coll Date: Thu, 16 Feb 2023 12:02:51 +0100 Subject: [PATCH 6/6] feat: restrict terraform s3 policy --- lambda/terraform/main.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lambda/terraform/main.tf b/lambda/terraform/main.tf index 9da0288..628d22c 100644 --- a/lambda/terraform/main.tf +++ b/lambda/terraform/main.tf @@ -136,8 +136,7 @@ resource "aws_iam_policy" "lambda_function_policy" { "s3:ListBucket" ], "Effect": "Allow", - "Resource": "*" - + "Resource": "${var.aws_s3_bucket_arn}/infrastructure_agent/linux/*" }, { "Sid": "VisualEditor1", @@ -146,7 +145,7 @@ resource "aws_iam_policy" "lambda_function_policy" { "logs:CreateLogStream", "logs:PutLogEvents" ], - "Resource": "arn:aws:logs:*:*:*" + "Resource": "${aws_cloudwatch_log_group.lambda_log_group.arn}:*" } ] }