chore: Revert "feat(storage) AWS SDK S3 accelerate via useAccelerateE…

…ndpoint pluginOptions. (#3087)" (#3096) This reverts commit 54e1100.
aws-amplify · Jul 18, 2023 · d6c71c8 · d6c71c8
1 parent 54e1100
commit d6c71c8
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 502 deletions.
diff --git a/...fyPlugins/Storage/Sources/AWSS3StoragePlugin/AWSS3StoragePlugin+AsyncClientBehavior.swift b/...fyPlugins/Storage/Sources/AWSS3StoragePlugin/AWSS3StoragePlugin+AsyncClientBehavior.swift
@@ -30,13 +30,9 @@ extension AWSS3StoragePlugin {
         if let pluginOptions = options.pluginOptions as? AWSStorageGetURLOptions, pluginOptions.validateObjectExistence {
             try await storageService.validateObjectExistence(serviceKey: serviceKey)
         }
-        let accelerate = try AWSS3PluginOptions.accelerateValue(
-            pluginOptions: options.pluginOptions)
-        let result = try await storageService.getPreSignedURL(
-            serviceKey: serviceKey,
-            signingOperation: .getObject,
-            accelerate: accelerate,
-            expires: options.expires)
+        let result = try await storageService.getPreSignedURL(serviceKey: serviceKey,
+                                                              signingOperation: .getObject,
+                                                              expires: options.expires)
 
         let channel = HubChannel(from: categoryType)
         let payload = HubPayload(eventName: HubPayload.EventName.Storage.getURL, context: options, data: result)

diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Configuration/AWSS3PluginOptions.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Configuration/AWSS3PluginOptions.swift
diff --git a/...ugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderAdapter.swift b/...ugins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderAdapter.swift
@@ -34,13 +34,9 @@ class AWSS3PreSignedURLBuilderAdapter: AWSS3PreSignedURLBuilderBehavior {
     /// - Returns: Pre-Signed URL
     func getPreSignedURL(key: String,
                          signingOperation: AWSS3SigningOperation,
-                         accelerate: Bool? = nil,
                          expires: Int64? = nil) async throws -> URL {
         let expiresDate = Date(timeIntervalSinceNow: Double(expires ?? defaultExpiration))
         let expiration = expiresDate.timeIntervalSinceNow
-        let config = (accelerate == nil) ? self.config : S3ClientConfigurationProxy(
-            target: self.config,
-            accelerateOverride: accelerate)
         let preSignedUrl: URL?
         switch signingOperation {
         case .getObject:

diff --git a/...gins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderBehavior.swift b/...gins/Storage/Sources/AWSS3StoragePlugin/Dependency/AWSS3PreSignedURLBuilderBehavior.swift
@@ -12,36 +12,14 @@ import AWSS3
 import ClientRuntime
 import AWSClientRuntime
 
-/// - Tag: AWSS3PreSignedURLBuilderError
 enum AWSS3PreSignedURLBuilderError: Error {
-
-    /// Returned by an implementation of a
-    /// [AWSS3PreSignedURLBuilderBehavior](x-source-tag://AWSS3PreSignedURLBuilderBehavior)
-    ///
-    /// - Tag: AWSS3PreSignedURLBuilderError.failed
     case failed(reason: String, error: Error?)
 }
 
-/// Behavior that the implemenation class for AWSS3PreSignedURLBuilder will use.
-///
-/// - Tag: AWSS3PreSignedURLBuilderBehavior
+// Behavior that the implemenation class for AWSS3PreSignedURLBuilder will use.
 protocol AWSS3PreSignedURLBuilderBehavior {
 
-    /// Attempts to generate a pre-signed URL.
-    ///
-    /// - Parameters:
-    ///     - key: String represnting the key of an S3 object.
-    ///     - signingOperation: [AWSS3SigningOperation](x-source-tag://AWSS3SigningOperation)
-    ///                    (get, put, upload part) for which the URL will be generated.
-    ///     - accelerate: Optional boolean indicating wether or not to enable S3 bucket
-    ///                [transfer acceleration](https://docs.amplify.aws/lib/storage/transfer-acceleration/q/platform/js/)
-    ///     - expires: Int64 indicating the expiration as the number of milliseconds since the 1970 epoc.
+    /// Gets a pre-signed URL.
     /// - Returns: Pre-Signed URL
-    ///
-    /// - Tag: AWSS3PreSignedURLBuilderBehavior.getPreSignedURL
-    func getPreSignedURL(key: String,
-                         signingOperation: AWSS3SigningOperation,
-                         accelerate: Bool?,
-                         expires: Int64?) async throws -> URL
-
+    func getPreSignedURL(key: String, signingOperation: AWSS3SigningOperation, expires: Int64?) async throws -> URL
 }
diff --git a/...ifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/S3ClientConfigurationProxy.swift b/...ifyPlugins/Storage/Sources/AWSS3StoragePlugin/Dependency/S3ClientConfigurationProxy.swift
diff --git a/...gins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadDataOperation.swift b/...gins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadDataOperation.swift
@@ -91,8 +91,7 @@ class AWSS3StorageDownloadDataOperation: AmplifyInProcessReportingOperation<
             do {
                 let prefix = try await prefixResolver.resolvePrefix(for: request.options.accessLevel, targetIdentityId: request.options.targetIdentityId)
                 let serviceKey = prefix + request.key
-                let accelerate = try AWSS3PluginOptions.accelerateValue(pluginOptions: request.options.pluginOptions)
-                storageService.download(serviceKey: serviceKey, fileURL: nil, accelerate: accelerate) { [weak self] event in
+                storageService.download(serviceKey: serviceKey, fileURL: nil) { [weak self] event in
                     self?.onServiceEvent(event: event)
                 }
             } catch {

diff --git a/...gins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadFileOperation.swift b/...gins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageDownloadFileOperation.swift
@@ -94,8 +94,7 @@ class AWSS3StorageDownloadFileOperation: AmplifyInProcessReportingOperation<
             do {
                 let prefix = try await prefixResolver.resolvePrefix(for: request.options.accessLevel, targetIdentityId: request.options.targetIdentityId)
                 let serviceKey = prefix + request.key
-                let accelerate = try AWSS3PluginOptions.accelerateValue(pluginOptions: request.options.pluginOptions)
-                storageService.download(serviceKey: serviceKey, fileURL: self.request.local, accelerate: accelerate) { [weak self] event in
+                storageService.download(serviceKey: serviceKey, fileURL: self.request.local) { [weak self] event in
                     self?.onServiceEvent(event: event)
                 }
             } catch {

diff --git a/...lugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadDataOperation.swift b/...lugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadDataOperation.swift
@@ -92,21 +92,18 @@ class AWSS3StorageUploadDataOperation: AmplifyInProcessReportingOperation<
                 let prefix = try await prefixResolver.resolvePrefix(for: request.options.accessLevel, targetIdentityId: request.options.targetIdentityId)
                 let serviceKey = prefix + request.key
                 let serviceMetadata = StorageRequestUtils.getServiceMetadata(request.options.metadata)
-                let accelerate = try AWSS3PluginOptions.accelerateValue(pluginOptions: request.options.pluginOptions)
                 if request.data.count > StorageUploadDataRequest.Options.multiPartUploadSizeThreshold {
                     storageService.multiPartUpload(serviceKey: serviceKey,
                                                         uploadSource: .data(request.data),
                                                         contentType: request.options.contentType,
-                                                        metadata: serviceMetadata,
-                                                        accelerate: accelerate) { [weak self] event in
+                                                        metadata: serviceMetadata) { [weak self] event in
                         self?.onServiceEvent(event: event)
                     }
                 } else {
                     storageService.upload(serviceKey: serviceKey,
                                                uploadSource: .data(request.data),
                                                contentType: request.options.contentType,
-                                               metadata: serviceMetadata,
-                                               accelerate: accelerate) { [weak self] event in
+                                               metadata: serviceMetadata) { [weak self] event in
                         self?.onServiceEvent(event: event)
                     }
                 }

diff --git a/...lugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadFileOperation.swift b/...lugins/Storage/Sources/AWSS3StoragePlugin/Operation/AWSS3StorageUploadFileOperation.swift
@@ -116,21 +116,18 @@ class AWSS3StorageUploadFileOperation: AmplifyInProcessReportingOperation<
                 let prefix = try await prefixResolver.resolvePrefix(for: request.options.accessLevel, targetIdentityId: request.options.targetIdentityId)
                 let serviceKey = prefix + request.key
                 let serviceMetadata = StorageRequestUtils.getServiceMetadata(request.options.metadata)
-                let accelerate = try AWSS3PluginOptions.accelerateValue(pluginOptions: request.options.pluginOptions)
                 if uploadSize > StorageUploadFileRequest.Options.multiPartUploadSizeThreshold {
                     storageService.multiPartUpload(serviceKey: serviceKey,
                                                         uploadSource: .local(request.local),
                                                         contentType: request.options.contentType,
-                                                        metadata: serviceMetadata,
-                                                        accelerate: accelerate) { [weak self] event in
+                                                        metadata: serviceMetadata) { [weak self] event in
                         self?.onServiceEvent(event: event)
                     }
                 } else {
                     storageService.upload(serviceKey: serviceKey,
                                                uploadSource: .local(request.local),
                                                contentType: request.options.contentType,
-                                               metadata: serviceMetadata,
-                                               accelerate: accelerate) { [weak self] event in
+                                               metadata: serviceMetadata) { [weak self] event in
                         self?.onServiceEvent(event: event)
                     }
                 }

diff --git a/...age/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+DownloadBehavior.swift b/...age/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+DownloadBehavior.swift
@@ -12,8 +12,7 @@ extension AWSS3StorageService {
 
     func download(serviceKey: String,
                   fileURL: URL?,
-                  accelerate: Bool?,
-              onEvent: @escaping StorageServiceDownloadEventHandler) {
+                  onEvent: @escaping StorageServiceDownloadEventHandler) {
         let fail: (Error) -> Void = { error in
             let storageError = StorageError(error: error)
             onEvent(.failed(storageError))
@@ -28,10 +27,7 @@ extension AWSS3StorageService {
 
         Task {
             do {
-                let preSignedURL = try await preSignedURLBuilder.getPreSignedURL(key: serviceKey,
-                                                                                 signingOperation: .getObject,
-                                                                                 accelerate: accelerate,
-                                                                                 expires: nil)
+                let preSignedURL = try await preSignedURLBuilder.getPreSignedURL(key: serviceKey, signingOperation: .getObject, expires: nil)
                 startDownload(preSignedURL: preSignedURL, transferTask: transferTask)
             } catch {
                 onEvent(.failed(StorageError.unknown("Failed to get pre-signed URL", nil)))

diff --git a/...rces/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+GetPreSignedURLBehavior.swift b/...rces/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+GetPreSignedURLBehavior.swift
@@ -14,13 +14,8 @@ extension AWSS3StorageService {
 
     func getPreSignedURL(serviceKey: String,
                          signingOperation: AWSS3SigningOperation,
-                         accelerate: Bool?,
                          expires: Int) async throws -> URL {
-        return try await preSignedURLBuilder.getPreSignedURL(
-            key: serviceKey,
-            signingOperation: signingOperation,
-            accelerate: accelerate,
-            expires: Int64(expires))
+        return try await preSignedURLBuilder.getPreSignedURL(key: serviceKey, signingOperation: signingOperation, expires: Int64(expires))
     }
 
     func validateObjectExistence(serviceKey: String) async throws {

diff --git a/...rces/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+MultiPartUploadBehavior.swift b/...rces/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService+MultiPartUploadBehavior.swift
@@ -14,7 +14,6 @@ extension AWSS3StorageService {
                          uploadSource: UploadSource,
                          contentType: String?,
                          metadata: [String: String]?,
-                         accelerate: Bool?,
                          onEvent: @escaping StorageServiceMultiPartUploadEventHandler) {
         let fail: (Error) -> Void = { error in
             let storageError = StorageError(error: error)