Update S3Test with aws-sdk-swift 5.0.0-alpha.3

Author: Andrea-Scuderi

.gitignore

@@ -6,3 +6,4 @@
 lambda.zip
 swift-shared-libs
 default.profraw
+.swiftpm

Examples/S3Test/Package.resolved

@@ -0,0 +1,97 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "async-http-client",
+        "repositoryURL": "https://github.com/swift-server/async-http-client.git",
+        "state": {
+          "branch": null,
+          "revision": "037b70291941fe43de668066eb6fb802c5e181d2",
+          "version": "1.1.1"
+        }
+      },
+      {
+        "package": "LambdaSwiftSprinter",
+        "repositoryURL": "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core",
+        "state": {
+          "branch": null,
+          "revision": "6941e41194bde0e57fb0deb23be620f2b8dd626d",
+          "version": "1.0.0"
+        }
+      },
+      {
+        "package": "LambdaSwiftSprinterNioPlugin",
+        "repositoryURL": "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin",
+        "state": {
+          "branch": null,
+          "revision": "35d3ab84bf83fc881844b5f7483cb2a1d942a23f",
+          "version": "1.0.1"
+        }
+      },
+      {
+        "package": "aws-sdk-swift",
+        "repositoryURL": "https://github.com/swift-aws/aws-sdk-swift.git",
+        "state": {
+          "branch": null,
+          "revision": "eeb30fac3d95a377d8c5bb4b33efed932061f42d",
+          "version": "5.0.0-alpha.3"
+        }
+      },
+      {
+        "package": "aws-sdk-swift-core",
+        "repositoryURL": "https://github.com/swift-aws/aws-sdk-swift-core.git",
+        "state": {
+          "branch": null,
+          "revision": "ccea4b98758e9e8bb907a4dc9bb15d01d8a3c736",
+          "version": "5.0.0-alpha.3.2"
+        }
+      },
+      {
+        "package": "swift-log",
+        "repositoryURL": "https://github.com/apple/swift-log.git",
+        "state": {
+          "branch": null,
+          "revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "swift-nio",
+        "repositoryURL": "https://github.com/apple/swift-nio.git",
+        "state": {
+          "branch": null,
+          "revision": "e876fb37410e0036b98b5361bb18e6854739572b",
+          "version": "2.16.0"
+        }
+      },
+      {
+        "package": "swift-nio-extras",
+        "repositoryURL": "https://github.com/apple/swift-nio-extras.git",
+        "state": {
+          "branch": null,
+          "revision": "e0e76733600a2806b3dc4feae8cfebace858c1a2",
+          "version": "1.4.1"
+        }
+      },
+      {
+        "package": "swift-nio-ssl",
+        "repositoryURL": "https://github.com/apple/swift-nio-ssl.git",
+        "state": {
+          "branch": null,
+          "revision": "ae213938e151964aa691f0e902462fbe06baeeb6",
+          "version": "2.7.1"
+        }
+      },
+      {
+        "package": "swift-nio-transport-services",
+        "repositoryURL": "https://github.com/apple/swift-nio-transport-services.git",
+        "state": {
+          "branch": null,
+          "revision": "85a67aea7caf5396ed599543dd23cffeb6dbbf96",
+          "version": "1.5.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

Examples/S3Test/Package.swift

@@ -1,25 +1,32 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 
 import PackageDescription
 
 let package = Package(
     name: "S3Test",
+    products: [
+        .executable(name: "S3Test", targets: ["S3Test"])
+    ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
         //.package(path: "../../../aws-lambda-swift-sprinter-core"),
         //.package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-core", from: "1.0.0-alpha.3"),
         //.package(path: "../../../aws-lambda-swift-sprinter-nio-plugin"),
         .package(url: "https://github.com/swift-sprinter/aws-lambda-swift-sprinter-nio-plugin", from: "1.0.0"),
-        .package(url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "4.0.0"),
+        .package(url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "5.0.0-alpha.3"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "S3Test",
-            dependencies: ["LambdaSwiftSprinterNioPlugin", "S3", "Logging"]
+            dependencies: [
+                "LambdaSwiftSprinterNioPlugin",
+                .product(name: "AWSS3", package: "aws-sdk-swift"),
+                "Logging"
+            ]
         ),
         .testTarget(
             name: "S3TestTests",

Examples/S3Test/Sources/S3Test/main.swift

@@ -18,7 +18,7 @@ import Foundation
 #endif
 import LambdaSwiftSprinterNioPlugin
 import Logging
-import S3
+import AWSS3
 import NIO
 import NIOFoundationCompat
 import AWSSDKSwiftCore
@@ -36,18 +36,20 @@ let logger = Logger(label: "AWS.Lambda.S3Test")
 
 var s3: S3!
 
+let awsClient: AWSHTTPClient = httpClient as! AWSHTTPClient
+
 if ProcessInfo.processInfo.environment["LAMB_CI_EXEC"] == "1" {
     //Used for local test
     s3 = S3(region: .useast1, endpoint: "http://localstack:4572")
     logger.info("Endpoint-URI: http://localstack:4572")
-} else if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"],
+} else if let awsRegion = ProcessInfo.processInfo.environment["AWS_REGION"] {
     //The S3 Bucket must be in the same region of the Lambda
-    let region = Region(rawValue: awsRegion) {
-    s3 = S3(region: region)
+    let region = Region(rawValue: awsRegion)
+    s3 = S3(region: region, httpClientProvider: .shared(awsClient))
     logger.info("AWS_REGION: \(region)")
 } else {
     //Default configuration
-    s3 = S3(region: .useast1)
+    s3 = S3(region: .useast1, httpClientProvider: .shared(awsClient))
     logger.info("AWS_REGION: us-east-1")
 }