Merge pull request #3 from Andrea-Scuderi/feature/travis_ci

Feature/travis ci

Author: Andrea-Scuderi

.devcontainer/Dockerfile

@@ -0,0 +1,27 @@
+FROM swift:5.1.1
+
+# Or your actual UID, GID on Linux if not the default 1000
+ARG USERNAME=vscode
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+
+# Avoid warnings by switching to noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Configure apt and install packages
+RUN apt-get update \
+    # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
+    && groupadd --gid $USER_GID $USERNAME \
+    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
+    # [Optional] Add sudo support for non-root user
+    && apt-get install -y sudo \
+    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    #
+    # Clean up
+    && apt-get autoremove -y \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
+
+# Switch back to dialog for any ad-hoc use of apt-get
+ENV DEBIAN_FRONTEND=

.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+{
+    "name": "Swift",
+    "dockerFile": "Dockerfile",
+
+    "runArgs": [
+        "-u", "vscode",
+        "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
+    ],
+
+    "settings": {
+		"lldb.adapterType": "bundled",
+		"lldb.executable": "/usr/bin/lldb",
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+    // Uncomment the next line if you want to publish any ports.
+	// "appPort": [],
+
+    "extensions": [
+		"pvasek.sourcekit-lsp--dev-unofficial",
+		"vadimcn.vscode-lldb"
+	]
+}

.gitignore

@@ -2,3 +2,4 @@
 /.build
 /Packages
 /*.xcodeproj
+default.profraw

.travis.yml

@@ -0,0 +1,25 @@
+os:
+  - linux
+language: generic
+sudo: required
+dist: xenial
+
+services:
+  - docker
+
+addons:
+    snaps:
+      - name: aws-cli
+        confinement: classic # or devmode
+        channel: latest/edge
+
+install:
+  - make --version
+  - make docker_build
+
+script:
+  - docker image ls
+  - make swift_test_with_coverage
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash) -f .build/x86_64-unknown-linux/debug/codecov/lcov.info

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug",
+            "program": "${workspaceFolder}/.build/x86_64-unknown-linux/debug/LambdaSwiftSprinterNioPluginPackageTests.xctest",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": "build"
+        },
+
+        {
+            "type": "lldb",
+            "request": "launch",
+            "program": "${workspaceFolder}/.build/x86_64-unknown-linux/debug/LambdaSwiftSprinterNioPluginPackageTests.xctest",
+            "name": "Test",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "preLaunchTask": "test"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,27 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "type": "shell",
+            "command": "swift test",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "test",
+            "type": "shell",
+            "command": "swift test --enable-code-coverage || true",
+            "group": "test"
+        },
+        {
+            "label": "run",
+            "type": "shell",
+            "command": "swift run"
+        }
+    ]
+}

Makefile

@@ -1,11 +1,15 @@
-SWIFT_DOCKER_IMAGE=swift:latest
-SWIFT_PACKAGE=aws-lambda-swift-sprinter-nio-plugin
-MOUNT_ROOT="$(shell pwd)/.."
+SWIFT_VERSION?=5.1.1
 
-swift_test:
+DOCKER_TAG=nio-swift:$(SWIFT_VERSION)
+SWIFT_DOCKER_IMAGE=$(DOCKER_TAG)
+
+docker_build:
+	docker build --tag $(DOCKER_TAG) docker/$(SWIFT_VERSION)/.
+
+swift_test_with_coverage:
 	docker run \
 			--rm \
-			--volume "$(MOUNT_ROOT):/src" \
-			--workdir "/src" \
+			--volume "$(shell pwd)/:/src" \
+			--workdir "/src/" \
 			$(SWIFT_DOCKER_IMAGE) \
-			/bin/bash -c "cd $(SWIFT_PACKAGE); swift test"
+			/bin/bash -c "swift test --enable-code-coverage && ./export-coverage-test.sh"

README.md

@@ -1,7 +1,7 @@
 # aws-lambda-swift-sprinter-nio-plugin
 
 
-[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1](https://img.shields.io/badge/Swift-5.1-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0--alpha.2-red)
+[![Swift 5](https://img.shields.io/badge/Swift-5.0-blue.svg)](https://swift.org/download/) [![Swift 5.1.1](https://img.shields.io/badge/Swift-5.1.1-blue.svg)](https://swift.org/download/) ![](https://img.shields.io/badge/version-1.0.0--alpha.2-red) [![codecov](https://codecov.io/gh/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin/branch/master/graph/badge.svg)](https://codecov.io/gh/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin)
 
 The project implements an HTTPS client plugin for the [LambdaSwiftSprinter](https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core) framework.
 

Sources/LambdaSwiftSprinterNioPlugin/LambdaApiNIO.swift

@@ -32,11 +32,22 @@ public var lambdaRuntimeTimeout: TimeAmount = .seconds(3600)
 public var timeout = HTTPClient.Configuration.Timeout(connect: lambdaRuntimeTimeout,
                                                       read: lambdaRuntimeTimeout)
 
-public var httpClient: HTTPClient = {
+public var httpClient: HTTPClientProtocol = {
     let configuration = HTTPClient.Configuration(timeout: timeout)
     return HTTPClient(eventLoopGroupProvider: .createNew, configuration: configuration)
 }()
 
+public protocol HTTPClientProtocol: class {
+    func get(url: String, deadline: NIODeadline?) -> EventLoopFuture<HTTPClient.Response>
+    func post(url: String, body: HTTPClient.Body?, deadline: NIODeadline?)  -> EventLoopFuture<HTTPClient.Response>
+    func execute(request: HTTPClient.Request, deadline: NIODeadline?) -> EventLoopFuture<HTTPClient.Response>
+    func syncShutdown() throws
+}
+
+extension HTTPClient: HTTPClientProtocol {
+    
+}
+
 public class LambdaApiNIO: LambdaAPI {
     let urlBuilder: LambdaRuntimeAPIUrlBuilder
 
@@ -47,7 +58,8 @@ public class LambdaApiNIO: LambdaAPI {
     public func getNextInvocation() throws -> (event: Data, responseHeaders: [AnyHashable: Any]) {
         let request = try HTTPClient.Request(url: urlBuilder.nextInvocationURL(), method: .GET)
         let result = try httpClient.execute(
-            request: request
+            request: request,
+            deadline: nil
         ).wait()
 
         let httpHeaders = result.headers
@@ -72,7 +84,8 @@ public class LambdaApiNIO: LambdaAPI {
         )
         request.body = .data(httpBody)
         _ = try httpClient.execute(
-            request: request
+            request: request,
+            deadline: nil
         ).wait()
     }
 
@@ -87,7 +100,8 @@ public class LambdaApiNIO: LambdaAPI {
         request.body = .data(httpBody)
 
         _ = try httpClient.execute(
-            request: request
+            request: request,
+            deadline: nil
         ).wait()
     }
 
@@ -102,7 +116,8 @@ public class LambdaApiNIO: LambdaAPI {
         request.body = .data(httpBody)
 
         _ = try httpClient.execute(
-            request: request
+            request: request,
+            deadline: nil
         ).wait()
     }
 }

Sources/LambdaSwiftSprinterNioPlugin/Utils.swift

@@ -34,18 +34,17 @@ internal extension HTTPHeaders {
 }
 
 internal extension Data {
-    func decode<T: Decodable>() throws -> T {
-        let jsonDecoder = JSONDecoder()
-        guard let input = try? jsonDecoder.decode(T.self, from: self) else {
-            throw SprinterError.invalidJSON
-        }
-        return input
-    }
 
     init<T: Encodable>(from object: T) throws {
         let jsonEncoder = JSONEncoder()
         self = try jsonEncoder.encode(object)
     }
+    
+    var byteBuffer: ByteBuffer {
+        var buffer = ByteBufferAllocator().buffer(capacity: self.count)
+        buffer.writeBytes(self)
+        return buffer
+    }
 }
 
 internal extension HTTPResponseStatus {