Skip to content

Commit 32a0062

Browse files
committed
Merge branch 'main' into sebsto/new-plugins
2 parents 062c496 + 0a6af5b commit 32a0062

File tree

91 files changed

+5819
-535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+5819
-535
lines changed

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
linux_5_9_enabled: false
2525
linux_5_10_enabled: false
26-
linux_nightly_6_0_arguments_override: "--explicit-target-dependency-import-check error"
26+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
2727
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2828

2929
integration-tests:
@@ -36,7 +36,7 @@ jobs:
3636
# We pass the list of examples here, but we can't pass an array as argument
3737
# Instead, we pass a String with a valid JSON array.
3838
# The workaround is mentioned here https://github.com/orgs/community/discussions/11692
39-
examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'ResourcesPackaging', 'S3EventNotifier', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'Testing', 'Tutorial' ]"
39+
examples: "[ 'APIGateway', 'APIGateway+LambdaAuthorizer', 'BackgroundTasks', 'HelloJSON', 'HelloWorld', 'ResourcesPackaging', 'S3EventNotifier', 'S3_AWSSDK', 'S3_Soto', 'Streaming', 'StreamingFromEvent', 'ServiceLifecycle+Postgres', 'Testing', 'Tutorial' ]"
4040
archive_plugin_examples: "[ 'HelloWorld', 'ResourcesPackaging' ]"
4141
archive_plugin_enabled: true
4242

.github/workflows/scripts/check-archive-plugin.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,14 @@ unzip -l "${ZIP_FILE}" | grep --silent bootstrap
4040

4141
# if EXAMPLE is ResourcesPackaging, check if the ZIP file contains hello.txt
4242
if [ "$EXAMPLE" == "ResourcesPackaging" ]; then
43+
echo "Checking if resource was added to the ZIP file"
4344
unzip -l "${ZIP_FILE}" | grep --silent hello.txt
45+
SUCCESS=$?
46+
if [ "$SUCCESS" -eq 1 ]; then
47+
log "❌ Resource not found." && exit 1
48+
else
49+
log "✅ Resource found."
50+
fi
4451
fi
4552

4653
echo "✅ The archive plugin is OK with example ${EXAMPLE}"

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,7 @@ Package.resolved
1111
.serverless
1212
.vscode
1313
Makefile
14-
.devcontainer
14+
.devcontainer
15+
.amazonq
16+
.kiro
17+
nodejs

.licenseignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,5 @@ Package.resolved
3434
*.yml
3535
**/.npmignore
3636
**/*.json
37-
**/*.txt
37+
**/*.txt
38+
*.toml

Examples/APIGateway+LambdaAuthorizer/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ let package = Package(
1414
],
1515
dependencies: [
1616
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
17-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main"),
17+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
1818
.package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
1919
],
2020
targets: [

Examples/APIGateway/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main"),
16+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
1717
.package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
1818
],
1919
targets: [

Examples/BackgroundTasks/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main")
16+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1")
1717
],
1818
targets: [
1919
.executableTarget(

Examples/CDK/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ let package = Package(
1313
],
1414
dependencies: [
1515
// during CI, the dependency on local version of swift-aws-lambda-runtime is added dynamically below
16-
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", branch: "main"),
16+
.package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "2.0.0-beta.1"),
1717
.package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "1.0.0"),
1818
],
1919
targets: [

Examples/CDK/infra/package-lock.json

Lines changed: 67 additions & 61 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/CDK/infra/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
},
1212
"devDependencies": {
1313
"@types/jest": "^29.5.14",
14-
"@types/node": "22.7.9",
15-
"aws-cdk": "2.173.1",
14+
"@types/node": "22.13.10",
15+
"aws-cdk": "2.1003.0",
1616
"ts-node": "^10.9.2",
17-
"typescript": "~5.6.3"
17+
"typescript": "~5.8.2"
1818
},
1919
"dependencies": {
20-
"aws-cdk-lib": "^2.173.1",
20+
"aws-cdk-lib": "^2.189.1",
2121
"constructs": "^10.4.2"
2222
}
2323
}

0 commit comments

Comments
 (0)