Merge branch 'main' into workflow-concurrency

SwiftPackageIndex · Sep 20, 2024 · 2c5f743 · 2c5f743
2 parents e5e777d + f0c425a
commit 2c5f743
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 31 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,13 +1,13 @@
 {
-  "originHash" : "8165f317edf94270b303443d3d5684a9957c9db9662dcc4d3ea9dfa58ccbdb62",
+  "originHash" : "6ae7335a682b3be27994b6ef856d2a166455a5b43a582f9c17da2f694763ca42",
   "pins" : [
     {
       "identity" : "async-http-client",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/swift-server/async-http-client.git",
       "state" : {
-        "revision" : "11205411bb60612f0a1a04f733fa71b4fb864ab9",
-        "version" : "1.22.1"
+        "revision" : "6df8e1c17e68f0f93de2443b8c8cafca9ddcc89a",
+        "version" : "1.22.2"
       }
     },
     {
@@ -19,6 +19,15 @@
         "version" : "1.20.0"
       }
     },
+    {
+      "identity" : "big-num",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/adam-fowler/big-num.git",
+      "state" : {
+        "revision" : "5c5511ad06aeb2b97d0868f7394e14a624bfb1c7",
+        "version" : "2.0.2"
+      }
+    },
     {
       "identity" : "cache",
       "kind" : "remoteSourceControl",
@@ -175,7 +184,7 @@
     {
       "identity" : "shellquote",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/SwiftPackageIndex/ShellQuote.git",
+      "location" : "https://github.com/SwiftPackageIndex/ShellQuote",
       "state" : {
         "revision" : "5f555550c30ef43d64b36b40c2c291a95d62580c",
         "version" : "1.0.2"
@@ -186,26 +195,44 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/soto-project/soto.git",
       "state" : {
-        "revision" : "7f1225d1992debad64d6f0adec4dfc2c15a49367",
-        "version" : "7.0.0"
+        "revision" : "c28c3efa72e6beceae6f38f8c8fe18e7c57e3418",
+        "version" : "6.8.0"
+      }
+    },
+    {
+      "identity" : "soto-cognito-authentication",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/vapor-community/soto-cognito-authentication.git",
+      "state" : {
+        "revision" : "6c4740e61e121a9c299d7d0e5c41df008d41f48a",
+        "version" : "4.0.0"
+      }
+    },
+    {
+      "identity" : "soto-cognito-authentication-kit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/soto-project/soto-cognito-authentication-kit.git",
+      "state" : {
+        "revision" : "a505426e32dad89755b4b3334409f288c4f9aa04",
+        "version" : "4.2.0"
       }
     },
     {
       "identity" : "soto-core",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/soto-project/soto-core.git",
       "state" : {
-        "revision" : "86145a0e6a5091bf124fc18aa029698c4c419b1a",
-        "version" : "7.0.0"
+        "revision" : "3ed66ec536bc372360d7e3ec39a5e8b1870747ea",
+        "version" : "6.5.2"
       }
     },
     {
       "identity" : "spimanifest",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SwiftPackageIndex/SPIManifest.git",
       "state" : {
-        "revision" : "218e4390e6062d5887810e3f178d6fd103eb8b6f",
-        "version" : "1.5.1"
+        "revision" : "dad0c2f1c386816b4c39c09e75be552ca8d5a798",
+        "version" : "1.6.0"
       }
     },
     {
@@ -307,15 +334,6 @@
         "version" : "1.3.3"
       }
     },
-    {
-      "identity" : "swift-distributed-tracing",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-distributed-tracing.git",
-      "state" : {
-        "revision" : "11c756c5c4d7de0eeed8595695cadd7fa107aa19",
-        "version" : "1.1.1"
-      }
-    },
     {
       "identity" : "swift-driver",
       "kind" : "remoteSourceControl",
@@ -433,15 +451,6 @@
         "version" : "0.13.0"
       }
     },
-    {
-      "identity" : "swift-service-context",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-service-context.git",
-      "state" : {
-        "revision" : "0c62c5b4601d6c125050b5c3a97f20cce881d32b",
-        "version" : "1.1.0"
-      }
-    },
     {
       "identity" : "swift-service-lifecycle",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -42,7 +42,8 @@ let package = Package(
         .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0"),
         .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.11.1"),
         .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"),
-        .package(url: "https://github.com/soto-project/soto.git", from: "7.0.0"),
+        .package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
+        .package(url: "https://github.com/vapor-community/soto-cognito-authentication.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/fluent-postgres-driver.git", from: "2.0.0"),
         .package(url: "https://github.com/vapor/fluent.git", from: "4.0.0"),
         .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.13.0"),
@@ -72,6 +73,7 @@ let package = Package(
                     .product(name: "SwiftPMPackageCollections", package: "swift-package-manager"),
                     .product(name: "Vapor", package: "vapor"),
                     .product(name: "VaporToOpenAPI", package: "VaporToOpenAPI"),
+                    .product(name: "SotoCognitoAuthentication", package: "soto-cognito-authentication")
                 ],
                 swiftSettings: swiftSettings,
                 linkerSettings: [.unsafeFlags(["-Xlinker", "-interposable"],

diff --git a/Sources/S3Store/S3Store.swift b/Sources/S3Store/S3Store.swift
@@ -31,12 +31,13 @@ public struct S3Store {
     }
 
     public func save(payload: Data, to key: Key) async throws {
-        let client = AWSClient(credentialProvider: .static(accessKeyId: credentials.keyId, secretAccessKey: credentials.secret))
+        let client = AWSClient(credentialProvider: .static(accessKeyId: credentials.keyId, secretAccessKey: credentials.secret),
+                               httpClientProvider: .createNew)
         do {
             let s3 = S3(client: client, region: Self.region)
             let req = S3.PutObjectRequest(
                 acl: .publicRead,  // requires "Block all public access" to be "off"
-                body: .init(buffer: .init(data: payload)),
+                body: .data(payload),
                 bucket: key.bucket,
                 key: key.path
             )