moved makefile. ci builds all examples. (#24)

examples folder name is now lowercase.

Author: fabianfett

.github/workflows/ci.yaml

@@ -8,8 +8,15 @@ on:
     - master
 
 jobs:
-  "Integration-Tests":
+  "Build-Examples":
     runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        example: 
+        - EventSources
+        - SquareNumber
+        - TodoAPIGateway
+        - URLRequestWithSession
     env:
       SWIFT_VERSION: 5.1.3
     steps:
@@ -19,20 +26,27 @@ jobs:
         fetch-depth: 1
     - name: Install ruby
       uses: actions/setup-ruby@v1
-    - name: Install aws-sam-cli
-      run: sudo pip install aws-sam-cli
     - name: Build Docker Swift Dev Image
       run: docker build --build-arg SWIFT_VERSION=${SWIFT_VERSION} -t fabianfett/amazonlinux-swift:${SWIFT_VERSION}-amazonlinux2-dev ./docker
-    - name: Download local layer
-      run: | 
-        mkdir -p Layer
-        curl -o Layer/swift-${SWIFT_VERSION}-RELEASE.zip https://amazonlinux-swift.s3.eu-central-1.amazonaws.com/layers/swift-${SWIFT_VERSION}-RELEASE.zip
-        unzip Layer/swift-${SWIFT_VERSION}-RELEASE.zip -d Layer/swift-lambda-layer
-    - name: test local lambda
-      run: make test_lambda
-      env:
-        EXAMPLE_LAMBDA: SquareNumber
-      
+    - name: Build example
+      run: |
+        cd examples/${{ matrix.example }}
+        make package_lambda
+    - name: Install sam cli
+      if: matrix.example == 'SquareNumber'
+      run: sudo pip install aws-sam-cli
+    - name: Download layer
+      if: matrix.example == 'SquareNumber'
+      run: |
+        cd examples/${{ matrix.example }}
+        make download_layer
+    - name: Run example
+      if: matrix.example == 'SquareNumber'
+      run: |
+        cd examples/${{ matrix.example }}
+        echo '{"number": 9 }' | sam local invoke -v . "SquareNumberFunction"
+        echo '{"number": 3 }' | sam local invoke -v . "PrintNumberFunction"
+        
   "tuxOS-Tests":
     runs-on: ubuntu-latest
     strategy:

.gitignore

@@ -2,7 +2,7 @@
 .build
 /*.xcodeproj
 xcuserdata
-Layer
-Examples/**/lambda.zip
 packaged.yaml
-bootstrap
+examples/**/bootstrap
+examples/**/lambda.zip
+examples/**/swift-lambda-layer

Examples/SquareNumber/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,25 @@
+# Example settings
+LAMBDA_NAME=EventSources
+EXECUTABLE=$(LAMBDA_NAME)
+LAMBDA_ZIP=lambda.zip
+
+SWIFT_VERSION=5.1.3
+SWIFT_DOCKER_IMAGE=fabianfett/amazonlinux-swift:${SWIFT_VERSION}-amazonlinux2-dev
+
+clean_lambda:
+	rm bootstrap || true
+	rm lambda.zip || true
+
+build_lambda:
+	docker run \
+			--rm \
+			--volume "$(shell pwd)/../..:/src" \
+			--workdir "/src/examples/$(LAMBDA_NAME)/" \
+			$(SWIFT_DOCKER_IMAGE) \
+			swift build -c release
+
+package_lambda: build_lambda
+	cp .build/release/$(EXECUTABLE) ./bootstrap
+	zip -r -j $(LAMBDA_ZIP) ./bootstrap
+
+

Examples/TodoAPIGateway/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,28 @@
+# Example settings
+LAMBDA_NAME=SquareNumber
+EXECUTABLE=$(LAMBDA_NAME)
+LAMBDA_ZIP=lambda.zip
+
+SWIFT_VERSION=5.1.3
+SWIFT_DOCKER_IMAGE=fabianfett/amazonlinux-swift:${SWIFT_VERSION}-amazonlinux2-dev
+
+clean_lambda:
+	rm bootstrap || true
+	rm lambda.zip || true
+
+build_lambda:
+	docker run \
+			--rm \
+			--volume "$(shell pwd)/../..:/src" \
+			--workdir "/src/examples/$(LAMBDA_NAME)/" \
+			$(SWIFT_DOCKER_IMAGE) \
+			swift build -c release
+
+package_lambda: build_lambda
+	cp .build/release/$(EXECUTABLE) ./bootstrap
+	zip -r -j $(LAMBDA_ZIP) ./bootstrap
+
+download_layer:
+	curl -o swift-${SWIFT_VERSION}-RELEASE.zip https://amazonlinux-swift.s3.eu-central-1.amazonaws.com/layers/swift-${SWIFT_VERSION}-RELEASE.zip
+	unzip swift-${SWIFT_VERSION}-RELEASE.zip -d swift-lambda-layer
+	rm swift-${SWIFT_VERSION}-RELEASE.zip

Examples/EventSources/Package.resolved renamed to examples/EventSources/Package.resolved

@@ -15,12 +15,12 @@ Resources:
   SwiftLayer:
     Type: AWS::Serverless::LayerVersion
     Properties:
-      ContentUri: Layer/swift-lambda-layer/
+      ContentUri: swift-lambda-layer/
 
   SquareNumberFunction:
     Type: AWS::Serverless::Function
     Properties:
-      CodeUri: Examples/SquareNumber/lambda.zip
+      CodeUri: lambda.zip
       Handler: "squareNumber"
       Runtime: provided
       Layers:
@@ -29,7 +29,7 @@ Resources:
   PrintNumberFunction:
     Type: AWS::Serverless::Function
     Properties:
-      CodeUri: Examples/SquareNumber/lambda.zip
+      CodeUri: lambda.zip
       Handler: "printNumber"
       Runtime: provided
       Layers:

Examples/EventSources/Package.swift renamed to examples/EventSources/Package.swift

@@ -0,0 +1,25 @@
+# Example settings
+LAMBDA_NAME=TodoAPIGateway
+EXECUTABLE=$(LAMBDA_NAME)
+LAMBDA_ZIP=lambda.zip
+
+SWIFT_VERSION=5.1.3
+SWIFT_DOCKER_IMAGE=fabianfett/amazonlinux-swift:${SWIFT_VERSION}-amazonlinux2-dev
+
+clean_lambda:
+	rm bootstrap || true
+	rm lambda.zip || true
+
+build_lambda:
+	docker run \
+			--rm \
+			--volume "$(shell pwd)/../..:/src" \
+			--workdir "/src/examples/$(LAMBDA_NAME)/" \
+			$(SWIFT_DOCKER_IMAGE) \
+			swift build -c release
+
+package_lambda: build_lambda
+	cp .build/release/$(EXECUTABLE) ./bootstrap
+	zip -r -j $(LAMBDA_ZIP) ./bootstrap
+
+

Examples/EventSources/README.md renamed to examples/EventSources/README.md

@@ -0,0 +1,23 @@
+# Example settings
+LAMBDA_NAME=URLRequestWithSession
+EXECUTABLE=$(LAMBDA_NAME)
+LAMBDA_ZIP=lambda.zip
+
+SWIFT_VERSION=5.1.3
+SWIFT_DOCKER_IMAGE=fabianfett/amazonlinux-swift:${SWIFT_VERSION}-amazonlinux2-dev
+
+clean_lambda:
+	rm bootstrap || true
+	rm lambda.zip || true
+
+build_lambda:
+	docker run \
+			--rm \
+			--volume "$(shell pwd)/../..:/src" \
+			--workdir "/src/examples/$(LAMBDA_NAME)/" \
+			$(SWIFT_DOCKER_IMAGE) \
+			swift build -c release
+
+package_lambda: build_lambda
+	cp .build/release/$(EXECUTABLE) ./bootstrap
+	zip -r -j $(LAMBDA_ZIP) ./bootstrap

Examples/EventSources/Sources/EventSources/main.swift renamed to examples/EventSources/Sources/EventSources/main.swift

@@ -15,7 +15,7 @@ Resources:
   EchoCallFunction:
     Type: AWS::Serverless::Function
     Properties:
-      CodeUri: Examples/URLRequestWithSession/lambda.zip
+      CodeUri: lambda.zip
       Handler: "echoCall"
       Runtime: provided
       Layers: