Skip to content

Commit 91cdbbe

Browse files
tomerdtomerd
committed
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
1 parent 4308b1b commit 91cdbbe

12 files changed

+46
-603
lines changed

‎CONTRIBUTORS.txt

+11-1
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,26 @@ needs to be listed here.
1818
- Bryan Moffatt <[email protected]>
1919
- Christoph Walcher <[email protected]>
2020
- Colton Schlosser <[email protected]>
21+
- DwayneCoussement <[email protected]>
22+
- DwayneCoussement <[email protected]>
2123
- Eneko Alonso <[email protected]>
22-
- Fabian Fett <[email protected]>
24+
- Fabian Fett <[email protected]>
25+
- Filipp Fediakov <[email protected]>
2326
- George Barnett <[email protected]>
27+
- Johannes Bosecker <[email protected]>
2428
- Johannes Weiss <[email protected]>
29+
- Josh <[email protected]>
30+
- ML <[email protected]>
31+
- Matt Massicotte <[email protected]>
2532
- Max Desiatov <[email protected]>
2633
- Norman Maurer <[email protected]>
34+
- Ralph Küpper <[email protected]>
2735
- Ro-M <[email protected]>
2836
- Tomer Doron <[email protected]>
2937
- Zhibin Cai <[email protected]>
3038
- pmarrufo <[email protected]>
39+
- pokryfka <[email protected]>
40+
- pokryfka <[email protected]>
3141
- tachyonics <[email protected]>
3242

3343
**Updating this list**

‎Package.swift

+2-45
Original file line numberDiff line numberDiff line change
@@ -3,56 +3,13 @@
33
import PackageDescription
44

55
let package = Package(
6-
name: "swift-aws-lambda-runtime",
6+
name: "swift-aws-lambda-events",
77
products: [
8-
// this library exports `AWSLambdaRuntimeCore` and adds Foundation convenience methods
9-
.library(name: "AWSLambdaRuntime", targets: ["AWSLambdaRuntime"]),
10-
// this has all the main functionality for lambda and it does not link Foundation
11-
.library(name: "AWSLambdaRuntimeCore", targets: ["AWSLambdaRuntimeCore"]),
12-
// common AWS events
138
.library(name: "AWSLambdaEvents", targets: ["AWSLambdaEvents"]),
14-
// for testing only
15-
.library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]),
16-
],
17-
dependencies: [
18-
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.30.0")),
19-
.package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.4.2")),
20-
.package(url: "https://github.com/swift-server/swift-backtrace.git", .upToNextMajor(from: "1.2.3")),
219
],
10+
dependencies: [],
2211
targets: [
23-
.target(name: "AWSLambdaRuntime", dependencies: [
24-
.byName(name: "AWSLambdaRuntimeCore"),
25-
.product(name: "NIO", package: "swift-nio"),
26-
.product(name: "NIOFoundationCompat", package: "swift-nio"),
27-
]),
28-
.target(name: "AWSLambdaRuntimeCore", dependencies: [
29-
.product(name: "Logging", package: "swift-log"),
30-
.product(name: "Backtrace", package: "swift-backtrace"),
31-
.product(name: "NIOHTTP1", package: "swift-nio"),
32-
.product(name: "_NIOConcurrency", package: "swift-nio"),
33-
]),
34-
.testTarget(name: "AWSLambdaRuntimeCoreTests", dependencies: [
35-
.byName(name: "AWSLambdaRuntimeCore"),
36-
.product(name: "NIOTestUtils", package: "swift-nio"),
37-
.product(name: "NIOFoundationCompat", package: "swift-nio"),
38-
]),
39-
.testTarget(name: "AWSLambdaRuntimeTests", dependencies: [
40-
.byName(name: "AWSLambdaRuntimeCore"),
41-
.byName(name: "AWSLambdaRuntime"),
42-
]),
4312
.target(name: "AWSLambdaEvents", dependencies: []),
4413
.testTarget(name: "AWSLambdaEventsTests", dependencies: ["AWSLambdaEvents"]),
45-
// testing helper
46-
.target(name: "AWSLambdaTesting", dependencies: [
47-
.byName(name: "AWSLambdaRuntime"),
48-
.product(name: "NIO", package: "swift-nio"),
49-
]),
50-
.testTarget(name: "AWSLambdaTestingTests", dependencies: ["AWSLambdaTesting"]),
51-
// for perf testing
52-
.target(name: "MockServer", dependencies: [
53-
.product(name: "NIOHTTP1", package: "swift-nio"),
54-
]),
55-
.target(name: "StringSample", dependencies: ["AWSLambdaRuntime"]),
56-
.target(name: "CodableSample", dependencies: ["AWSLambdaRuntime"]),
5714
]
5815
)

‎docker/docker-compose.1804.52.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-aws-lambda:18.04-5.2
6+
image: swift-aws-lambda-events:18.04-5.2
77
build:
88
dockerfile: Dockerfile.ubuntu
99
args:
1010
ubuntu_version: "bionic"
1111
swift_version: "5.2"
1212

1313
test:
14-
image: swift-aws-lambda:18.04-5.2
15-
16-
test-samples:
17-
image: swift-aws-lambda:18.04-5.2
14+
image: swift-aws-lambda-events:18.04-5.2
1815

1916
shell:
20-
image: swift-aws-lambda:18.04-5.2
17+
image: swift-aws-lambda-events:18.04-5.2

‎docker/docker-compose.al2.52.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-aws-lambda:al2-5.2
6+
image: swift-aws-lambda-events:al2-5.2
77
build:
88
args:
99
swift_version: "5.2"
1010

1111
test:
12-
image: swift-aws-lambda:al2-5.2
13-
14-
test-samples:
15-
image: swift-aws-lambda:al2-5.2
12+
image: swift-aws-lambda-events:al2-5.2
1613

1714
shell:
18-
image: swift-aws-lambda:al2-5.2
15+
image: swift-aws-lambda-events:al2-5.2

‎docker/docker-compose.al2.53.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-aws-lambda:al2-5.3
6+
image: swift-aws-lambda-events:al2-5.3
77
build:
88
args:
99
swift_version: "5.3"
1010

1111
test:
12-
image: swift-aws-lambda:al2-5.3
13-
14-
test-samples:
15-
image: swift-aws-lambda:al2-5.3
12+
image: swift-aws-lambda-events:al2-5.3
1613

1714
shell:
18-
image: swift-aws-lambda:al2-5.3
15+
image: swift-aws-lambda-events:al2-5.3

‎docker/docker-compose.al2.54.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-aws-lambda:al2-5.4
6+
image: swift-aws-lambda-events:al2-5.4
77
build:
88
args:
99
swift_version: "5.4"
1010

1111
test:
12-
image: swift-aws-lambda:al2-5.4
13-
14-
test-samples:
15-
image: swift-aws-lambda:al2-5.4
12+
image: swift-aws-lambda-events:al2-5.4
1613

1714
shell:
18-
image: swift-aws-lambda:al2-5.4
15+
image: swift-aws-lambda-events:al2-5.4

‎docker/docker-compose.al2.55.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-aws-lambda:al2-5.5
6+
image: swift-aws-lambda-events:al2-5.5
77
build:
88
args:
99
base_image: "swiftlang/swift:nightly-5.5-amazonlinux2"
1010

1111
test:
12-
image: swift-aws-lambda:al2-5.5
13-
14-
test-samples:
15-
image: swift-aws-lambda:al2-5.5
12+
image: swift-aws-lambda-events:al2-5.5
1613

1714
shell:
18-
image: swift-aws-lambda:al2-5.5
15+
image: swift-aws-lambda-events:al2-5.5

‎docker/docker-compose.al2.main.yaml

+3-11
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,13 @@ version: "3"
33
services:
44

55
runtime-setup:
6-
image: swift-aws-lambda:al2-main
6+
image: swift-aws-lambda-events:al2-main
77
build:
88
args:
99
base_image: "swiftlang/swift:nightly-main-amazonlinux2"
1010

1111
test:
12-
image: swift-aws-lambda:al2-main
13-
command: /bin/bash -cl "swift test --enable-test-discovery -Xswiftc -warnings-as-errors $${SANITIZER_ARG-} -Xswiftc -Xfrontend -Xswiftc -enable-experimental-concurrency"
14-
15-
test-samples:
16-
image: swift-aws-lambda:al2-main
17-
command: >-
18-
/bin/bash -clx "
19-
swift build -Xswiftc -Xfrontend -Xswiftc -enable-experimental-concurrency --package-path Examples/LambdaFunctions &&
20-
swift build -Xswiftc -Xfrontend -Xswiftc -enable-experimental-concurrency --package-path Examples/LocalDebugging/MyLambda"
12+
image: swift-aws-lambda-events:al2-main
2113

2214
shell:
23-
image: swift-aws-lambda:al2-main
15+
image: swift-aws-lambda-events:al2-main

‎docker/docker-compose.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ services:
3030
<<: *common
3131
command: /bin/bash -cl "swift test --enable-test-discovery -Xswiftc -warnings-as-errors $${SANITIZER_ARG-}"
3232

33-
test-samples:
34-
<<: *common
35-
command: >-
36-
/bin/bash -clx "
37-
swift build --package-path Examples/LambdaFunctions &&
38-
swift build --package-path Examples/LocalDebugging/MyLambda"
39-
4033
# util
4134

4235
shell:

0 commit comments

Comments
 (0)