From abffa3858f91f72b1d398e3bd5956cac4a7b0125 Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 10:42:07 +0200 Subject: [PATCH 1/8] Support swift-aws-lambda-runtime 1.0.0-alpha.2 --- Package.swift | 2 +- .../BreezeLambdaAPI/APIGatewayV2Response+Extensions.swift | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index ab45ca6..2173617 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0-alpha.1"), + .package(url: "https://github.com/swift-server/swift-aws-lambda-runtime.git", from: "1.0.0-alpha.2"), .package(url: "https://github.com/swift-server/swift-aws-lambda-events.git", from: "0.1.0"), .package(url: "https://github.com/soto-project/soto.git", from: "6.7.0"), .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"), diff --git a/Sources/BreezeLambdaAPI/APIGatewayV2Response+Extensions.swift b/Sources/BreezeLambdaAPI/APIGatewayV2Response+Extensions.swift index 0cd7fea..8da9234 100644 --- a/Sources/BreezeLambdaAPI/APIGatewayV2Response+Extensions.swift +++ b/Sources/BreezeLambdaAPI/APIGatewayV2Response+Extensions.swift @@ -13,7 +13,7 @@ // limitations under the License. import struct AWSLambdaEvents.APIGatewayV2Response -import struct AWSLambdaEvents.HTTPResponseStatus +import HTTPTypes import class Foundation.JSONEncoder extension APIGatewayV2Response { @@ -31,7 +31,7 @@ extension APIGatewayV2Response { /// - Parameters: /// - error: Error /// - statusCode: HTTP Status Code - init(with error: Error, statusCode: AWSLambdaEvents.HTTPResponseStatus) { + init(with error: Error, statusCode: HTTPResponse.Status) { let bodyError = BodyError(error: String(describing: error)) self.init(with: bodyError, statusCode: statusCode) } @@ -40,7 +40,7 @@ extension APIGatewayV2Response { /// - Parameters: /// - object: Encodable Object /// - statusCode: HTTP Status Code - init(with object: Output, statusCode: AWSLambdaEvents.HTTPResponseStatus) { + init(with object: Output, statusCode: HTTPResponse.Status) { var body = "{}" if let data = try? Self.encoder.encode(object) { body = String(data: data, encoding: .utf8) ?? body From 1b207ff340b3f50e030984c2815d0f69dd3b328a Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 10:58:32 +0200 Subject: [PATCH 2/8] Fix GHA --- .github/workflows/swift-test.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index 29ea6f2..52037be 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: image: - - swift:5.7.3-amazonlinux2 + - swift:5.10.1-amazonlinux2 services: localstack: image: localstack/localstack @@ -33,11 +33,14 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner - - name: Checkout - uses: actions/checkout@v3 - - name: Setup - run: | - yum -y update && yum -y install git make curl + - name: Setup + run: | + yum -y update && yum -y install git make zip curl + - name: Git Clone & Checkout + run: | + git clone https://github.com/$GITHUB_REPOSITORY.git $GITHUB_WORKSPACE/src + echo https://github.com/$GITHUB_REPOSITORY.git $BRANCH_NAME + cd $GITHUB_WORKSPACE/src && git checkout $BRANCH_NAME - name: Test run: | make test From 3ea38ac7d011b2ab31125cd581757a0df41f3ff7 Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 11:02:12 +0200 Subject: [PATCH 3/8] Fix GHA --- .github/workflows/swift-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index 52037be..2a6b960 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -26,6 +26,7 @@ jobs: image: ${{ matrix.image }} env: LOCALSTACK_ENDPOINT : "http://localstack:4566" + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest defaults: run: @@ -40,7 +41,8 @@ jobs: run: | git clone https://github.com/$GITHUB_REPOSITORY.git $GITHUB_WORKSPACE/src echo https://github.com/$GITHUB_REPOSITORY.git $BRANCH_NAME - cd $GITHUB_WORKSPACE/src && git checkout $BRANCH_NAME + cd $GITHUB_WORKSPACE/src + git checkout $BRANCH_NAME - name: Test run: | make test From 12ffecb9ce932a574894aee3af3576da7fdce96d Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 11:05:09 +0200 Subject: [PATCH 4/8] Fix GHA --- .github/workflows/swift-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index 2a6b960..b348e52 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -45,9 +45,11 @@ jobs: git checkout $BRANCH_NAME - name: Test run: | + cd $GITHUB_WORKSPACE/src make test - name: Coverage run: | + cd $GITHUB_WORKSPACE/src make coverage - name: Upload Code Coverage uses: codecov/codecov-action@v3 From f2f2ea8a9a3ce63eddda7a514d25d8d7cbcc2837 Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 11:14:15 +0200 Subject: [PATCH 5/8] Try GITHUB_ACTIONS_RUNNER_FORCED_NODE_VERSION=node16 --- .github/workflows/swift-test.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index b348e52..1b5eeaf 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -26,7 +26,8 @@ jobs: image: ${{ matrix.image }} env: LOCALSTACK_ENDPOINT : "http://localstack:4566" - BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + GITHUB_ACTIONS_RUNNER_FORCED_NODE_VERSION: node16 # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest defaults: run: @@ -37,12 +38,8 @@ jobs: - name: Setup run: | yum -y update && yum -y install git make zip curl - - name: Git Clone & Checkout - run: | - git clone https://github.com/$GITHUB_REPOSITORY.git $GITHUB_WORKSPACE/src - echo https://github.com/$GITHUB_REPOSITORY.git $BRANCH_NAME - cd $GITHUB_WORKSPACE/src - git checkout $BRANCH_NAME + - name: Checkout + uses: actions/checkout@v3 - name: Test run: | cd $GITHUB_WORKSPACE/src From 7a7dcbb5c7f7ee0ce0ab2dbaef8d20f83b86b3bc Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 11:32:47 +0200 Subject: [PATCH 6/8] Use ubuntu on GHA --- .github/workflows/swift-test.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index 1b5eeaf..1528260 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -18,7 +18,7 @@ jobs: strategy: matrix: image: - - swift:5.10.1-amazonlinux2 + - swift:5.10.1 services: localstack: image: localstack/localstack @@ -27,7 +27,6 @@ jobs: env: LOCALSTACK_ENDPOINT : "http://localstack:4566" BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - GITHUB_ACTIONS_RUNNER_FORCED_NODE_VERSION: node16 # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest defaults: run: @@ -35,11 +34,11 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner + - name: Checkout + uses: actions/checkout@v4 - name: Setup run: | - yum -y update && yum -y install git make zip curl - - name: Checkout - uses: actions/checkout@v3 + yum -y update && yum -y install make zip - name: Test run: | cd $GITHUB_WORKSPACE/src From cf715cd33f408133d07b2b613c3fb34da2f81096 Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 11:35:29 +0200 Subject: [PATCH 7/8] Fix setup --- .github/workflows/swift-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index 1528260..b52ceca 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -38,7 +38,7 @@ jobs: uses: actions/checkout@v4 - name: Setup run: | - yum -y update && yum -y install make zip + export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && apt-get -q install -y make curl wget - name: Test run: | cd $GITHUB_WORKSPACE/src From ac403a389266105ff505833cdf415cd20e6813d2 Mon Sep 17 00:00:00 2001 From: Andrea Scuderi Date: Sun, 25 Aug 2024 11:37:31 +0200 Subject: [PATCH 8/8] Remove cd --- .github/workflows/swift-test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/swift-test.yml b/.github/workflows/swift-test.yml index b52ceca..06a1fb4 100644 --- a/.github/workflows/swift-test.yml +++ b/.github/workflows/swift-test.yml @@ -41,11 +41,9 @@ jobs: export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && apt-get -q install -y make curl wget - name: Test run: | - cd $GITHUB_WORKSPACE/src make test - name: Coverage run: | - cd $GITHUB_WORKSPACE/src make coverage - name: Upload Code Coverage uses: codecov/codecov-action@v3