Merge pull request #30 from Andrea-Scuderi/feature/lambdaci-test

Andrea-Scuderi · web-flow · commit 0293f6306c5b · 2019-12-26T11:39:37.000+01:00
Test Lambda with LambCI and LocalStack
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 /.build
+.tmp
 /Packages
 /*.xcodeproj
 lambda.zip
diff --git a/.travis.yml b/.travis.yml
@@ -7,12 +7,23 @@ dist: xenial
 services:
   - docker
 
+env:
+  global:
+    - AWS_REGION=us-east-1
+    - AWS_ACCESS_KEY_ID=AKFAKEACCESSKEYID
+    - AWS_DEFAULT_REGION=us-east-1
+    - AWS_SECRET_ACCESS_KEY=AKFAKESECRETACCESSKEY
+    - AWS_PROFILE=default
+
 addons:
     snaps:
       - name: aws-cli
         confinement: classic # or devmode
         channel: latest/edge
 
+before_install:
+  - ./scripts/aws_travis_credentials.sh
+
 install:
   - make --version
   - make docker_build
@@ -23,4 +34,19 @@ script:
   - make package_lambda
   - make swift_test
   - make swift_test SWIFT_EXECUTABLE=HTTPSRequest SWIFT_PROJECT_PATH=Examples/HTTPSRequest LAMBDA_FUNCTION_NAME=HTTPSRequest LAMBDA_HANDLER=HTTPSRequest.getHttps
-  - make swift_test SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
+  - make swift_test SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
+  - make build_lambda_local
+  - make start_docker_compose_env
+  - make invoke_lambda_local
+  - make stop_docker_compose_env
+  - make test_lambda_local_output
+  - make build_lambda_local SWIFT_EXECUTABLE=HTTPSRequest SWIFT_PROJECT_PATH=Examples/HTTPSRequest LAMBDA_FUNCTION_NAME=HTTPSRequest LAMBDA_HANDLER=HTTPSRequest.getHttps
+  - make start_docker_compose_env SWIFT_EXECUTABLE=HTTPSRequest SWIFT_PROJECT_PATH=Examples/HTTPSRequest LAMBDA_FUNCTION_NAME=HTTPSRequest LAMBDA_HANDLER=HTTPSRequest.getHttps
+  - make invoke_lambda_local SWIFT_EXECUTABLE=HTTPSRequest SWIFT_PROJECT_PATH=Examples/HTTPSRequest LAMBDA_FUNCTION_NAME=HTTPSRequest LAMBDA_HANDLER=HTTPSRequest.getHttps
+  - make stop_docker_compose_env SWIFT_EXECUTABLE=HTTPSRequest SWIFT_PROJECT_PATH=Examples/HTTPSRequest LAMBDA_FUNCTION_NAME=HTTPSRequest LAMBDA_HANDLER=HTTPSRequest.getHttps
+  - make test_lambda_local_output SWIFT_EXECUTABLE=HTTPSRequest SWIFT_PROJECT_PATH=Examples/HTTPSRequest LAMBDA_FUNCTION_NAME=HTTPSRequest LAMBDA_HANDLER=HTTPSRequest.getHttps
+  - make build_lambda_local SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
+  - make start_docker_compose_env SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
+  - make invoke_lambda_local SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
+  - make stop_docker_compose_env SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
+  - make test_lambda_local_output SWIFT_EXECUTABLE=S3Test SWIFT_PROJECT_PATH=Examples/S3Test LAMBDA_FUNCTION_NAME=S3Test LAMBDA_HANDLER=S3Test.getObject
diff --git a/Examples/HTTPSRequest/Makefile b/Examples/HTTPSRequest/Makefile
@@ -0,0 +1,8 @@
+# Note: This must be launched from the root path
+SWIFT_PROJECT_PATH=Examples/HTTPSRequest
+
+start_docker_compose_env:
+	cd $(SWIFT_PROJECT_PATH); docker-compose up -d ; sleep 2
+
+stop_docker_compose_env:
+	cd $(SWIFT_PROJECT_PATH); docker-compose stop
diff --git a/Examples/HTTPSRequest/Sources/HTTPSRequest/main.swift b/Examples/HTTPSRequest/Sources/HTTPSRequest/main.swift
@@ -28,7 +28,6 @@ struct Event: Codable {
 }
 
 struct Response: Codable {
-    let url: String
     let content: String
 }
 
@@ -59,7 +58,7 @@ let syncCodableNIOLambda: SyncCodableNIOLambda<Event, Response> = { (event, cont
             }
             return value
         }.map { content -> Response in
-            return Response(url: event.url, content: content)
+            return Response(content: content)
         }
     return future
 }
@@ -92,8 +91,7 @@ let syncDictionaryNIOLambda: SyncDictionaryNIOLambda = { (event, context) throws
             }
             return value
         }.map { content -> [String: Any] in
-            return ["url": url,
-                    "content": content]
+            return ["content": content]
         }
     return future
 }
@@ -126,8 +124,7 @@ let asynchDictionayNIOLambda: AsyncDictionaryNIOLambda = { (event, context, comp
                 }
                 return value
         }.map { content -> [String: Any] in
-            return ["url": url,
-                    "content": content]
+            return ["content": content]
         }
         .wait()
         completion(.success(dictionary))
@@ -160,7 +157,7 @@ let asyncCodableNIOLambda: AsyncCodableNIOLambda<Event, Response> = { (event, co
                 }
                 return value
         }.map { content -> Response in
-            return Response(url: event.url, content: content)
+            return Response(content: content)
         }
         .wait()
         completion(.success(reponse))
@@ -198,7 +195,7 @@ let lambda: SyncCodableLambda<Event, Response> = { (input, context) throws -> Re
     }
     let content = String(data: data, encoding: .utf8) ?? ""
     
-    return Response(url: input.url, content: content)
+    return Response(content: content)
 }
 
 
diff --git a/Examples/HTTPSRequest/docker-compose.yml b/Examples/HTTPSRequest/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3'
+services:
+  lambci:
+    image: "lambci/lambda:provided"
+    volumes:
+        - ../../.build/local:/var/task:ro,delegated
+        - ../../bootstrap:/opt/bootstrap:ro,delegated
+        - ../../swift-shared-libs:/opt/swift-shared-libs:ro,delegated
+    environment:
+      - DOCKER_LAMBDA_STAY_OPEN=1
+      - AWS_LAMBDA_FUNCTION_TIMEOUT=3
+      - LAMB_CI_EXEC=1
+    command:
+      - HTTPSRequest.getHttps
+    ports:
+     - "9001:9001"
diff --git a/Examples/HTTPSRequest/event.json b/Examples/HTTPSRequest/event.json
@@ -1,3 +1,3 @@
 {
-    "url": "https://swift.org"
+    "url": "https://www.example.com"
 }
diff --git a/Examples/HTTPSRequest/outfile.json b/Examples/HTTPSRequest/outfile.json
@@ -0,0 +1 @@
+{"content":"<!doctype html>\n<html>\n<head>\n    <title>Example Domain<\/title>\n\n    <meta charset=\"utf-8\" \/>\n    <meta http-equiv=\"Content-type\" content=\"text\/html; charset=utf-8\" \/>\n    <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" \/>\n    <style type=\"text\/css\">\n    body {\n        background-color: #f0f0f2;\n        margin: 0;\n        padding: 0;\n        font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n        \n    }\n    div {\n        width: 600px;\n        margin: 5em auto;\n        padding: 2em;\n        background-color: #fdfdff;\n        border-radius: 0.5em;\n        box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n    }\n    a:link, a:visited {\n        color: #38488f;\n        text-decoration: none;\n    }\n    @media (max-width: 700px) {\n        div {\n            margin: 0 auto;\n            width: auto;\n        }\n    }\n    <\/style>    \n<\/head>\n\n<body>\n<div>\n    <h1>Example Domain<\/h1>\n    <p>This domain is for use in illustrative examples in documents. You may use this\n    domain in literature without prior coordination or asking for permission.<\/p>\n    <p><a href=\"https:\/\/www.iana.org\/domains\/example\">More information...<\/a><\/p>\n<\/div>\n<\/body>\n<\/html>\n"}
diff --git a/Examples/HelloWorld/Makefile b/Examples/HelloWorld/Makefile
@@ -0,0 +1,8 @@
+# Note: This must be launched from the root path
+SWIFT_PROJECT_PATH=Examples/HelloWorld
+
+start_docker_compose_env:
+	cd $(SWIFT_PROJECT_PATH); docker-compose up -d ; sleep 2
+
+stop_docker_compose_env:
+	cd $(SWIFT_PROJECT_PATH); docker-compose stop
diff --git a/Examples/HelloWorld/docker-compose.yml b/Examples/HelloWorld/docker-compose.yml
@@ -0,0 +1,16 @@
+version: '3'
+services:
+  lambci:
+    image: "lambci/lambda:provided"
+    volumes:
+        - ../../.build/local:/var/task:ro,delegated
+        - ../../bootstrap:/opt/bootstrap:ro,delegated
+        - ../../swift-shared-libs:/opt/swift-shared-libs:ro,delegated
+    environment:
+      - DOCKER_LAMBDA_STAY_OPEN=1
+      - AWS_LAMBDA_FUNCTION_TIMEOUT=3
+      - LAMB_CI_EXEC=1
+    command:
+      - HelloWorld.helloWorld
+    ports:
+     - "9001:9001"
diff --git a/Examples/HelloWorld/outfile.json b/Examples/HelloWorld/outfile.json
@@ -0,0 +1 @@
+{"message":"Hello World! Hello Swift-Sprinter!"}
diff --git a/Examples/S3Test/Makefile b/Examples/S3Test/Makefile
@@ -0,0 +1,10 @@
+# Note: This must be launched from the root path
+SWIFT_PROJECT_PATH=Examples/S3Test
+
+start_docker_compose_env:
+	cd $(SWIFT_PROJECT_PATH); docker-compose up -d ; sleep 2
+	aws --endpoint http://localhost:4572 s3 mb s3://my-s3-bucket
+	aws --endpoint http://localhost:4572 s3 cp $(SWIFT_PROJECT_PATH)/hello.txt s3://my-s3-bucket/hello.txt
+
+stop_docker_compose_env:
+	cd $(SWIFT_PROJECT_PATH); docker-compose stop
diff --git a/Examples/S3Test/Sources/S3Test/main.swift b/Examples/S3Test/Sources/S3Test/main.swift
@@ -21,6 +21,7 @@ import Logging
 import S3
 import NIO
 import NIOFoundationCompat
+import AWSSDKSwiftCore
 
 struct Bucket: Codable {
     let name: String
@@ -31,10 +32,25 @@ struct Response: Codable {
     let value: String?
 }
 
-let s3 = S3(region: .useast1)
-
 let logger = Logger(label: "AWS.Lambda.S3Test")
 
+var s3: S3!
+
+if ProcessInfo.processInfo.environment["LAMB_CI_EXEC"] == "1" {
+    //Used for local test
+    s3 = S3(region: .useast1, endpoint: "http://localstack:4572")
+    logger.info("Endpoint-URI: http://localstack:4572")
+} else if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"],
+    //The S3 Bucket must be in the same region of the Lambda
+    let region = Region(rawValue: awsRegion) {
+    s3 = S3(region: region)
+    logger.info("AWS_REGION: \(region)")
+} else {
+    //Default configuration
+    s3 = S3(region: .useast1)
+    logger.info("AWS_REGION: us-east-1")
+}
+
 /**
  How to use the `SyncCodableNIOLambda<Bucket, Response>` lambda handler with S3.
 
diff --git a/Examples/S3Test/docker-compose.yml b/Examples/S3Test/docker-compose.yml
@@ -0,0 +1,24 @@
+version: '3'
+services:
+  lambci:
+    image: "lambci/lambda:provided"
+    volumes:
+        - ../../.build/local:/var/task:ro,delegated
+        - ../../bootstrap:/opt/bootstrap:ro,delegated
+        - ../../swift-shared-libs:/opt/swift-shared-libs:ro,delegated
+    environment:
+      - DOCKER_LAMBDA_STAY_OPEN=1
+      - AWS_LAMBDA_FUNCTION_TIMEOUT=3
+      - LAMB_CI_EXEC=1
+    command:
+      - S3Test.getObject
+    ports:
+     - "9001:9001"
+  localstack:
+    image: localstack/localstack
+    ports:
+     - "4567-4584:4567-4584"
+    environment:
+     - SERVICES=s3
+    volumes:
+     - ".tmp:/tmp/localstack"
diff --git a/Examples/S3Test/outfile.json b/Examples/S3Test/outfile.json
@@ -0,0 +1 @@
+{"value":"Hello World!"}
diff --git a/Makefile b/Makefile
@@ -42,6 +42,8 @@ LAYER_ZIP=swift-lambda-runtime-$(LAYER_VERSION).zip
 ROOT_BUILD_PATH=./.build
 LAYER_BUILD_PATH=$(ROOT_BUILD_PATH)/layer
 LAMBDA_BUILD_PATH=$(ROOT_BUILD_PATH)/lambda
+LOCAL_LAMBDA_PATH=$(ROOT_BUILD_PATH)/local
+LOCALSTACK_TMP=$(ROOT_BUILD_PATH)/.tmp
 TMP_BUILD_PATH=$(ROOT_BUILD_PATH)/tmp
 DATETIME=$(shell date +'%y%m%d-%H%M%S')
 
@@ -207,3 +209,38 @@ quick_build_lambda: build_lambda create_build_directory
 
 quick_deploy_lambda: quick_build_lambda create_build_directory
 	aws lambda update-function-code --function-name $(LAMBDA_FUNCTION_NAME) --zip-file fileb://$(LAMBDA_BUILD_PATH)/$(LAMBDA_ZIP) --profile $(AWS_PROFILE)
+
+build_lambda_local: build_lambda
+	if [ ! -d "$(LOCAL_LAMBDA_PATH)" ]; then mkdir -p $(LOCAL_LAMBDA_PATH); fi
+	cp $(SWIFT_PROJECT_PATH)/.build/$(SWIFT_CONFIGURATION)/$(SWIFT_EXECUTABLE) $(LOCAL_LAMBDA_PATH)/.
+
+invoke_lambda_local_once:
+	$(eval LOCAL_LAMBDA_EVENT := '$(shell cat $(SWIFT_PROJECT_PATH)/event.json)')
+	docker run --rm \
+	-v "$(PWD)/$(LOCAL_LAMBDA_PATH)":/var/task:ro,delegated \
+	-v "$(PWD)/bootstrap":/opt/bootstrap:ro,delegated \
+	-v "$(PWD)/$(SHARED_LIBS_FOLDER)":/opt/swift-shared-libs:ro,delegated \
+	lambci/lambda:provided $(LAMBDA_HANDLER) $(LOCAL_LAMBDA_EVENT)
+
+start_lambda_local_env:
+	docker run --rm \
+	-e DOCKER_LAMBDA_STAY_OPEN=1 \
+	-p 9001:9001 \
+	-v "$(PWD)/$(LOCAL_LAMBDA_PATH)":/var/task:ro,delegated \
+	-v "$(PWD)/bootstrap":/opt/bootstrap:ro,delegated \
+	-v "$(PWD)/$(SHARED_LIBS_FOLDER)":/opt/swift-shared-libs:ro,delegated \
+  	lambci/lambda:provided \
+	$(LAMBDA_HANDLER)
+
+invoke_lambda_local:
+	aws lambda invoke --endpoint http://localhost:9001 --no-sign-request --function-name $(LAMBDA_FUNCTION_NAME) --payload "fileb://$(SWIFT_PROJECT_PATH)/event.json" $(TMP_BUILD_PATH)/outfile && echo "\nResult:" && cat $(TMP_BUILD_PATH)/outfile && echo "\n"
+
+start_docker_compose_env:
+	if [ ! -d "$(LOCALSTACK_TMP)" ]; then mkdir -p $(LOCALSTACK_TMP); fi
+	make -f $(SWIFT_PROJECT_PATH)/Makefile start_docker_compose_env
+
+stop_docker_compose_env:
+	make -f $(SWIFT_PROJECT_PATH)/Makefile stop_docker_compose_env
+
+test_lambda_local_output:
+	cmp $(TMP_BUILD_PATH)/outfile $(SWIFT_PROJECT_PATH)/outfile.json
diff --git a/README.md b/README.md
diff --git a/scripts/aws_travis_credentials.sh b/scripts/aws_travis_credentials.sh

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ struct Event: Codable {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`struct Response: Codable {`
`31`		`- let url: String`
`32`	`31`	`let content: String`
`33`	`32`	`}`
`34`	`33`
`@@ -59,7 +58,7 @@ let syncCodableNIOLambda: SyncCodableNIOLambda<Event, Response> = { (event, cont`
`59`	`58`	`}`
`60`	`59`	`return value`
`61`	`60`	`}.map { content -> Response in`
`62`		`- return Response(url: event.url, content: content)`
	`61`	`+ return Response(content: content)`
`63`	`62`	`}`
`64`	`63`	`return future`
`65`	`64`	`}`
`@@ -92,8 +91,7 @@ let syncDictionaryNIOLambda: SyncDictionaryNIOLambda = { (event, context) throws`
`92`	`91`	`}`
`93`	`92`	`return value`
`94`	`93`	`}.map { content -> [String: Any] in`
`95`		`- return ["url": url,`
`96`		`- "content": content]`
	`94`	`+ return ["content": content]`
`97`	`95`	`}`
`98`	`96`	`return future`
`99`	`97`	`}`
`@@ -126,8 +124,7 @@ let asynchDictionayNIOLambda: AsyncDictionaryNIOLambda = { (event, context, comp`
`126`	`124`	`}`
`127`	`125`	`return value`
`128`	`126`	`}.map { content -> [String: Any] in`
`129`		`- return ["url": url,`
`130`		`- "content": content]`
	`127`	`+ return ["content": content]`
`131`	`128`	`}`
`132`	`129`	`.wait()`
`133`	`130`	`completion(.success(dictionary))`
`@@ -160,7 +157,7 @@ let asyncCodableNIOLambda: AsyncCodableNIOLambda<Event, Response> = { (event, co`
`160`	`157`	`}`
`161`	`158`	`return value`
`162`	`159`	`}.map { content -> Response in`
`163`		`- return Response(url: event.url, content: content)`
	`160`	`+ return Response(content: content)`
`164`	`161`	`}`
`165`	`162`	`.wait()`
`166`	`163`	`completion(.success(reponse))`
`@@ -198,7 +195,7 @@ let lambda: SyncCodableLambda<Event, Response> = { (input, context) throws -> Re`
`198`	`195`	`}`
`199`	`196`	`let content = String(data: data, encoding: .utf8) ?? ""`
`200`	`197`
`201`		`- return Response(url: input.url, content: content)`
	`198`	`+ return Response(content: content)`
`202`	`199`	`}`
`203`	`200`
`204`	`201`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "url": "https://swift.org"`
	`2`	`+ "url": "https://www.example.com"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+{"content":"<!doctype html>\n<html>\n<head>\n <title>Example Domain<\/title>\n\n <meta charset=\"utf-8\" \/>\n <meta http-equiv=\"Content-type\" content=\"text\/html; charset=utf-8\" \/>\n <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" \/>\n <style type=\"text\/css\">\n body {\n background-color: #f0f0f2;\n margin: 0;\n padding: 0;\n font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n \n }\n div {\n width: 600px;\n margin: 5em auto;\n padding: 2em;\n background-color: #fdfdff;\n border-radius: 0.5em;\n box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02);\n }\n a:link, a:visited {\n color: #38488f;\n text-decoration: none;\n }\n @media (max-width: 700px) {\n div {\n margin: 0 auto;\n width: auto;\n }\n }\n <\/style> \n<\/head>\n\n<body>\n<div>\n <h1>Example Domain<\/h1>\n <p>This domain is for use in illustrative examples in documents. You may use this\n domain in literature without prior coordination or asking for permission.<\/p>\n <p><a href=\"https:\/\/www.iana.org\/domains\/example\">More information...<\/a><\/p>\n<\/div>\n<\/body>\n<\/html>\n"}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{"message":"Hello World! Hello Swift-Sprinter!"}`