split events into spearate package

motivation: the runtime library has a stabel API while the events are still moving target, so in order to provide a 1.0 stable version we should separate them out changes: * import events module from the swift-aws-lambda-runtime, including git history * update docker setup * remove redundant examples and scripts
swift-server · Jul 29, 2021 · 91cdbbe · 91cdbbe
1 parent 4308b1b
commit 91cdbbe
Show file tree

Hide file tree

Showing 12 changed files with 46 additions and 603 deletions.
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -18,16 +18,26 @@ needs to be listed here.
 - Bryan Moffatt <[email protected]>
 - Christoph Walcher <[email protected]>
 - Colton Schlosser <[email protected]>
+- DwayneCoussement <[email protected]>
+- DwayneCoussement <[email protected]>
 - Eneko Alonso <[email protected]>
-- Fabian Fett <[email protected]>
+- Fabian Fett <[email protected]>
+- Filipp Fediakov <[email protected]>
 - George Barnett <[email protected]>
+- Johannes Bosecker <[email protected]>
 - Johannes Weiss <[email protected]>
+- Josh <[email protected]>
+- ML <[email protected]>
+- Matt Massicotte <[email protected]>
 - Max Desiatov <[email protected]>
 - Norman Maurer <[email protected]>
+- Ralph Küpper <[email protected]>
 - Ro-M <[email protected]>
 - Tomer Doron <[email protected]>
 - Zhibin Cai <[email protected]>
 - pmarrufo <[email protected]>
+- pokryfka <[email protected]>
+- pokryfka <[email protected]>
 - tachyonics <[email protected]>
 
 **Updating this list**

diff --git a/Package.swift b/Package.swift
@@ -3,56 +3,13 @@
 import PackageDescription
 
 let package = Package(
-    name: "swift-aws-lambda-runtime",
+    name: "swift-aws-lambda-events",
     products: [
-        // this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
-        .library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
-        // this has all the main functionality for lambda and it does not link Foundation
-        .library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]),
-        // common AWS events
         .library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]),
-        // for testing only
-        .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.30.0")),
-        .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.4.2")),
-        .package(url: "https://github.com/swift-server/swift-backtrace.git", .upToNextMajor(from: "1.2.3")),
     ],
+    dependencies: [],
     targets: [
-        .target(name: "AWSLambdaRuntime", dependencies: [
-            .byName(name: "AWSLambdaRuntimeCore"),
-            .product(name: "NIO", package: "swift-nio"),
-            .product(name: "NIOFoundationCompat", package: "swift-nio"),
-        ]),
-        .target(name: "AWSLambdaRuntimeCore", dependencies: [
-            .product(name: "Logging", package: "swift-log"),
-            .product(name: "Backtrace", package: "swift-backtrace"),
-            .product(name: "NIOHTTP1", package: "swift-nio"),
-            .product(name: "_NIOConcurrency", package: "swift-nio"),
-        ]),
-        .testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [
-            .byName(name: "AWSLambdaRuntimeCore"),
-            .product(name: "NIOTestUtils", package: "swift-nio"),
-            .product(name: "NIOFoundationCompat", package: "swift-nio"),
-        ]),
-        .testTarget(name: "AWSLambdaRuntimeTests", dependencies: [
-            .byName(name: "AWSLambdaRuntimeCore"),
-            .byName(name: "AWSLambdaRuntime"),
-        ]),
         .target(name: "AWSLambdaEvents", dependencies: []),
         .testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]),
-        // testing helper
-        .target(name: "AWSLambdaTesting", dependencies: [
-            .byName(name: "AWSLambdaRuntime"),
-            .product(name: "NIO", package: "swift-nio"),
-        ]),
-        .testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]),
-        // for perf testing
-        .target(name: "MockServer", dependencies: [
-            .product(name: "NIOHTTP1", package: "swift-nio"),
-        ]),
-        .target(name: "StringSample", dependencies: ["AWSLambdaRuntime"]),
-        .target(name: "CodableSample", dependencies: ["AWSLambdaRuntime"]),
     ]
 )
diff --git a/docker/docker-compose.1804.52.yaml b/docker/docker-compose.1804.52.yaml
@@ -3,18 +3,15 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-aws-lambda-events:18.04-5.2
     build:
       dockerfile: Dockerfile.ubuntu
       args:
         ubuntu_version: "bionic"
         swift_version: "5.2"
 
   test:
-    image: swift-aws-lambda:18.04-5.2
-
-  test-samples:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-aws-lambda-events:18.04-5.2
 
   shell:
-    image: swift-aws-lambda:18.04-5.2
+    image: swift-aws-lambda-events:18.04-5.2
diff --git a/docker/docker-compose.al2.52.yaml b/docker/docker-compose.al2.52.yaml
@@ -3,16 +3,13 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:al2-5.2
+    image: swift-aws-lambda-events:al2-5.2
     build:
       args:
         swift_version: "5.2"
 
   test:
-    image: swift-aws-lambda:al2-5.2
-
-  test-samples:
-    image: swift-aws-lambda:al2-5.2
+    image: swift-aws-lambda-events:al2-5.2
 
   shell:
-    image: swift-aws-lambda:al2-5.2
+    image: swift-aws-lambda-events:al2-5.2
diff --git a/docker/docker-compose.al2.53.yaml b/docker/docker-compose.al2.53.yaml
@@ -3,16 +3,13 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:al2-5.3
+    image: swift-aws-lambda-events:al2-5.3
     build:
       args:
         swift_version: "5.3"
 
   test:
-    image: swift-aws-lambda:al2-5.3
-
-  test-samples:
-    image: swift-aws-lambda:al2-5.3
+    image: swift-aws-lambda-events:al2-5.3
 
   shell:
-    image: swift-aws-lambda:al2-5.3
+    image: swift-aws-lambda-events:al2-5.3
diff --git a/docker/docker-compose.al2.54.yaml b/docker/docker-compose.al2.54.yaml
@@ -3,16 +3,13 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:al2-5.4
+    image: swift-aws-lambda-events:al2-5.4
     build:
       args:
         swift_version: "5.4"
 
   test:
-    image: swift-aws-lambda:al2-5.4
-
-  test-samples:
-    image: swift-aws-lambda:al2-5.4
+    image: swift-aws-lambda-events:al2-5.4
 
   shell:
-    image: swift-aws-lambda:al2-5.4
+    image: swift-aws-lambda-events:al2-5.4
diff --git a/docker/docker-compose.al2.55.yaml b/docker/docker-compose.al2.55.yaml
@@ -3,16 +3,13 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:al2-5.5
+    image: swift-aws-lambda-events:al2-5.5
     build:
       args:
         base_image: "swiftlang/swift:nightly-5.5-amazonlinux2"
 
   test:
-    image: swift-aws-lambda:al2-5.5
-
-  test-samples:
-    image: swift-aws-lambda:al2-5.5
+    image: swift-aws-lambda-events:al2-5.5
 
   shell:
-    image: swift-aws-lambda:al2-5.5
+    image: swift-aws-lambda-events:al2-5.5
diff --git a/docker/docker-compose.al2.main.yaml b/docker/docker-compose.al2.main.yaml
@@ -3,21 +3,13 @@ version: "3"
 services:
 
   runtime-setup:
-    image: swift-aws-lambda:al2-main
+    image: swift-aws-lambda-events:al2-main
     build:
       args:
         base_image: "swiftlang/swift:nightly-main-amazonlinux2"
 
   test:
-    image: swift-aws-lambda:al2-main
-    command: /bin/bash -cl "swift test --enable-test-discovery -Xswiftc -warnings-as-errors $${SANITIZER_ARG-} -Xswiftc -Xfrontend -Xswiftc -enable-experimental-concurrency"
-
-  test-samples:
-    image: swift-aws-lambda:al2-main
-    command: >-
-      /bin/bash -clx "
-      swift build -Xswiftc -Xfrontend -Xswiftc -enable-experimental-concurrency --package-path Examples/LambdaFunctions &&
-      swift build -Xswiftc -Xfrontend -Xswiftc -enable-experimental-concurrency --package-path Examples/LocalDebugging/MyLambda"
+    image: swift-aws-lambda-events:al2-main
 
   shell:
-    image: swift-aws-lambda:al2-main
+    image: swift-aws-lambda-events:al2-main
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
@@ -30,13 +30,6 @@ services:
     <<: *common
     command: /bin/bash -cl "swift test --enable-test-discovery -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
 
-  test-samples:
-    <<: *common
-    command: >-
-      /bin/bash -clx "
-      swift build --package-path Examples/LambdaFunctions &&
-      swift build --package-path Examples/LocalDebugging/MyLambda"
-
   # util
 
   shell: