add docker support (#15)

motivation: enable CI

changes: add docker files support for ubuntu 16.04 and 18.04 and swift 5.0 and 5.1

note that eventyally this will need to move to AL2 docker images, but we dont have official ones yet

Author: tomerd

Sources/SwiftAwsLambda/HttpClient.swift

@@ -46,7 +46,6 @@ internal class HTTPClient {
                                     timeout: timeout ?? self.configuration.requestTimeout))
     }
 
-
     private func execute(_ request: Request) -> EventLoopFuture<Response> {
         self.lock.lock()
         switch self.state {
@@ -85,15 +84,15 @@ internal class HTTPClient {
                                                   UnaryHandler(keepAlive: self.configuration.keepAlive)])
                 }
             }
-        
+
         do {
             // connect directly via socket address to avoid happy eyeballs (perf)
             let address = try SocketAddress(ipAddress: self.configuration.ip, port: self.configuration.port)
             return bootstrap.connect(to: address).flatMapThrowing { channel in
                 self.state = .connected(channel)
             }
         } catch {
-            return eventLoop.makeFailedFuture(error)
+            return self.eventLoop.makeFailedFuture(error)
         }
     }
 

Sources/SwiftAwsLambda/Lambda.swift

@@ -19,10 +19,10 @@ import Darwin.C
 #endif
 
 import Backtrace
+import Dispatch
 import Logging
 import NIO
 import NIOConcurrencyHelpers
-import Dispatch
 
 public enum Lambda {
     /// Run a Lambda defined by implementing the `LambdaClosure` closure.
@@ -203,7 +203,7 @@ public enum Lambda {
 
             init(id: String? = nil, maxTimes: Int? = nil, stopSignal: Signal? = nil) {
                 self.id = id ?? "\(DispatchTime.now().uptimeNanoseconds)"
-                self.maxTimes = maxTimes ?? env("MAX_REQUESTS").flatMap(Int.init) ?? 0                
+                self.maxTimes = maxTimes ?? env("MAX_REQUESTS").flatMap(Int.init) ?? 0
                 self.stopSignal = stopSignal ?? env("STOP_SIGNAL").flatMap(Int32.init).flatMap(Signal.init) ?? Signal.TERM
                 precondition(self.maxTimes >= 0, "maxTimes must be equal or larger than 0")
             }

docker/Dockerfile

@@ -0,0 +1,35 @@
+ARG swift_version=5.0
+ARG ubuntu_version=bionic
+FROM swift:$swift_version-$ubuntu_version
+# needed to do again after FROM due to docker limitation
+ARG swift_version
+ARG ubuntu_version
+
+# set as UTF-8
+RUN apt-get update && apt-get install -y locales locales-all
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# dependencies
+RUN apt-get update && apt-get install -y wget
+RUN apt-get update && apt-get install -y lsof dnsutils netcat-openbsd net-tools curl jq # used by integration tests
+
+# ruby and jazzy for docs generation
+RUN apt-get update && apt-get install -y ruby ruby-dev libsqlite3-dev
+RUN gem install jazzy --no-ri --no-rdoc
+
+# tools
+RUN mkdir -p $HOME/.tools
+RUN echo 'export PATH="$HOME/.tools:$PATH"' >> $HOME/.profile
+
+# script to allow mapping framepointers on linux (until part of the toolchain)
+RUN wget -q https://raw.githubusercontent.com/apple/swift/master/utils/symbolicate-linux-fatal -O $HOME/.tools/symbolicate-linux-fatal
+RUN chmod 755 $HOME/.tools/symbolicate-linux-fatal
+
+# swiftformat (until part of the toolchain)
+
+ARG swiftformat_version=0.40.12
+RUN git clone --branch $swiftformat_version --depth 1 https://github.com/nicklockwood/SwiftFormat $HOME/.tools/swift-format
+RUN cd $HOME/.tools/swift-format && swift build -c release
+RUN ln -s $HOME/.tools/swift-format/.build/release/swiftformat $HOME/.tools/swiftformat

docker/docker-compose.1604.51.yaml

@@ -0,0 +1,16 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:16.04-5.1
+    build:
+      args:
+        ubuntu_version: "xenial"
+        swift_version: "5.1"
+
+  test:
+    image: swift-aws-lambda:16.04-5.1
+
+  shell:
+    image: swift-aws-lambda:16.04-5.1

docker/docker-compose.1804.50.yaml

@@ -0,0 +1,16 @@
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:18.04-5.0
+    build:
+      args:
+        ubuntu_version: "bionic"
+        swift_version: "5.0"
+
+  test:
+    image: swift-aws-lambda:18.04-5.0
+
+  shell:
+    image: swift-aws-lambda:18.04-5.0

docker/docker-compose.yaml

@@ -0,0 +1,37 @@
+# this file is not designed to be run directly
+# instead, use the docker-compose.<os>.<swift> files
+# eg docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.1804.50.yaml run test
+version: "3"
+
+services:
+
+  runtime-setup:
+    image: swift-aws-lambda:default
+    build:
+      context: .
+      dockerfile: Dockerfile
+
+  common: &common
+    image: swift-aws-lambda:default
+    depends_on: [runtime-setup]
+    volumes:
+      - ~/.ssh:/root/.ssh
+      - ..:/code:z
+    working_dir: /code
+    cap_drop:
+      - CAP_NET_RAW
+      - CAP_NET_BIND_SERVICE
+
+  sanity:
+    <<: *common
+    command: /bin/bash -cl "./scripts/sanity.sh"
+
+  test:
+    <<: *common
+    command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"
+
+  # util
+
+  shell:
+    <<: *common
+    entrypoint: /bin/bash

scripts/generate_linux_tests.rb

@@ -96,10 +96,10 @@ def createLinuxMain(testsDirectory, allTestSubDirectories, files)
 
     file.write "#if os(Linux) || os(FreeBSD)\n"
     for testSubDirectory in allTestSubDirectories.sort { |x, y| x <=> y }
-      file.write '    @testable import ' + testSubDirectory + "\n"
+      file.write '@testable import ' + testSubDirectory + "\n"
     end
     file.write "\n"
-    file.write "    XCTMain([\n"
+    file.write "XCTMain([\n"
 
     testCases = []
     for classes in files
@@ -109,9 +109,9 @@ def createLinuxMain(testsDirectory, allTestSubDirectories, files)
     end
 
     for testCase in testCases.sort { |x, y| x <=> y }
-      file.write '        testCase(' + testCase + ".allTests),\n"
+      file.write '    testCase(' + testCase + ".allTests),\n"
     end
-    file.write "    ])\n"
+    file.write "])\n"
     file.write "#endif\n"
   end
 end

scripts/linux_performance_setup.sh

@@ -1,4 +1,17 @@
 #!/bin/bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftAwsLambda open source project
+##
+## Copyright (c) 2020 Apple Inc. and the SwiftAwsLambda project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftAwsLambda project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
 
 # docker run --cap-add SYS_ADMIN -it -v `pwd`:/code -w /code swift:5.1 bash
 

scripts/sanity.sh

@@ -19,7 +19,7 @@ here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 function replace_acceptable_years() {
     # this needs to replace all acceptable forms with 'YEARS'
-    sed -e 's/2017-2018/YEARS/' -e 's/2017-2019/YEARS/' -e 's/2019/YEARS/'
+    sed -e 's/2017-2018/YEARS/' -e 's/2017-2019/YEARS/' -e 's/2019/YEARS/' -e 's/2020/YEARS/'
 }
 
 printf "=> Checking linux tests... "