Merge pull request #17 from telia-oss/setup-shared-s3-bucket

Setup shared S3 bucket for lambda artifact

Author: Kristian

.gitignore

@@ -1,4 +1,3 @@
 **/.terraform
 **/*.tfstate*
-main
-concourse-github-lambda.zip
+/build

.travis.yml

@@ -15,13 +15,27 @@ before_install:
 notifications:
   email: false
 script:
-- make release && make test
+- make test
+- make build
 deploy:
-  provider: releases
-  api_key:
-    secure: JgSZ2H3hnw3BRR8rUmodrULqorbdfjdYW2EU0rk5pCBVfmUeypsGFk+BikJK4Rca9fFAYs1TN6GpBeBMVCsAIIrzdXxbDcKsKGcCCO5Aka+mQXI9MFb0cbtstP8NmC75PmasjnAzuS0taMQNiNRek5FfYnZ+SoHmmffBCyU9/3iYN8wsaJM08fF/AW1Zval+UwXPqE2NCr42RqJakU6Dj95kUQSXtktPxwCOjCt6ImN3YXGRpGbuhYYe6VLehJ/U9PZZ11gw4IUOyCbQlCtZV/GvEanG/NWrqPxxtdLTrWgDyiYO1W/76ysEhHwakaR8Pm7bSM830MJYgTv16ZkHhy5Of+bD/cDLg8koVwVahqTHpY3uBYwuRQxKNvzu6L2M219jHAPJYusU28xRjXOFUjsT/mfTPaA1W4iMPWZcUWIk3yjo+7GW7+3vmC7d1BTpAHjpnGxbm8tzPNTJvYGj07rGefz7dk6A/jWzp9IYWpu4lIKRT5+8nvLoFmeD7PZaglQa8R5NlrjkUtbx+i0lcycxlPo2EaHJrd6VlwUGyvXFPJScxTo6QdqEQ2Pplir3xk0e//8UluNgXczsQdbYIcDRLCsj2OWQTKipxR1Nymmjq7T9t8RKufoqRGTjcuhudYUWl+W6cWEpFpaj/4mBCyhCIHfPXj27u9Mf1zybcag=
-  file: concourse-github-lambda.zip
-  skip_cleanup: true
-  on:
-    repo: telia-oss/concourse-github-lambda
-    tags: true
+  - provider: s3
+    access_key_id: AKIAIXXEON53QC2UQBPA
+    secret_access_key:
+      secure: JIboEjMPFam09m6bXXLrdC7wiXIwFJxo7czcs4zvTwkQYYQIBbU1urCOR88IcPAkYWkIzd1sN4lsQbd7Z0OvZpJLVPS1tIEBVnKwDotA4fzpFbFDzVx7V4Q8/T3Gaptx+IzZA8aUFop2phyaW6v6WOHqWv0oSEoBT86Dt4DmjokFfMNqeppoH5vNnEtus5lNoRF3l3DvLrKklRw1pR2dcROifOLKQRsa/C531Uc0O5dNzicNeiYQaSoNWmC1Snu6x1W0VfEEgkE7MshuoHzpFCSkj4aSecj9+83jw44EmUNrVI5PdWp1FSzrY3NeRX8VNeAAe1HI7OblAHPEm+Yp3gqpG/czuwy+bRNYu/J8V8FHfLDuLUUqZA7aU2qrx9i2u0P8VjNc0H9nECD8TxmK393Cw4YMDErt3IxG/CrA8zSboLsCVRy/ligaf4Ykvr7QIQoERsNhgQ7dpOva07ykVrW7UIm/olpQoXki8FmKTsENQPqir33N7x0hpju+Ag8D93bGyEiZa1H9vBOpLXEn6AT60dVNKBN/PR59Zhey/MW72iOsO0G+Smur8+9buQnQ+YsPNvHVPqD6PbS9PnokjPngjNd28tZBOug9e0mt0UOE6fJVmtu1Bbq10I/tl6OqveUf/uI9DGZWLh58F7Z9gj87U7ihKCk0hY+h24HxMDs=
+    bucket: telia-oss
+    region: eu-west-1
+    local-dir: build
+    upload-dir: concourse-github-lambda
+    acl: public_read
+    skip_cleanup: true
+    on:
+      repo: telia-oss/concourse-github-lambda
+      tags: true
+  - provider: releases
+    api_key:
+      secure: JgSZ2H3hnw3BRR8rUmodrULqorbdfjdYW2EU0rk5pCBVfmUeypsGFk+BikJK4Rca9fFAYs1TN6GpBeBMVCsAIIrzdXxbDcKsKGcCCO5Aka+mQXI9MFb0cbtstP8NmC75PmasjnAzuS0taMQNiNRek5FfYnZ+SoHmmffBCyU9/3iYN8wsaJM08fF/AW1Zval+UwXPqE2NCr42RqJakU6Dj95kUQSXtktPxwCOjCt6ImN3YXGRpGbuhYYe6VLehJ/U9PZZ11gw4IUOyCbQlCtZV/GvEanG/NWrqPxxtdLTrWgDyiYO1W/76ysEhHwakaR8Pm7bSM830MJYgTv16ZkHhy5Of+bD/cDLg8koVwVahqTHpY3uBYwuRQxKNvzu6L2M219jHAPJYusU28xRjXOFUjsT/mfTPaA1W4iMPWZcUWIk3yjo+7GW7+3vmC7d1BTpAHjpnGxbm8tzPNTJvYGj07rGefz7dk6A/jWzp9IYWpu4lIKRT5+8nvLoFmeD7PZaglQa8R5NlrjkUtbx+i0lcycxlPo2EaHJrd6VlwUGyvXFPJScxTo6QdqEQ2Pplir3xk0e//8UluNgXczsQdbYIcDRLCsj2OWQTKipxR1Nymmjq7T9t8RKufoqRGTjcuhudYUWl+W6cWEpFpaj/4mBCyhCIHfPXj27u9Mf1zybcag=
+    file: concourse-github-lambda.zip
+    skip_cleanup: true
+    on:
+      repo: telia-oss/concourse-github-lambda
+      tags: true

Makefile

@@ -1,38 +1,30 @@
-BINARY_NAME=main
-TARGET ?= linux
-ARCH ?= amd64
-SRC=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
-DIR=$(shell pwd)
+BINARY      = main
+TRAVIS_TAG ?= $(shell git describe --tags --candidates=1 --dirty 2>/dev/null || echo "dev")
+RELEASE     = $(TRAVIS_TAG).zip
+TARGET     ?= linux
+ARCH       ?= amd64
 
-default: test
-
-generate:
-	@echo "== Go Generate =="
-	go generate ./...
-
-run: test
-	@echo "== Run =="
-	go run cmd/main.go
+SRC   = $(filter-out vendor/*, $(wildcard *.go))
+DIR   = $(shell pwd)
 
-build: test
-	@echo "== Build =="
-	go build -o $(BINARY_NAME) -v cmd/main.go
+default: test
 
 clean:
 	@echo "== Cleaning =="
-	rm $(BINARY_NAME) || true
-	rm concourse-github-lambda.zip || true
+	rm -rf build
 
-release:
-	@echo "== Release build =="
-	CGO_ENABLED=0 GOOS=$(TARGET) GOARCH=$(ARCH) go build -o $(BINARY_NAME) -v cmd/main.go
-	zip concourse-github-lambda.zip main
+build: build/$(RELEASE)
+build/$(RELEASE): $(SRC)
+	@echo "== Build =="
+	CGO_ENABLED=0 GOOS=$(TARGET) GOARCH=$(ARCH) go build -o build/$(BINARY) -v cmd/main.go
+	zip -m build/$(RELEASE) build/$(BINARY)
+	
+	# Create a copy of the zip with a static filename for uploading to github releases
+	cp build/$(RELEASE) build/concourse-github-lambda.zip
 
-test-code:
-	@echo "== Test =="
-	gofmt -s -l -w $(SRC)
-	go vet -v ./...
-	go test -race -v ./...
+generate: $(SRC)
+	@echo "== Go Generate =="
+	go generate ./...
 
 test: test-code
 	@echo "== Terraform tests =="
@@ -66,4 +58,12 @@ test: test-code
 	@echo "√ terraform validate example"
 	@cd $(DIR)
 
-.PHONY: default build test release test-code generate
+test-code:
+	@echo "== Test =="
+	gofmt -s -l -w $(SRC)
+	go vet -v ./...
+	go test -race -v ./...
+
+.PHONY: default build test test-code generate
+
+deploy:

terraform/example.tf

@@ -10,7 +10,6 @@ module "github-lambda" {
   source = "./modules/lambda"
 
   name_prefix                  = "github-lambda"
-  filename                     = "../concourse-github-lambda.zip"
   github_prefix                = "concourse"
   secrets_manager_prefix       = "concourse"
   token_service_integration_id = "sm:///concourse-github-lambda/token-service/integration-id"

terraform/modules/lambda/main.tf

@@ -7,10 +7,12 @@ data "aws_caller_identity" "current" {}
 
 module "lambda" {
   source  = "telia-oss/lambda/aws"
-  version = "0.2.0"
+  version = "0.3.0"
 
   name_prefix = "${var.name_prefix}"
   filename    = "${var.filename}"
+  s3_bucket   = "${var.s3_bucket}"
+  s3_key      = "${var.s3_key}"
   policy      = "${data.aws_iam_policy_document.lambda.json}"
   handler     = "main"
   runtime     = "go1.x"

terraform/modules/lambda/variables.tf

@@ -6,7 +6,18 @@ variable "name_prefix" {
 }
 
 variable "filename" {
-  description = "Path to .zip file containing the handler. (I.e., output of make release)"
+  description = "Path to the handler zip-file."
+  default     = ""
+}
+
+variable "s3_bucket" {
+  description = "The bucket where the lambda function is uploaded."
+  default     = "telia-oss"
+}
+
+variable "s3_key" {
+  description = "The s3 key for the Lambda artifact."
+  default     = "concourse-github-lambda/v0.6.0.zip"
 }
 
 variable "secrets_manager_prefix" {