From f9c6a97fa95038fc751559e7466d5dacbc58ce17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Stormacq?= <sebastien.stormacq@gmail.com>
Date: Thu, 6 Mar 2025 17:10:20 +0100
Subject: [PATCH] remove mentions of LambdaRuntImeCore

---
 Examples/HelloWorld/README.md                             | 2 +-
 Examples/Testing/README.md                                | 4 ++--
 Examples/Testing/Tests/HandlerTests.swift                 | 2 +-
 Package.swift                                             | 8 +-------
 Package@swift-6.0.swift                                   | 8 +-------
 .../AWSLambdaRuntime/Docs.docc/Proposals/0001-v2-api.md   | 2 +-
 .../ControlPlaneRequestEncoderTests.swift                 | 0
 .../InvocationTests.swift                                 | 0
 .../LambdaMockClient.swift                                | 0
 .../LambdaRequestIDTests.swift                            | 0
 .../LambdaRunLoopTests.swift                              | 0
 .../LambdaRuntimeClientTests.swift                        | 0
 .../MockLambdaServer.swift                                | 0
 .../Utils.swift                                           | 0
 .../UtilsTest.swift                                       | 0
 15 files changed, 7 insertions(+), 19 deletions(-)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/ControlPlaneRequestEncoderTests.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/InvocationTests.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/LambdaMockClient.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/LambdaRequestIDTests.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/LambdaRunLoopTests.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/LambdaRuntimeClientTests.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/MockLambdaServer.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/Utils.swift (100%)
 rename Tests/{AWSLambdaRuntimeCoreTests => AWSLambdaRuntimeTests}/UtilsTest.swift (100%)

diff --git a/Examples/HelloWorld/README.md b/Examples/HelloWorld/README.md
index 245233c3..c4eacfc2 100644
--- a/Examples/HelloWorld/README.md
+++ b/Examples/HelloWorld/README.md
@@ -28,7 +28,7 @@ It will compile your code and start the local server. You know the local server
 Building for debugging...
 [1/1] Write swift-version--644A47CB88185983.txt
 Build of product 'MyLambda' complete! (0.31s)
-2025-01-29T12:44:48+0100 info LocalServer : host="127.0.0.1" port=7000 [AWSLambdaRuntimeCore] Server started and listening
+2025-01-29T12:44:48+0100 info LocalServer : host="127.0.0.1" port=7000 [AWSLambdaRuntime] Server started and listening
 ```
 
 Then, from another Terminal, send your payload with `curl`. Note that the payload must be a valid JSON string. In the case of this function that accepts a simple String, it means the String must be wrapped in between double quotes.
diff --git a/Examples/Testing/README.md b/Examples/Testing/README.md
index 3f911b21..9bfd0e28 100644
--- a/Examples/Testing/README.md
+++ b/Examples/Testing/README.md
@@ -160,8 +160,8 @@ You must pass an event to the Lambda function. You can use the `event.json` file
 sam local invoke -e Tests/event.json
 
 START RequestId: 3270171f-46d3-45f9-9bb6-3c2e5e9dc625 Version: $LATEST
-2024-12-21T16:49:31+0000 debug LambdaRuntime : [AWSLambdaRuntimeCore] LambdaRuntime initialized
-2024-12-21T16:49:31+0000 trace LambdaRuntime : lambda_ip=127.0.0.1 lambda_port=9001 [AWSLambdaRuntimeCore] Connection to control plane created
+2024-12-21T16:49:31+0000 debug LambdaRuntime : [AWSLambdaRuntime] LambdaRuntime initialized
+2024-12-21T16:49:31+0000 trace LambdaRuntime : lambda_ip=127.0.0.1 lambda_port=9001 [AWSLambdaRuntime] Connection to control plane created
 2024-12-21T16:49:31+0000 debug LambdaRuntime : [APIGatewayLambda] HTTP API Message received
 2024-12-21T16:49:31+0000 trace LambdaRuntime : [APIGatewayLambda] Event: APIGatewayV2Request(version: "2.0", routeKey: "$default", rawPath: "/", rawQueryString: "", cookies: [], headers: ["x-forwarded-proto": "https", "host": "a5q74es3k2.execute-api.us-east-1.amazonaws.com", "content-length": "0", "x-forwarded-for": "81.0.0.43", "accept": "*/*", "x-amzn-trace-id": "Root=1-66fb03de-07533930192eaf5f540db0cb", "x-forwarded-port": "443", "user-agent": "curl/8.7.1"], queryStringParameters: [:], pathParameters: [:], context: AWSLambdaEvents.APIGatewayV2Request.Context(accountId: "012345678901", apiId: "a5q74es3k2", domainName: "a5q74es3k2.execute-api.us-east-1.amazonaws.com", domainPrefix: "a5q74es3k2", stage: "$default", requestId: "e72KxgsRoAMEMSA=", http: AWSLambdaEvents.APIGatewayV2Request.Context.HTTP(method: GET, path: "/", protocol: "HTTP/1.1", sourceIp: "81.0.0.43", userAgent: "curl/8.7.1"), authorizer: nil, authentication: nil, time: "30/Sep/2024:20:02:38 +0000", timeEpoch: 1727726558220), stageVariables: [:], body: Optional("aGVsbG8gd29ybGQgb2YgU1dJRlQgTEFNQkRBIQ=="), isBase64Encoded: false)
 END RequestId: 5b71587a-39da-445e-855d-27a700e57efd
diff --git a/Examples/Testing/Tests/HandlerTests.swift b/Examples/Testing/Tests/HandlerTests.swift
index 7fa245f9..85cc4e4e 100644
--- a/Examples/Testing/Tests/HandlerTests.swift
+++ b/Examples/Testing/Tests/HandlerTests.swift
@@ -18,7 +18,7 @@ import Logging
 import Testing
 
 @testable import APIGatewayLambda  // to access the business code
-@testable import AWSLambdaRuntimeCore  // to access the LambdaContext
+@testable import AWSLambdaRuntime  // to access the LambdaContext
 
 #if canImport(FoundationEssentials)
 import FoundationEssentials
diff --git a/Package.swift b/Package.swift
index 3bd026f9..1aef921d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -64,19 +64,13 @@ let package = Package(
             )
         ),
         .testTarget(
-            name: "AWSLambdaRuntimeCoreTests",
+            name: "AWSLambdaRuntimeTests",
             dependencies: [
                 .byName(name: "AWSLambdaRuntime"),
                 .product(name: "NIOTestUtils", package: "swift-nio"),
                 .product(name: "NIOFoundationCompat", package: "swift-nio"),
             ]
         ),
-        .testTarget(
-            name: "AWSLambdaRuntimeTests",
-            dependencies: [
-                .byName(name: "AWSLambdaRuntime")
-            ]
-        ),
         // testing helper
         .target(
             name: "AWSLambdaTesting",
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
index ff45ec88..29929f40 100644
--- a/Package@swift-6.0.swift
+++ b/Package@swift-6.0.swift
@@ -53,19 +53,13 @@ let package = Package(
             )
         ),
         .testTarget(
-            name: "AWSLambdaRuntimeCoreTests",
+            name: "AWSLambdaRuntimeTests",
             dependencies: [
                 .byName(name: "AWSLambdaRuntime"),
                 .product(name: "NIOTestUtils", package: "swift-nio"),
                 .product(name: "NIOFoundationCompat", package: "swift-nio"),
             ]
         ),
-        .testTarget(
-            name: "AWSLambdaRuntimeTests",
-            dependencies: [
-                .byName(name: "AWSLambdaRuntime")
-            ]
-        ),
         // testing helper
         .target(
             name: "AWSLambdaTesting",
diff --git a/Sources/AWSLambdaRuntime/Docs.docc/Proposals/0001-v2-api.md b/Sources/AWSLambdaRuntime/Docs.docc/Proposals/0001-v2-api.md
index 624182d0..0396d48d 100644
--- a/Sources/AWSLambdaRuntime/Docs.docc/Proposals/0001-v2-api.md
+++ b/Sources/AWSLambdaRuntime/Docs.docc/Proposals/0001-v2-api.md
@@ -80,7 +80,7 @@ initialized services:
 struct MyLambda: LambdaHandler {
     let pgClient: PostgresClient
 
-    init(context: AWSLambdaRuntimeCore.LambdaInitializationContext) async throws {
+    init(context: AWSLambdaRuntime.LambdaInitializationContext) async throws {
         /// Instantiate service
         let client = PostgresClient(configuration: ...)
 
diff --git a/Tests/AWSLambdaRuntimeCoreTests/ControlPlaneRequestEncoderTests.swift b/Tests/AWSLambdaRuntimeTests/ControlPlaneRequestEncoderTests.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/ControlPlaneRequestEncoderTests.swift
rename to Tests/AWSLambdaRuntimeTests/ControlPlaneRequestEncoderTests.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/InvocationTests.swift b/Tests/AWSLambdaRuntimeTests/InvocationTests.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/InvocationTests.swift
rename to Tests/AWSLambdaRuntimeTests/InvocationTests.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/LambdaMockClient.swift b/Tests/AWSLambdaRuntimeTests/LambdaMockClient.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/LambdaMockClient.swift
rename to Tests/AWSLambdaRuntimeTests/LambdaMockClient.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/LambdaRequestIDTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRequestIDTests.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/LambdaRequestIDTests.swift
rename to Tests/AWSLambdaRuntimeTests/LambdaRequestIDTests.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/LambdaRunLoopTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/LambdaRunLoopTests.swift
rename to Tests/AWSLambdaRuntimeTests/LambdaRunLoopTests.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/LambdaRuntimeClientTests.swift b/Tests/AWSLambdaRuntimeTests/LambdaRuntimeClientTests.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/LambdaRuntimeClientTests.swift
rename to Tests/AWSLambdaRuntimeTests/LambdaRuntimeClientTests.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/MockLambdaServer.swift b/Tests/AWSLambdaRuntimeTests/MockLambdaServer.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/MockLambdaServer.swift
rename to Tests/AWSLambdaRuntimeTests/MockLambdaServer.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/Utils.swift b/Tests/AWSLambdaRuntimeTests/Utils.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/Utils.swift
rename to Tests/AWSLambdaRuntimeTests/Utils.swift
diff --git a/Tests/AWSLambdaRuntimeCoreTests/UtilsTest.swift b/Tests/AWSLambdaRuntimeTests/UtilsTest.swift
similarity index 100%
rename from Tests/AWSLambdaRuntimeCoreTests/UtilsTest.swift
rename to Tests/AWSLambdaRuntimeTests/UtilsTest.swift