chore(storage): renames type to AWSS3SigningOperation and adds uploadPart case (#100)

Author: brennanMKE

AmplifyPlugins/Storage/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderAdapter.swift

@@ -32,17 +32,20 @@ class AWSS3PreSignedURLBuilderAdapter: AWSS3PreSignedURLBuilderBehavior {
 
     /// Gets pre-signed URL.
     /// - Returns: Pre-Signed URL
-    func getPreSignedURL(key: String, method: AWSS3HttpMethod, expires: Int64? = nil) -> URL? {
+    func getPreSignedURL(key: String, signingOperation: AWSS3SigningOperation, expires: Int64? = nil) -> URL? {
         let expiresDate = Date(timeIntervalSinceNow: Double(expires ?? defaultExpiration))
         let expiration = Int64(expiresDate.timeIntervalSinceNow)
         let preSignedUrl: URL?
-        switch method {
-        case .get:
+        switch signingOperation {
+        case .getObject:
             let input = GetObjectInput(bucket: bucket, key: key)
             preSignedUrl = input.presignURL(config: config, expiration: expiration)
-        case .put:
+        case .putObject:
             let input = PutObjectInput(bucket: bucket, key: key)
             preSignedUrl = input.presignURL(config: config, expiration: expiration)
+        case .uploadPart(let partNumber, let uploadId):
+            let input = UploadPartInput(bucket: bucket, key: key, partNumber: partNumber, uploadId: uploadId)
+            preSignedUrl = input.presignURL(config: config, expiration: expiration)
         }
         return urlWithEscapedToken(preSignedUrl)
     }

AmplifyPlugins/Storage/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderBehavior.swift

@@ -12,10 +12,6 @@ import AWSS3
 import ClientRuntime
 import AWSClientRuntime
 
-public enum AWSS3HttpMethod {
-    case get
-    case put
-}
 
 enum AWSS3PreSignedURLBuilderError: Error {
     case failed(reason: String, error: Error?)
@@ -26,18 +22,18 @@ protocol AWSS3PreSignedURLBuilderBehavior {
 
     /// Gets a pre-signed URL.
     /// - Returns: Pre-Signed URL
-    func getPreSignedURL(key: String, method: AWSS3HttpMethod, expires: Int64?) -> URL?
+    func getPreSignedURL(key: String, signingOperation: AWSS3SigningOperation, expires: Int64?) -> URL?
 
 }
 
 extension AWSS3PreSignedURLBuilderBehavior {
 
-    func getPreSignedURL(key: String, method: AWSS3HttpMethod) -> URL? {
-        getPreSignedURL(key: key, method: method, expires: nil)
+    func getPreSignedURL(key: String, signingOperation: AWSS3SigningOperation) -> URL? {
+        getPreSignedURL(key: key, signingOperation: signingOperation, expires: nil)
     }
 
     func getPreSignedURL(key: String) -> URL? {
-        getPreSignedURL(key: key, method: .get, expires: nil)
+        getPreSignedURL(key: key, signingOperation: .getObject, expires: nil)
     }
 
 }

AmplifyPlugins/Storage/AWSS3StoragePlugin/Dependency/AWSS3SigningOperation.swift

@@ -0,0 +1,14 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+public enum AWSS3SigningOperation {
+    case getObject
+    case putObject
+    case uploadPart(partNumber: Int, uploadId: String)
+}

AmplifyPlugins/Storage/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+GetPreSignedURLBehavior.swift

@@ -11,7 +11,7 @@ import Amplify
 extension AWSS3StorageService {
 
     func getPreSignedURL(serviceKey: String,
-                         method: AWSS3HttpMethod = .get, 
+                         signingOperation: AWSS3SigningOperation = .getObject, 
                          expires: Int,
                          onEvent: @escaping StorageServiceGetPreSignedURLEventHandler) {
         guard let preSignedURL = preSignedURLBuilder.getPreSignedURL(key: serviceKey) else {

AmplifyPlugins/Storage/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+UploadBehavior.swift

@@ -31,7 +31,7 @@ extension AWSS3StorageService {
 
         let contentType = contentType ?? "application/octet-stream"
 
-        guard let preSignedURL = preSignedURLBuilder.getPreSignedURL(key: serviceKey, method: .put) else {
+        guard let preSignedURL = preSignedURLBuilder.getPreSignedURL(key: serviceKey, signingOperation: .putObject) else {
             onEvent(.failed(StorageError.unknown("Failed to get pre-signed URL", nil)))
             return
         }

AmplifyPlugins/Storage/AWSS3StoragePlugin/Service/Storage/AWSS3StorageServiceBehaviour.swift

@@ -42,7 +42,7 @@ protocol AWSS3StorageServiceBehaviour {
                   onEvent: @escaping StorageServiceDownloadEventHandler)
 
     func getPreSignedURL(serviceKey: String,
-                         method: AWSS3HttpMethod,
+                         signingOperation: AWSS3SigningOperation,
                          expires: Int,
                          onEvent: @escaping StorageServiceGetPreSignedURLEventHandler)
 
@@ -70,6 +70,6 @@ extension AWSS3StorageServiceBehaviour {
     func getPreSignedURL(serviceKey: String,
                          expires: Int,
                          onEvent: @escaping StorageServiceGetPreSignedURLEventHandler) {
-        getPreSignedURL(serviceKey: serviceKey, method: .get, expires: expires, onEvent: onEvent)
+        getPreSignedURL(serviceKey: serviceKey, signingOperation: .getObject, expires: expires, onEvent: onEvent)
     }
 }

AmplifyPlugins/Storage/AWSS3StoragePlugin/Support/Internal/StorageMultipartUploadClient.swift

@@ -86,7 +86,8 @@ class DefaultStorageMultipartUploadClient: StorageMultipartUploadClient {
     func uploadPart(partNumber: PartNumber, multipartUpload: StorageMultipartUpload, subTask: StorageTransferTask) throws {
         guard let serviceProxy = serviceProxy else { fatalError("Service Proxy is required") }
 
-        guard let uploadFile = multipartUpload.uploadFile,
+        guard let uploadId = multipartUpload.uploadId,
+              let uploadFile = multipartUpload.uploadFile,
               let partSize = multipartUpload.partSize,
               let part = multipartUpload.part(for: partNumber) else {
                   fatalError("Part number is required")
@@ -121,7 +122,8 @@ class DefaultStorageMultipartUploadClient: StorageMultipartUploadClient {
             do {
                 let partialFileURL = try result.get()
 
-                guard let preSignedURL = serviceProxy.preSignedURLBuilder.getPreSignedURL(key: self.key, method: .put) else {
+                let operation = AWSS3SigningOperation.uploadPart(partNumber: partNumber, uploadId: uploadId)
+                guard let preSignedURL = serviceProxy.preSignedURLBuilder.getPreSignedURL(key: self.key, signingOperation: operation) else {
                     self.session?.fail(error: StorageError.unknown("Failed to get pre-signed URL", nil))
                     return
                 }

AmplifyPlugins/Storage/AWSS3StoragePluginTests/Mocks/MockAWSS3StorageService.swift

@@ -80,7 +80,7 @@ public class MockAWSS3StorageService: AWSS3StorageServiceBehaviour {
     }
 
     public func getPreSignedURL(serviceKey: String,
-                         method: AWSS3HttpMethod = .get,
+                         signingOperation: AWSS3SigningOperation = .getObject,
                          expires: Int,
                          onEvent: @escaping StorageServiceGetPreSignedURLEventHandler) {
         getPreSignedURLCalled += 1