Merge pull request #9 from swift-serverless/feature/remove-web-hook-service

Remove BreezeLambdaWebHookService

Author: Andrea-Scuderi

.devcontainer/Dockerfile

@@ -0,0 +1,6 @@
+# Note: You can use any Debian/Ubuntu based image you want. 
+FROM swift:6.2.0
+
+# [Optional] Uncomment this section to install additional OS packages.
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends make

.devcontainer/devcontainer.json

@@ -0,0 +1,45 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-outside-of-docker-compose
+{
+	"name": "Docker from Docker Compose",
+	"dockerComposeFile": "docker-compose.yml",
+	"service": "app",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+
+	// Use this environment variable if you need to bind mount your local source code into a new container.
+	"remoteEnv": {
+		"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
+	},
+
+	"features": {
+		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+			"version": "latest",
+			"enableNonRootDocker": "true",
+			"moby": "true"
+		},
+		"ghcr.io/devcontainers/features/aws-cli:1": {}
+	},
+
+	// 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": [
+                "swiftlang.swift-vscode"
+            ]
+        }
+    }
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "docker --version",
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,35 @@
+version: '3'
+
+services:
+  app:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+
+    volumes:
+      # Forwards the local Docker socket to the container.
+      - /var/run/docker.sock:/var/run/docker-host.sock 
+      # Update this to wherever you want VS Code to mount the folder of your project
+      - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    entrypoint: /usr/local/share/docker-init.sh
+    depends_on:
+      - localstack
+    environment:
+      - LOCALSTACK_ENDPOINT=http://localstack:4566
+      - AWS_ACCESS_KEY_ID=test
+      - AWS_SECRET_ACCESS_KEY=test
+      - AWS_REGION=us-east-1
+    command: sleep infinity
+
+    # Uncomment the next four lines if you will use a ptrace-based debuggers like C++, Go, and Rust.
+    cap_add:
+     - SYS_PTRACE
+    security_opt:
+      - seccomp:unconfined
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+  localstack:
+    image: localstack/localstack

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly

.sourcekit-lsp/config.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://raw.githubusercontent.com/swiftlang/sourcekit-lsp/refs/heads/release/6.2/config.schema.json"
+}

Makefile

@@ -28,6 +28,9 @@ coverage:
 		--instr-profile=$(SWIFT_BIN_PATH)/codecov/default.profdata \
 		--format=lcov > $(GITHUB_WORKSPACE)/lcov.info
 
+local_invoke_demo_app:
+	curl -X POST 127.0.0.1:7000/invoke -H "Content-Type: application/json" -d @Tests/BreezeLambdaWebHookTests/Fixtures/get_webhook_api_gtw.json
+
 preview_docc_lambda_api:
 	swift package --disable-sandbox preview-documentation --target BreezeLambdaWebHook
 

Package.swift

@@ -19,7 +19,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.2.0"),
+        .package(url: "https://github.com/awslabs/swift-aws-lambda-runtime.git", from: "2.5.0"),
         .package(url: "https://github.com/awslabs/swift-aws-lambda-events.git", from: "0.5.0"),
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.22.0"),
         .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.3"),

Sources/BreezeDemoHTTPApplication/BreezeDemoHTTPApplication.swift

@@ -29,10 +29,14 @@ struct DemoLambdaHandler: BreezeLambdaWebHookHandler, Sendable {
         self.handlerContext = handlerContext
     }
 
+    var httpClient: HTTPClient {
+        handlerContext.httpClient
+    }
+    
     func handle(_ event: APIGatewayV2Request, context: LambdaContext) async throws -> APIGatewayV2Response {
         context.logger.info("Received event: \(event)")
         let request = HTTPClientRequest(url: "https://example.com")
-        let response = try await handlerContext.httpClient.execute(request, timeout: .seconds(5))
+        let response = try await httpClient.execute(request, timeout: .seconds(5))
         let bytes = try await response.body.collect(upTo: 1024 * 1024) // 1 MB Buffer
         let body = String(buffer: bytes)
         context.logger.info("Response body: \(body)")

Sources/BreezeLambdaWebHook/BreezeLambdaWebHook.swift

@@ -53,18 +53,20 @@ public struct BreezeLambdaWebHook<LambdaHandler: BreezeLambdaWebHookHandler>: Se
     /// handling any errors that may occur during the process.
     /// It gracefully shuts down the service on termination signals.
     public func run() async throws {
+        let handlerContext = HandlerContext(config: config)
+        let lambdaHandler = LambdaHandler(handlerContext: handlerContext)
+        let runtime = LambdaRuntime(body: lambdaHandler.handle)
+
+        let serviceGroup = ServiceGroup(
+            services: [handlerContext, runtime],
+            gracefulShutdownSignals: [.sigterm, .sigint],
+            logger: config.logger
+        )
         do {
-            let lambdaService = BreezeLambdaWebHookService<LambdaHandler>(
-                config: config
-            )
-            let serviceGroup = ServiceGroup(
-                services: [lambdaService],
-                gracefulShutdownSignals: [.sigterm, .sigint],
-                logger: config.logger
-            )
             config.logger.error("Starting \(name) ...")
             try await serviceGroup.run()
         } catch {
+            try? handlerContext.syncShutdown()
             config.logger.error("Error running \(name): \(error.localizedDescription)")
         }
     }

Sources/BreezeLambdaWebHook/BreezeLambdaWebHookHandler.swift

@@ -32,8 +32,4 @@ public extension BreezeLambdaWebHookHandler {
     var handler: String? {
         Lambda.env("_HANDLER")
     }
-    
-    var httpClient: AsyncHTTPClient.HTTPClient {
-        handlerContext.httpClient
-    }
 }