Skip to content

chore(storage): resolve swiftformat errors and warnings #3852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 11, 2024
Merged

chore(storage): resolve swiftformat errors and warnings #3852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b69b17e
chore(storage): resolve swiftformat errors and warnings
phantumcode Sep 3, 2024
3a2d81a
updated swiftformat rules
phantumcode Sep 9, 2024
2326834
update rules
phantumcode Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
142 changes: 83 additions & 59 deletions ...fyPlugins/Storage/Sources/AWSS3StoragePlugin/AWSS3StoragePlugin+AsyncClientBehavior.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

import Foundation

import AWSS3
import Amplify
import AWSPluginsCore
import AWSS3

extension AWSS3StoragePlugin {
public extension AWSS3StoragePlugin {

@discardableResult
public func getURL(
func getURL(
key: String,
options: StorageGetURLOperation.Request.Options? = nil
) async throws -> URL {
Expand All @@ -24,8 +24,10 @@ extension AWSS3StoragePlugin {
throw error
}
let prefixResolver = storageConfiguration.prefixResolver ?? StorageAccessLevelAwarePrefixResolver(authService: authService)
let prefix = try await prefixResolver.resolvePrefix(for: options.accessLevel,
targetIdentityId: options.targetIdentityId)
let prefix = try await prefixResolver.resolvePrefix(
for: options.accessLevel,
targetIdentityId: options.targetIdentityId
)
let serviceKey = prefix + request.key
if let pluginOptions = options.pluginOptions as? AWSStorageGetURLOptions, pluginOptions.validateObjectExistence {
try await storageService.validateObjectExistence(serviceKey: serviceKey)
Expand All @@ -37,186 +39,206 @@ extension AWSS3StoragePlugin {
signingOperation: .getObject,
metadata: nil,
accelerate: accelerate,
expires: options.expires)
expires: options.expires
)

let channel = HubChannel(from: categoryType)
let payload = HubPayload(eventName: HubPayload.EventName.Storage.getURL, context: options, data: result)
Amplify.Hub.dispatch(to: channel, payload: payload)
return result
}

public func getURL(
func getURL(
path: any StoragePath,
options: StorageGetURLOperation.Request.Options? = nil
) async throws -> URL {
let options = options ?? StorageGetURLRequest.Options()
let request = StorageGetURLRequest(path: path, options: options)
let task = AWSS3StorageGetURLTask(
request,
storageBehaviour: storageService)
storageBehaviour: storageService
)
return try await task.value
}

public func downloadData(
func downloadData(
path: any StoragePath,
options: StorageDownloadDataOperation.Request.Options? = nil
) -> StorageDownloadDataTask {
let options = options ?? StorageDownloadDataRequest.Options()
let request = StorageDownloadDataRequest(path: path, options: options)
let operation = AWSS3StorageDownloadDataOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageDownloadDataOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func downloadData(
func downloadData(
key: String,
options: StorageDownloadDataOperation.Request.Options? = nil
) -> StorageDownloadDataTask {
let options = options ?? StorageDownloadDataRequest.Options()
let request = StorageDownloadDataRequest(key: key, options: options)
let operation = AWSS3StorageDownloadDataOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageDownloadDataOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func downloadFile(
func downloadFile(
key: String,
local: URL,
options: StorageDownloadFileOperation.Request.Options? = nil
) -> StorageDownloadFileTask {
let options = options ?? StorageDownloadFileRequest.Options()
let request = StorageDownloadFileRequest(key: key, local: local, options: options)
let operation = AWSS3StorageDownloadFileOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageDownloadFileOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func downloadFile(
func downloadFile(
path: any StoragePath,
local: URL,
options: StorageDownloadFileOperation.Request.Options? = nil
) -> StorageDownloadFileTask {
let options = options ?? StorageDownloadFileRequest.Options()
let request = StorageDownloadFileRequest(path: path, local: local, options: options)
let operation = AWSS3StorageDownloadFileOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageDownloadFileOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func uploadData(
func uploadData(
key: String,
data: Data,
options: StorageUploadDataOperation.Request.Options? = nil
) -> StorageUploadDataTask {
let options = options ?? StorageUploadDataRequest.Options()
let request = StorageUploadDataRequest(key: key, data: data, options: options)
let operation = AWSS3StorageUploadDataOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageUploadDataOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func uploadData(
func uploadData(
path: any StoragePath,
data: Data,
options: StorageUploadDataOperation.Request.Options? = nil
) -> StorageUploadDataTask {
let options = options ?? StorageUploadDataRequest.Options()
let request = StorageUploadDataRequest(path: path, data: data, options: options)
let operation = AWSS3StorageUploadDataOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageUploadDataOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func uploadFile(
func uploadFile(
key: String,
local: URL,
options: StorageUploadFileOperation.Request.Options? = nil
) -> StorageUploadFileTask {
let options = options ?? StorageUploadFileRequest.Options()
let request = StorageUploadFileRequest(key: key, local: local, options: options)
let operation = AWSS3StorageUploadFileOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageUploadFileOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func uploadFile(
func uploadFile(
path: any StoragePath,
local: URL,
options: StorageUploadFileOperation.Request.Options? = nil
) -> StorageUploadFileTask {
let options = options ?? StorageUploadFileRequest.Options()
let request = StorageUploadFileRequest(path: path, local: local, options: options)
let operation = AWSS3StorageUploadFileOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageUploadFileOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyInProcessReportingOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return taskAdapter
}

@discardableResult
public func remove(
func remove(
key: String,
options: StorageRemoveOperation.Request.Options? = nil
) async throws -> String {
let options = options ?? StorageRemoveRequest.Options()
let request = StorageRemoveRequest(key: key, options: options)
let operation = AWSS3StorageRemoveOperation(request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService)
let operation = AWSS3StorageRemoveOperation(
request,
storageConfiguration: storageConfiguration,
storageService: storageService,
authService: authService
)
let taskAdapter = AmplifyOperationTaskAdapter(operation: operation)
queue.addOperation(operation)

return try await taskAdapter.value
}

@discardableResult
public func remove(
func remove(
path: any StoragePath,
options: StorageRemoveOperation.Request.Options? = nil
) async throws -> String {
Expand All @@ -225,11 +247,12 @@ extension AWSS3StoragePlugin {
let task = AWSS3StorageRemoveTask(
request,
storageConfiguration: storageConfiguration,
storageBehaviour: storageService)
storageBehaviour: storageService
)
return try await task.value
}

public func list(
func list(
options: StorageListRequest.Options? = nil
) async throws -> StorageListResult {
let options = options ?? StorageListRequest.Options()
Expand All @@ -244,7 +267,7 @@ extension AWSS3StoragePlugin {
return result
}

public func list(
func list(
path: any StoragePath,
options: StorageListRequest.Options? = nil
) async throws -> StorageListResult {
Expand All @@ -253,11 +276,12 @@ extension AWSS3StoragePlugin {
let task = AWSS3StorageListObjectsTask(
request,
storageConfiguration: storageConfiguration,
storageBehaviour: storageService)
storageBehaviour: storageService
)
return try await task.value
}

public func handleBackgroundEvents(identifier: String) async -> Bool {
func handleBackgroundEvents(identifier: String) async -> Bool {
await withCheckedContinuation { (continuation: CheckedContinuation<Bool, Never>) in
StorageBackgroundEventsRegistry.handleBackgroundEvents(identifier: identifier, continuation: continuation)
}
Expand Down
6 changes: 3 additions & 3 deletions AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/AWSS3StoragePlugin+ClientBehavior.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@

import Foundation

import AWSS3
import Amplify
import AWSPluginsCore
import AWSS3

extension AWSS3StoragePlugin {
public extension AWSS3StoragePlugin {

/// Retrieve the escape hatch to perform low level operations on S3.
///
/// - Returns: S3 client
///
/// - Tag: AWSS3StoragePlugin.getEscapeHatch
public func getEscapeHatch() -> S3Client {
func getEscapeHatch() -> S3Client {
return storageService.getEscapeHatch()
}
}
Loading
Loading