Merge branch 'main' into ff-platform-dance

sebsto · web-flow · commit b27a98ae3efc · 2024-12-19T20:20:58.000+01:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,39 @@
+{
+    "name": "Swift",
+    "image": "swift:6.0",
+    "features": {
+        "ghcr.io/devcontainers/features/common-utils:2": {
+            "installZsh": "false",
+            "username": "vscode",
+            "upgradePackages": "false"
+        },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "os-provided",
+            "ppa": "false"
+        }
+    },
+    "runArgs": [
+        "--cap-add=SYS_PTRACE",
+        "--security-opt",
+        "seccomp=unconfined"
+    ],
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Set *default* container specific settings.json values on container create.
+            "settings": {
+                "lldb.library": "/usr/lib/liblldb.so"
+            },
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "sswg.swift-lang"
+            ]
+        }
+    },
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+
+    // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "vscode"
+}
diff --git a/.github/release.yml b/.github/release.yml
@@ -5,11 +5,10 @@ changelog:
         - ⚠️ semver/major
     - title: SemVer Minor
       labels:
-        - semver/minor
+        - 🆕 semver/minor
     - title: SemVer Patch
       labels:
-        - semver/patch
+        - 🔨 semver/patch
     - title: Other Changes
       labels:
         - semver/none
-        - "*"
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -10,11 +10,12 @@ jobs:
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
       license_header_check_project_name: "SwiftAWSLambdaRuntime"
-      shell_check_enabled: false
-      python_lint_check_enabled: false
+      shell_check_enabled: true
+      python_lint_check_enabled: true
       api_breakage_check_container_image: "swift:6.0-noble"
       docs_check_container_image: "swift:6.0-noble"
       format_check_container_image: "swiftlang/swift:nightly-6.0-jammy"
+      yamllint_check_enabled: true
 
   unit-tests:
     name: Unit tests
@@ -43,6 +44,18 @@ jobs:
     name: Swift 6 Language Mode
     uses: apple/swift-nio/.github/workflows/swift_6_language_mode.yml@main
 
+  semver-label-check:
+    name: Semantic Version label check
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+      - name: Check for Semantic Version label
+        uses: apple/swift-nio/.github/actions/pull_request_semver_label_checker@main
+
   # until there is a support for musl in swiftlang/github-workflows
   # https://github.com/swiftlang/github-workflows/issues/34
   musl:
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-01-package-init.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-01-package-init.sh
@@ -1,2 +1,3 @@
+# shellcheck disable=all
 # Create a project directory
 mkdir SquareNumber && cd SquareNumber
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-02-package-init.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-02-package-init.sh
@@ -1,3 +1,4 @@
+# shellcheck disable=all
 # Create a project directory
 mkdir SquareNumber && cd SquareNumber
 # create a skeleton project
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-03-package-init.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-03-package-init.sh
@@ -1,3 +1,4 @@
+# shellcheck disable=all
 # Create a project directory
 mkdir SquareNumber && cd SquareNumber
 # create a skeleton project
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-04-package-init.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-01-04-package-init.sh
@@ -1,3 +1,4 @@
+# shellcheck disable=all
 # Create a project directory
 mkdir SquareNumber && cd SquareNumber
 # create a skeleton project
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-03-console-output.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-03-console-output.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 2023-04-14T11:42:21+0200 info LocalLambdaServer : [AWSLambdaRuntimeCore] LocalLambdaServer started and listening on 127.0.0.1:7000, receiving events on /invoke
 2023-04-14T11:42:21+0200 info Lambda : [AWSLambdaRuntimeCore] lambda runtime starting with LambdaConfiguration
   General(logLevel: info))
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-04-curl.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-04-curl.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 curl --header "Content-Type: application/json" \
      --request POST                            \
      --data '{"number": 3}'                    \
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-05-curl.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-05-curl.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 curl --header "Content-Type: application/json" \
      --request POST                            \
      --data '{"number": 3}'                    \
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-06-terminal.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-06-terminal.sh
@@ -1,2 +1,3 @@
-export LOCAL_LAMBDA_SERVER_ENABLED=true
+# shellcheck disable=all
 
+export LOCAL_LAMBDA_SERVER_ENABLED=true
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-07-terminal.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-07-terminal.sh
@@ -1,2 +1,4 @@
+# shellcheck disable=all
+
 export LOCAL_LAMBDA_SERVER_ENABLED=true
 swift run
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-08-terminal.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/03-04-08-terminal.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 export LOCAL_LAMBDA_SERVER_ENABLED=true
 swift run
 
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-01-02-plugin-archive.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-01-02-plugin-archive.sh
@@ -1,2 +1,4 @@
+# shellcheck disable=all
+
 swift package archive --allow-network-connections docker
 
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-01-03-plugin-archive.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-01-03-plugin-archive.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 swift package archive --allow-network-connections docker 
 
 -------------------------------------------------------------------------
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-01-04-plugin-archive.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-01-04-plugin-archive.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 swift package archive --allow-network-connections docker
 
 -------------------------------------------------------------------------
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-01-aws-cli.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-01-aws-cli.sh
@@ -1 +1,3 @@
+# shellcheck disable=all
+
 aws --version
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-02-lambda-invoke-hidden.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-02-lambda-invoke-hidden.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 #
 # --region            the AWS Region to send the command
 # --function-name     the name of your function
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-02-lambda-invoke.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-02-lambda-invoke.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 #
 # --region            the AWS Region to send the command
 # --function-name     the name of your function
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-03-lambda-invoke.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-03-lambda-invoke.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 #
 # --region            the AWS Region to send the command
 # --function-name     the name of your function
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-04-lambda-invoke.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-04-lambda-invoke.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 #
 # --region            the AWS Region to send the command
 # --function-name     the name of your function
diff --git a/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-05-lambda-invoke.sh b/Sources/AWSLambdaRuntimeCore/Documentation.docc/Resources/code/04-03-05-lambda-invoke.sh
@@ -1,3 +1,5 @@
+# shellcheck disable=all
+
 #
 # --region            the AWS Region to send the command
 # --function-name     the name of your function
diff --git a/Sources/AWSLambdaRuntimeCore/LambdaRuntime.swift b/Sources/AWSLambdaRuntimeCore/LambdaRuntime.swift
@@ -39,7 +39,8 @@ public final class LambdaRuntime<Handler>: @unchecked Sendable where Handler: St
         // this approach is less flexible but more performant than reading the value of the environment variable at each invocation
         var log = logger
         log.logLevel = Lambda.env("LOG_LEVEL").flatMap(Logger.Level.init) ?? .info
-        self.logger = logger
+        self.logger = log
+        self.logger.debug("LambdaRuntime initialized")
     }
 
     public func run() async throws {
diff --git a/scripts/integration_tests.sh b/scripts/integration_tests.sh
@@ -22,13 +22,10 @@ fatal() { error "$@"; exit 1; }
 test -n "${SWIFT_VERSION:-}" || fatal "SWIFT_VERSION unset"
 test -n "${COMMAND:-}" || fatal "COMMAND unset"
 test -n "${EXAMPLE:-}" || fatal "EXAMPLE unset"
-swift_version="$SWIFT_VERSION"
-command="$COMMAND"
-example="$EXAMPLE"
 
-pushd Examples/"$example" > /dev/null
+pushd Examples/"$EXAMPLE" > /dev/null
 
 log "Running command with Swift $SWIFT_VERSION"
-eval "$command"
+eval "$COMMAND"
 
 popd
diff --git a/scripts/linux_performance_setup.sh b/scripts/linux_performance_setup.sh
@@ -20,14 +20,14 @@ apt-get install -y vim htop strace linux-tools-common linux-tools-generic libc6-
 
 echo 0 > /proc/sys/kernel/kptr_restrict
 
-cd /usr/bin
+pushd /usr/bin || exit 1
 rm -rf perf
 ln -s /usr/lib/linux-tools/*/perf perf
-cd -
+popd || exit 1
 
-cd /opt
+pushd /opt || exit 1
 git clone https://github.com/brendangregg/FlameGraph.git
-cd -
+popd || exit 1
 
 # build the code in relase mode with debug symbols
 # swift build -c release -Xswiftc -g
diff --git a/scripts/performance_test.sh b/scripts/performance_test.sh
@@ -27,8 +27,8 @@ if [[ $(uname -s) == "Linux" ]]; then
 fi
 
 swift build -c release -Xswiftc -g
-swift build --package-path Examples/Echo -c release -Xswiftc -g
-swift build --package-path Examples/JSON -c release -Xswiftc -g
+LAMBDA_USE_LOCAL_DEPS=../.. swift build --package-path Examples/HelloWorld -c release -Xswiftc -g
+LAMBDA_USE_LOCAL_DEPS=../.. swift build --package-path Examples/HelloJSON -c release -Xswiftc -g
 
 cleanup() {
   kill -9 $server_pid # ignore-unacceptable-language
@@ -58,24 +58,24 @@ kill -0 $server_pid # check server is alive # ignore-unacceptable-language
 echo "running $MODE mode cold test"
 cold=()
 export MAX_REQUESTS=1
-for (( i=0; i<$cold_iterations; i++ )); do
+for (( i=0; i<cold_iterations; i++ )); do
   start=$(gdate +%s%N)
-  ./Examples/Echo/.build/release/MyLambda
+  ./Examples/HelloWorld/.build/release/MyLambda
   end=$(gdate +%s%N)
-  cold+=( $(($end-$start)) )
+  cold+=( $((end-start)) )
 done
 sum_cold=$(IFS=+; echo "$((${cold[*]}))")
-avg_cold=$(($sum_cold/$cold_iterations))
+avg_cold=$((sum_cold/cold_iterations))
 results+=( "$MODE, cold: $avg_cold (ns)" )
 
 # normal calls
 echo "running $MODE mode warm test"
 export MAX_REQUESTS=$warm_iterations
 start=$(gdate +%s%N)
-./Examples/Echo/.build/release/MyLambda
+./Examples/HelloWorld/.build/release/MyLambda
 end=$(gdate +%s%N)
-sum_warm=$(($end-$start-$avg_cold)) # substract by avg cold since the first call is cold
-avg_warm=$(($sum_warm/($warm_iterations-1))) # substract since the first call is cold
+sum_warm=$((end-start-avg_cold)) # substract by avg cold since the first call is cold
+avg_warm=$((sum_warm/(warm_iterations-1))) # substract since the first call is cold
 results+=( "$MODE, warm: $avg_warm (ns)" )
 
 #------------------
@@ -96,32 +96,32 @@ kill -0 $server_pid # check server is alive # ignore-unacceptable-language
 echo "running $MODE mode cold test"
 cold=()
 export MAX_REQUESTS=1
-for (( i=0; i<$cold_iterations; i++ )); do
+for (( i=0; i<cold_iterations; i++ )); do
   start=$(gdate +%s%N)
-  ./Examples/JSON/.build/release/MyLambda
+  ./Examples/HelloJSON/.build/release/MyLambda
   end=$(gdate +%s%N)
-  cold+=( $(($end-$start)) )
+  cold+=( $((end-start)) )
 done
 sum_cold=$(IFS=+; echo "$((${cold[*]}))")
-avg_cold=$(($sum_cold/$cold_iterations))
+avg_cold=$((sum_cold/cold_iterations))
 results+=( "$MODE, cold: $avg_cold (ns)" )
 
 # normal calls
 echo "running $MODE mode warm test"
 export MAX_REQUESTS=$warm_iterations
 start=$(gdate +%s%N)
-./Examples/JSON/.build/release/MyLambda
+./Examples/HelloJSON/.build/release/MyLambda
 end=$(gdate +%s%N)
-sum_warm=$(($end-$start-$avg_cold)) # substract by avg cold since the first call is cold
-avg_warm=$(($sum_warm/($warm_iterations-1))) # substract since the first call is cold
+sum_warm=$((end-start-avg_cold)) # substract by avg cold since the first call is cold
+avg_warm=$((sum_warm/(warm_iterations-1))) # substract since the first call is cold
 results+=( "$MODE, warm: $avg_warm (ns)" )
 
 # print results
 echo "-----------------------------"
 echo "results"
 echo "-----------------------------"
 for i in "${results[@]}"; do
-   echo $i
+   echo "$i"
 done
 echo "-----------------------------"
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
	`1`	`+# shellcheck disable=all`
`1`	`2`	`# Create a project directory`
`2`	`3`	`mkdir SquareNumber && cd SquareNumber`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# shellcheck disable=all`
`1`	`2`	`# Create a project directory`
`2`	`3`	`mkdir SquareNumber && cd SquareNumber`
`3`	`4`	`# create a skeleton project`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# shellcheck disable=all`
	`2`	`+`
`1`	`3`	`2023-04-14T11:42:21+0200 info LocalLambdaServer : [AWSLambdaRuntimeCore] LocalLambdaServer started and listening on 127.0.0.1:7000, receiving events on /invoke`
`2`	`4`	`2023-04-14T11:42:21+0200 info Lambda : [AWSLambdaRuntimeCore] lambda runtime starting with LambdaConfiguration`
`3`	`5`	`General(logLevel: info))`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# shellcheck disable=all`
	`2`	`+`
`1`	`3`	`curl --header "Content-Type: application/json" \`
`2`	`4`	`--request POST \`
`3`	`5`	`--data '{"number": 3}' \`