Refactor Examples folder and scripts

Andrea-Scuderi · Andrea-Scuderi · commit 5f1fb8a3e99a · 2020-06-12T08:53:15.000+02:00
- Move scripts to Examples
- Add a common config.sh script
- Move SAM templates to Examples/scripts/SAM
- Move Serverless templates to Examples/scripts/serverless
- Update the scripts to work with new folder structure and config.sh
- Move Dockerfile to Examples
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@
 .swift-version
 xcuserdata
 Package.resolved
+.serverless
diff --git a/Examples/Dockerfile b/Examples/Dockerfile
diff --git a/Examples/LambdaFunctions/.gitignore b/Examples/LambdaFunctions/.gitignore
diff --git a/Examples/LambdaFunctions/README.md b/Examples/LambdaFunctions/README.md
@@ -4,6 +4,13 @@ This sample project is a collection of Lambda functions that demonstrates
 how to write a simple Lambda function in Swift, and how to package and deploy it
 to the AWS Lambda platform.
 
+The scripts are prepared to work from the `Examples` folder.
+
+```
+git clone https://github.com/swift-server/swift-aws-lambda-runtime.git
+cd swift-aws-lambda-runtime/Examples
+```
+
 Note: The example scripts assume you have [jq](https://stedolan.github.io/jq/download/) command line tool installed.
 
 ## Deployment instructions using AWS CLI
diff --git a/Examples/scripts/SAM/APIGateway-template.yml b/Examples/scripts/SAM/APIGateway-template.yml
@@ -9,7 +9,7 @@ Resources:
     Properties:
       Handler: Provided
       Runtime: provided
-      CodeUri: .build/lambda/APIGateway/lambda.zip
+      CodeUri: LambdaFunctions/.build/lambda/APIGateway/lambda.zip
 # Add an API Gateway event source for the Lambda
       Events:
         HttpGet:
diff --git a/Examples/scripts/SAM/Benchmark-template.yml b/Examples/scripts/SAM/Benchmark-template.yml
@@ -9,6 +9,6 @@ Resources:
     Properties:
       Handler: Provided
       Runtime: provided
-      CodeUri: .build/lambda/Benchmark/lambda.zip
+      CodeUri: LambdaFunctions/.build/lambda/Benchmark/lambda.zip
 # Instructs new versions to be published to an alias named "live".
       AutoPublishAlias: live
diff --git a/Examples/scripts/SAM/CurrencyExchange-template.yml b/Examples/scripts/SAM/CurrencyExchange-template.yml
@@ -9,7 +9,7 @@ Resources:
     Properties:
       Handler: Provided
       Runtime: provided
-      CodeUri: .build/lambda/CurrencyExchange/lambda.zip
+      CodeUri: LambdaFunctions/.build/lambda/CurrencyExchange/lambda.zip
       Timeout: 300
 # Instructs new versions to be published to an alias named "live".
       AutoPublishAlias: live
diff --git a/Examples/scripts/SAM/ErrorHandling-template.yml b/Examples/scripts/SAM/ErrorHandling-template.yml
@@ -9,6 +9,6 @@ Resources:
     Properties:
       Handler: Provided
       Runtime: provided
-      CodeUri: .build/lambda/ErrorHandling/lambda.zip
+      CodeUri: LambdaFunctions/.build/lambda/ErrorHandling/lambda.zip
 # Instructs new versions to be published to an alias named "live".      
       AutoPublishAlias: live
diff --git a/Examples/scripts/SAM/HelloWorld-template.yml b/Examples/scripts/SAM/HelloWorld-template.yml
@@ -9,6 +9,6 @@ Resources:
     Properties:
       Handler: Provided
       Runtime: provided
-      CodeUri: .build/lambda/HelloWorld/lambda.zip
+      CodeUri: LambdaFunctions/.build/lambda/HelloWorld/lambda.zip
 # Instructs new versions to be published to an alias named "live".
       AutoPublishAlias: live
diff --git a/Examples/scripts/build-and-package.sh b/Examples/scripts/build-and-package.sh
@@ -16,14 +16,16 @@
 set -eu
 
 executable=$1
+workspace="$(pwd)/.."
+sources=$2
 
 echo "-------------------------------------------------------------------------"
 echo "building \"$executable\" lambda"
 echo "-------------------------------------------------------------------------"
-docker run --rm -v "$(pwd)/../..":/workspace -w /workspace/Examples/LambdaFunctions builder bash -cl "swift build --product $executable -c release -Xswiftc -g"
+docker run --rm -v "$workspace":/workspace -w /workspace/Examples/$sources builder bash -cl "swift build --product $executable -c release -Xswiftc -g"
 echo "done"
 
 echo "-------------------------------------------------------------------------"
 echo "packaging \"$executable\" lambda"
 echo "-------------------------------------------------------------------------"
-docker run --rm -v "$(pwd)/../..":/workspace -w /workspace/Examples/LambdaFunctions builder bash -cl "./scripts/package.sh $executable"
+docker run --rm -v "$workspace":/workspace -w /workspace/Examples builder bash -cl "./scripts/package.sh $executable $sources"
diff --git a/Examples/scripts/config.sh b/Examples/scripts/config.sh
@@ -15,7 +15,11 @@
 
 DIR="$(cd "$(dirname "$0")" && pwd)"
 
+sources="LambdaFunctions"
+
+cd $sources
 executables=( $(swift package dump-package | sed -e 's|: null|: ""|g' | jq '.products[] | (select(.type.executable)) | .name' | sed -e 's|"||g') )
+cd ..
 
 if [[ ${#executables[@]} = 0 ]]; then
     echo "no executables found"
@@ -31,10 +35,10 @@ elif [[ ${#executables[@]} > 1 ]]; then
     read -p "select which executables to deploy: " executable
 fi
 
-echo -e "\nremoving $executable"
-
 echo "-------------------------------------------------------------------------"
-echo "removing using Serverless"
+echo "CONFIG"
 echo "-------------------------------------------------------------------------"
-
-serverless remove --config "serverless/${executable}-template.yml" --stage dev -v
+echo "DIR: $DIR"
+echo "sources: $sources"
+echo "executable: $executable"
+echo "-------------------------------------------------------------------------"
diff --git a/Examples/scripts/deploy.sh b/Examples/scripts/deploy.sh
@@ -21,21 +21,12 @@ lambda_name=SwiftSample
 # S3 bucket name to upload zip file (must exist in AWS S3)
 s3_bucket=swift-lambda-test
 
-executables=( $(swift package dump-package | sed -e 's|: null|: ""|g' | jq '.products[] | (select(.type.executable)) | .name' | sed -e 's|"||g') )
+workspace="$(pwd)/.."
 
-if [[ ${#executables[@]} = 0 ]]; then
-    echo "no executables found"
-    exit 1
-elif [[ ${#executables[@]} = 1 ]]; then
-    executable=${executables[0]}
-elif [[ ${#executables[@]} > 1 ]]; then
-    echo "multiple executables found:"
-    for executable in ${executables[@]}; do
-      echo "  * $executable"
-    done
-    echo ""
-    read -p "select which executables to deploy: " executable
-fi
+sources="LambdaFunctions"
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+source $DIR/config.sh
 
 echo -e "\ndeploying $executable"
 
@@ -47,21 +38,21 @@ docker build . -t builder
 echo "-------------------------------------------------------------------------"
 echo "building \"$executable\" lambda"
 echo "-------------------------------------------------------------------------"
-docker run --rm -v `pwd`/../..:/workspace -w /workspace builder \
+docker run --rm -v $workspace:/workspace -w /workspace builder \
        bash -cl "cd Examples/LambdaFunctions && \
                  swift build --product $executable -c release -Xswiftc -g"
 echo "done"
 
 echo "-------------------------------------------------------------------------"
 echo "packaging \"$executable\" lambda"
 echo "-------------------------------------------------------------------------"
-docker run --rm -v `pwd`:/workspace -w /workspace builder bash -cl "./scripts/package.sh $executable"
+docker run --rm -v "$workspace/Examples":/workspace -w /workspace builder bash -cl "./scripts/package.sh $executable $sources"
 
 echo "-------------------------------------------------------------------------"
 echo "uploading \"$executable\" lambda to s3"
 echo "-------------------------------------------------------------------------"
 
-aws s3 cp .build/lambda/$executable/lambda.zip s3://$s3_bucket/
+aws s3 cp $sources/.build/lambda/$executable/lambda.zip s3://$s3_bucket/
 
 echo "-------------------------------------------------------------------------"
 echo "updating \"$lambda_name\" to latest \"$executable\""
diff --git a/Examples/scripts/package.sh b/Examples/scripts/package.sh
@@ -16,11 +16,12 @@
 set -eu
 
 executable=$1
+sources=$2
 
-target=.build/lambda/$executable
+target=$sources/.build/lambda/$executable
 rm -rf "$target"
 mkdir -p "$target"
-cp ".build/release/$executable" "$target/"
+cp "$sources/.build/release/$executable" "$target/"
 cp -Pv /usr/lib/swift/linux/lib*so* "$target"
 cd "$target"
 ln -s "$executable" "bootstrap"
diff --git a/Examples/scripts/sam-deploy.sh b/Examples/scripts/sam-deploy.sh
@@ -14,22 +14,7 @@
 ##===----------------------------------------------------------------------===##
 
 DIR="$(cd "$(dirname "$0")" && pwd)"
-
-executables=( $(swift package dump-package | sed -e 's|: null|: ""|g' | jq '.products[] | (select(.type.executable)) | .name' | sed -e 's|"||g') )
-
-if [[ ${#executables[@]} = 0 ]]; then
-    echo "no executables found"
-    exit 1
-elif [[ ${#executables[@]} = 1 ]]; then
-    executable=${executables[0]}
-elif [[ ${#executables[@]} > 1 ]]; then
-    echo "multiple executables found:"
-    for executable in ${executables[@]}; do
-      echo "  * $executable"
-    done
-    echo ""
-    read -p "select which executables to deploy: " executable
-fi
+source $DIR/config.sh
 
 echo -e "\ndeploying $executable"
 
@@ -38,10 +23,10 @@ echo "preparing docker build image"
 echo "-------------------------------------------------------------------------"
 docker build . -q -t builder
 
-$DIR/build-and-package.sh ${executable}
+$DIR/build-and-package.sh ${executable} ${sources}
 
 echo "-------------------------------------------------------------------------"
 echo "deploying using SAM"
 echo "-------------------------------------------------------------------------"
 
-sam deploy --template "${executable}-template.yml" $@
+sam deploy --template "./scripts/SAM/${executable}-template.yml" $@
diff --git a/Examples/scripts/serverless-deploy.sh b/Examples/scripts/serverless-deploy.sh
@@ -14,22 +14,7 @@
 ##===----------------------------------------------------------------------===##
 
 DIR="$(cd "$(dirname "$0")" && pwd)"
-
-executables=( $(swift package dump-package | sed -e 's|: null|: ""|g' | jq '.products[] | (select(.type.executable)) | .name' | sed -e 's|"||g') )
-
-if [[ ${#executables[@]} = 0 ]]; then
-    echo "no executables found"
-    exit 1
-elif [[ ${#executables[@]} = 1 ]]; then
-    executable=${executables[0]}
-elif [[ ${#executables[@]} > 1 ]]; then
-    echo "multiple executables found:"
-    for executable in ${executables[@]}; do
-      echo "  * $executable"
-    done
-    echo ""
-    read -p "select which executables to deploy: " executable
-fi
+source $DIR/config.sh
 
 echo -e "\ndeploying $executable"
 
@@ -38,10 +23,10 @@ echo "preparing docker build image"
 echo "-------------------------------------------------------------------------"
 docker build . -q -t builder
 
-$DIR/build-and-package.sh ${executable}
+$DIR/build-and-package.sh ${executable} ${sources}
 
 echo "-------------------------------------------------------------------------"
 echo "deploying using Serverless"
 echo "-------------------------------------------------------------------------"
 
-serverless deploy --config "serverless/${executable}-template.yml" --stage dev -v
+serverless deploy --config "./scripts/serverless/${executable}-template.yml" --stage dev -v
diff --git a/Examples/scripts/serverless-remove.sh b/Examples/scripts/serverless-remove.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftAWSLambdaRuntime open source project
+##
+## Copyright (c) 2017-2018 Apple Inc. and the SwiftAWSLambdaRuntime project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftAWSLambdaRuntime project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+DIR="$(cd "$(dirname "$0")" && pwd)"
+source $DIR/config.sh
+
+echo -e "\nremoving $executable"
+
+echo "-------------------------------------------------------------------------"
+echo "removing using Serverless"
+echo "-------------------------------------------------------------------------"
+
+serverless remove --config "./scripts/serverless/${executable}-template.yml" --stage dev -v
diff --git a/Examples/scripts/serverless/APIGateway-template.yml b/Examples/scripts/serverless/APIGateway-template.yml
@@ -1,7 +1,7 @@
 service: apigateway-swift-aws
 
 package:
-    artifact: .build/lambda/APIGateway/lambda.zip
+    artifact: LambdaFunctions/.build/lambda/APIGateway/lambda.zip
 
 provider:
     name: aws
diff --git a/Examples/scripts/serverless/Benchmark-template.yml b/Examples/scripts/serverless/Benchmark-template.yml
@@ -1,7 +1,7 @@
 service: benchmark-swift-aws
 
 package:
-    artifact: .build/lambda/Benchmark/lambda.zip
+    artifact: LambdaFunctions/.build/lambda/Benchmark/lambda.zip
 
 provider:
     name: aws
diff --git a/Examples/scripts/serverless/CurrencyExchange-template.yml b/Examples/scripts/serverless/CurrencyExchange-template.yml
@@ -1,7 +1,7 @@
 service: currency-swift-aws
 
 package:
-    artifact: .build/lambda/CurrencyExchange/lambda.zip
+    artifact: LambdaFunctions/.build/lambda/CurrencyExchange/lambda.zip
 
 provider:
     name: aws
diff --git a/Examples/scripts/serverless/ErrorHandling-template.yml b/Examples/scripts/serverless/ErrorHandling-template.yml
@@ -1,7 +1,7 @@
 service: errorhandling-swift-aws
 
 package:
-    artifact: .build/lambda/ErrorHandling/lambda.zip
+    artifact: LambdaFunctions/.build/lambda/ErrorHandling/lambda.zip
 
 provider:
     name: aws
diff --git a/Examples/scripts/serverless/HelloWorld-template.yml b/Examples/scripts/serverless/HelloWorld-template.yml
@@ -1,7 +1,7 @@
 service: helloworld-swift-aws
 
 package:
-    artifact: .build/lambda/HelloWorld/lambda.zip
+    artifact: LambdaFunctions/.build/lambda/HelloWorld/lambda.zip
 
 provider:
     name: aws
