Merge branch 'feature/update-s3-example' into feature/amazonlinux2

Author: Andrea-Scuderi

.gitignore

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

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/README.md

@@ -22,9 +22,10 @@ import Foundation
 #endif
 import LambdaSwiftSprinterNioPlugin
 import Logging
-import S3
+import AWSS3
 import NIO
 import NIOFoundationCompat
+import AWSSDKSwiftCore
 
 struct Bucket: Codable {
     let name: String
@@ -39,7 +40,10 @@ struct Response: Codable {
 Change the region with the region of your S3 bucket.
 
 ```swift
-let s3 = S3(region: .euwest1)
+guard let awsClient: AWSHTTPClient = httpClient as? AWSHTTPClient else {
+    preconditionFailure()
+}
+let s3 = S3(region: .euwest1, httpClientProvider: .shared(awsClient))
 ```
 
 add a logger:

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,22 @@ let logger = Logger(label: "AWS.Lambda.S3Test")
 
 var s3: S3!
 
+guard let awsClient: AWSHTTPClient = httpClient as? AWSHTTPClient else {
+    preconditionFailure()
+}
+
 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")
 }