From f30ce3d8bc04eb4631dabc8ea4c0a132ad4a84ba Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Wed, 21 Sep 2022 09:33:32 -0400 Subject: [PATCH 1/3] rebase dev-preview and add swiftlint plugin --- .../xcschemes/Amplify-Package.xcscheme | 14 +++++++ Package.swift | 38 +++++++++++++++--- Plugins/SwiftLintPlugin/plugin.swift | 33 ++++++++++++++++ Plugins/SwiftLintPlugin/swiftlint.yml | 39 +++++++++++++++++++ 4 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 Plugins/SwiftLintPlugin/plugin.swift create mode 100644 Plugins/SwiftLintPlugin/swiftlint.yml diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme index bab527ed83..3acd735fa6 100644 --- a/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/Amplify-Package.xcscheme @@ -328,6 +328,20 @@ ReferencedContainer = "container:"> + + + + [Command] { + dump(target) + return [ + .buildCommand( + displayName: "Linting \(target.name)", + executable: try context.tool(named: "swiftlint").path, + arguments: [ + "lint", + "--in-process-sourcekit", + "--path", + target.directory.string, + "--config", + "\(context.package.directory.string)/Plugins/SwiftLintPlugin/swiftlint.yml", + ], + environment: [:] + ) + ] + } +} diff --git a/Plugins/SwiftLintPlugin/swiftlint.yml b/Plugins/SwiftLintPlugin/swiftlint.yml new file mode 100644 index 0000000000..5c9bdcb74a --- /dev/null +++ b/Plugins/SwiftLintPlugin/swiftlint.yml @@ -0,0 +1,39 @@ +# Do not specify an `included` section at this top-level file. Specify the +# `--config` option pointing to this file, and the `--path` option to the files +# you wish to lint + +excluded: + - Pods + - .build + +analyzer_rules: + - unused_import + - unused_declaration + +opt_in_rules: + - empty_count + +# configurable rules can be customized from this configuration file +closing_brace: error +colon: + severity: error +comma: error +empty_count: warning +empty_enum_arguments: error +function_body_length: + warning: 100 + error: 150 +identifier_name: + excluded: + - id + - of + - or +line_length: + warning: 120 + error: 300 # 160 +opening_brace: error +return_arrow_whitespace: error +statement_position: + severity: error +todo: warning +trailing_semicolon: error From 2d88ae41a725b4c80d951b70123856fc99f32679 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Wed, 21 Sep 2022 09:50:14 -0400 Subject: [PATCH 2/3] add swiftlint:disable comments to resolve errors --- Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift | 2 +- Amplify/Core/Support/Amplify+Publisher.swift | 2 +- Amplify/Core/Support/AmplifyTask.swift | 2 +- .../Dependency/Pinpoint/Analytics/EventRecorder.swift | 4 ++-- .../Configuration/InitializeAuthConfiguration.swift | 4 ++-- .../CredentialStore/MigrateLegacyCredentialStore.swift | 2 +- .../VerifyDevicePasswordSRP+Calculations.swift | 2 +- .../SignIn/SRPAuth/VerifyPasswordSRP+Calculations.swift | 2 +- .../AWSCognitoAuthPlugin/SRP/AmplifySRPClient.swift | 8 ++++---- .../StateMachine/ErrorMapping/SignInError+Helper.swift | 2 +- .../Authentication/AuthenticationState+Resolver.swift | 2 +- .../Authorization/AuthorizationState+Resolver.swift | 2 +- .../RefreshSession/RefreshSessionState+Resolver.swift | 2 +- .../Resolvers/SignIn/SignInState+Resolver.swift | 2 +- .../Storage/CascadeDeleteOperation.swift | 2 +- ...AWSMutationDatabaseAdapter+MutationEventIngester.swift | 4 ++-- .../MutationEvent/MutationEventIngester.swift | 2 +- .../AWSDataStorePlugin/Sync/RemoteSyncEngine.swift | 2 +- .../Sync/RemoteSyncEngineBehavior.swift | 2 +- .../Service/Storage/AWSS3StorageService.swift | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift b/Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift index df15e7041b..bbb64d024b 100644 --- a/Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift +++ b/Amplify/Categories/Auth/AuthCategory+ClientBehavior.swift @@ -63,7 +63,7 @@ extension AuthCategory: AuthCategoryBehavior { } public func resetPassword(for username: String, options: AuthResetPasswordRequest.Options? = nil) async throws -> AuthResetPasswordResult { - return try await plugin.resetPassword(for: username,options: options) + return try await plugin.resetPassword(for: username,options: options) // swiftlint:disable:this comma } public func confirmResetPassword( diff --git a/Amplify/Core/Support/Amplify+Publisher.swift b/Amplify/Core/Support/Amplify+Publisher.swift index 0acad1205f..9a7d238426 100644 --- a/Amplify/Core/Support/Amplify+Publisher.swift +++ b/Amplify/Core/Support/Amplify+Publisher.swift @@ -47,7 +47,7 @@ public extension Amplify { } } } - .handleEvents(receiveCancel: { task.cancel() } ) + .handleEvents(receiveCancel: { task.cancel() } ) // swiftlint:disable:this closing_brace .eraseToAnyPublisher() } diff --git a/Amplify/Core/Support/AmplifyTask.swift b/Amplify/Core/Support/AmplifyTask.swift index c18b9635b2..ca5da3d2de 100644 --- a/Amplify/Core/Support/AmplifyTask.swift +++ b/Amplify/Core/Support/AmplifyTask.swift @@ -37,7 +37,7 @@ public protocol AmplifyInProcessReportingTask { } public extension AmplifyInProcessReportingTask where InProcess == Progress { - var progress : AmplifyAsyncSequence { + var progress : AmplifyAsyncSequence { // swiftlint:disable:this colon get async { await inProcess } diff --git a/AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Dependency/Pinpoint/Analytics/EventRecorder.swift b/AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Dependency/Pinpoint/Analytics/EventRecorder.swift index e92fbefb34..124d81ffb1 100644 --- a/AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Dependency/Pinpoint/Analytics/EventRecorder.swift +++ b/AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Dependency/Pinpoint/Analytics/EventRecorder.swift @@ -81,7 +81,7 @@ class EventRecorder: AnalyticsEventRecording { func submitAllEvents() async throws -> [PinpointEvent] { submittedEvents = [] let eventsBatch = try getBatchRecords() - if eventsBatch.count > 0 { + if eventsBatch.count > 0 { // swiftlint:disable:this empty_count let endpointProfile = await endpointClient.currentEndpointProfile() try await processBatch(eventsBatch, endpointProfile: endpointProfile) } @@ -96,7 +96,7 @@ class EventRecorder: AnalyticsEventRecording { try await submit(pinpointEvents: eventBatch, endpointProfile: endpointProfile) try storage.removeFailedEvents() let nextEventsBatch = try getBatchRecords() - if nextEventsBatch.count > 0 { + if nextEventsBatch.count > 0 { // swiftlint:disable:this empty_count try await processBatch(nextEventsBatch, endpointProfile: endpointProfile) } } diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/Configuration/InitializeAuthConfiguration.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/Configuration/InitializeAuthConfiguration.swift index 0cbb2acf54..c64c2e8d99 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/Configuration/InitializeAuthConfiguration.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/Configuration/InitializeAuthConfiguration.swift @@ -30,10 +30,10 @@ struct InitializeAuthConfiguration: Action { if case .amplifyCredentials(let fetchedCredentials) = data { credentials = fetchedCredentials } - } + } // swiftlint:disable:this statement_position catch KeychainStoreError.itemNotFound { logVerbose("No existing session found.", environment: environment) - } + } // swiftlint:disable:this statement_position catch { logError("Error when loading amplify credentials: \(error)", environment: environment) } diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift index c5df1e23fc..e62cb091a7 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift @@ -15,7 +15,7 @@ struct MigrateLegacyCredentialStore: Action { /// Legacy Keys private let AWSCredentialsProviderClassKey = "AWSCognitoCredentialsProvider" - private let UserPoolClassKey = "AWSCognitoIdentityUserPool" + private let UserPoolClassKey = "AWSCognitoIdentityUserPool" // swiftlint:disable:this identifier_name private let AWSCredentialsProviderKeychainAccessKeyId = "accessKey" private let AWSCredentialsProviderKeychainSecretAccessKey = "secretKey" private let AWSCredentialsProviderKeychainSessionToken = "sessionKey" diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/VerifyDevicePasswordSRP+Calculations.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/VerifyDevicePasswordSRP+Calculations.swift index 1a5e1f7b9d..24fe62ca2f 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/VerifyDevicePasswordSRP+Calculations.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/VerifyDevicePasswordSRP+Calculations.swift @@ -28,7 +28,7 @@ extension VerifyDevicePasswordSRP { do { let dateStr = stateData.clientTimestamp.utcString let clientClass = type(of: srpClient) - let u = try clientClass.calculateUHexValue( + let u = try clientClass.calculateUHexValue( // swiftlint:disable:this identifier_name clientPublicKeyHexValue: stateData.srpKeyPair.publicKeyHexValue, serverPublicKeyHexValue: serverPublicBHexString) // HKDF diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/VerifyPasswordSRP+Calculations.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/VerifyPasswordSRP+Calculations.swift index 0f4e83bfed..243e01b25d 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/VerifyPasswordSRP+Calculations.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/VerifyPasswordSRP+Calculations.swift @@ -28,7 +28,7 @@ extension VerifyPasswordSRP { let strippedPoolId = strippedPoolId(poolId) let dateStr = stateData.clientTimestamp.utcString let clientClass = type(of: srpClient) - let u = try clientClass.calculateUHexValue( + let u = try clientClass.calculateUHexValue( // swiftlint:disable:this identifier_name clientPublicKeyHexValue: stateData.srpKeyPair.publicKeyHexValue, serverPublicKeyHexValue: serverPublicBHexString) // HKDF diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/SRP/AmplifySRPClient.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/SRP/AmplifySRPClient.swift index bd76c0e862..e94c611adc 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/SRP/AmplifySRPClient.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/SRP/AmplifySRPClient.swift @@ -15,8 +15,8 @@ struct AmplifySRPClient: SRPClientBehavior { let client: SRPClientState init(NHexValue: String, gHexValue: String) throws { - guard let N = BigInt(NHexValue, radix: 16), - let g = BigInt(gHexValue, radix: 16) + guard let N = BigInt(NHexValue, radix: 16), // swiftlint:disable:this identifier_name + let g = BigInt(gHexValue, radix: 16) // swiftlint:disable:this identifier_name else { throw SRPError.numberConversion } @@ -36,7 +36,7 @@ struct AmplifySRPClient: SRPClientBehavior { return srpKeys } - func calculateSharedSecret(username: String, + func calculateSharedSecret(username: String, password: String, saltHexValue: String, clientPrivateKeyHexValue: String, @@ -78,7 +78,7 @@ struct AmplifySRPClient: SRPClientBehavior { let signedClientPublicKey = AmplifyBigIntHelper.getSignedData(num: clientPublicNum) let signedServerPublicKey = AmplifyBigIntHelper.getSignedData(num: serverPublicNum) - let u = SRPClientState.calculcateU(publicClientKey: signedClientPublicKey, + let u = SRPClientState.calculcateU(publicClientKey: signedClientPublicKey, // swiftlint:disable:this identifier_name publicServerKey: signedServerPublicKey) return u.asString(radix: 16) diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/ErrorMapping/SignInError+Helper.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/ErrorMapping/SignInError+Helper.swift index 00f4e99d15..a30d682d2a 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/ErrorMapping/SignInError+Helper.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/ErrorMapping/SignInError+Helper.swift @@ -57,7 +57,7 @@ extension SignInError { case .service(let serviceError, _) = cognitoError, case .passwordResetRequiredException = serviceError { return true - } else if let cognitoError = serviceError as? SdkError, + } else if let cognitoError = serviceError as? SdkError, // swiftlint:disable:this statement_position case .client(let clientError, _) = cognitoError, case .retryError(let retryError) = clientError, let cognitoServiceError = retryError as? SdkError, diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authentication/AuthenticationState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authentication/AuthenticationState+Resolver.swift index e0e3e7a6ce..a9cef59f6e 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authentication/AuthenticationState+Resolver.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authentication/AuthenticationState+Resolver.swift @@ -13,7 +13,7 @@ extension AuthenticationState { init() { } - func resolve( + func resolve( // swiftlint:disable:this cyclomatic_complexity oldState: StateType, byApplying event: StateMachineEvent ) -> StateResolution { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authorization/AuthorizationState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authorization/AuthorizationState+Resolver.swift index 2179a7c75d..3352046d51 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authorization/AuthorizationState+Resolver.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/Authorization/AuthorizationState+Resolver.swift @@ -15,7 +15,7 @@ extension AuthorizationState { init() { } - func resolve( + func resolve( // swiftlint:disable:this function_body_length cyclomatic_complexity oldState: StateType, byApplying event: StateMachineEvent ) -> StateResolution { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/RefreshSession/RefreshSessionState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/RefreshSession/RefreshSessionState+Resolver.swift index 30bce71f70..01db6196a0 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/RefreshSession/RefreshSessionState+Resolver.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/RefreshSession/RefreshSessionState+Resolver.swift @@ -14,7 +14,7 @@ extension RefreshSessionState { var defaultState: RefreshSessionState = .notStarted - func resolve(oldState: RefreshSessionState, + func resolve(oldState: RefreshSessionState, // swiftlint:disable:this cyclomatic_complexity byApplying event: StateMachineEvent) -> StateResolution { switch oldState { diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift index fdc0583007..d9925bde63 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift @@ -13,7 +13,7 @@ extension SignInState { typealias StateType = SignInState let defaultState = SignInState.notStarted - func resolve( + func resolve( // swiftlint:disable:this cyclomatic_complexity oldState: SignInState, byApplying event: StateMachineEvent) -> StateResolution { diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/CascadeDeleteOperation.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/CascadeDeleteOperation.swift index 3edd5067fb..1446399ec5 100644 --- a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/CascadeDeleteOperation.swift +++ b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/CascadeDeleteOperation.swift @@ -178,7 +178,7 @@ public class CascadeDeleteOperation: AsynchronousOperation { let associatedModelIds = queriedModels.map { $0.1.identifier(schema: modelSchema).stringValue } associatedModels.append(contentsOf: queriedModels) - associatedModels.append(contentsOf: await recurseQueryAssociatedModels(modelSchema: associatedModelSchema, ids: associatedModelIds)) + associatedModels.append(contentsOf: await recurseQueryAssociatedModels(modelSchema: associatedModelSchema, ids: associatedModelIds)) // swiftlint:disable:this comma } return associatedModels } diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/AWSMutationDatabaseAdapter/AWSMutationDatabaseAdapter+MutationEventIngester.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/AWSMutationDatabaseAdapter/AWSMutationDatabaseAdapter+MutationEventIngester.swift index 9e88d5c101..8d5ed45b8d 100644 --- a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/AWSMutationDatabaseAdapter/AWSMutationDatabaseAdapter+MutationEventIngester.swift +++ b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/AWSMutationDatabaseAdapter/AWSMutationDatabaseAdapter+MutationEventIngester.swift @@ -13,7 +13,7 @@ extension AWSMutationDatabaseAdapter: MutationEventIngester { /// Accepts a mutation event without a version, applies the latest version from the MutationSyncMetadata table, /// writes the updated mutation event to the local database, then submits it to `mutationEventSubject` - func submit(mutationEvent: MutationEvent, completion: @escaping (Result)->Void) { + func submit(mutationEvent: MutationEvent, completion: @escaping (Result)->Void) { // swiftlint:disable:this return_arrow_whitespace Task { log.verbose("\(#function): \(mutationEvent)") @@ -32,7 +32,7 @@ extension AWSMutationDatabaseAdapter: MutationEventIngester { /// rejects the event with an error func resolveConflictsThenSave(mutationEvent: MutationEvent, storageAdapter: StorageEngineAdapter, - completion: @escaping (Result)->Void) { + completion: @escaping (Result)->Void) { // swiftlint:disable:this return_arrow_whitespace // We don't want to query MutationSync because a) we already have the model, and b) delete mutations // are submitted *after* the delete has already been applied to the local data store, meaning there is no model diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/MutationEvent/MutationEventIngester.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/MutationEvent/MutationEventIngester.swift index 6a116d76e4..bbe1a65a6f 100644 --- a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/MutationEvent/MutationEventIngester.swift +++ b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/MutationSync/MutationEvent/MutationEventIngester.swift @@ -10,5 +10,5 @@ import Combine /// Ingests MutationEvents from and writes them to the MutationEvent persistent store protocol MutationEventIngester: AnyObject { - func submit(mutationEvent: MutationEvent, completion: @escaping (Result)->Void) + func submit(mutationEvent: MutationEvent, completion: @escaping (Result)->Void) // swiftlint:disable:this return_arrow_whitespace } diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngine.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngine.swift index 7ebead0060..8a32c406c3 100644 --- a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngine.swift +++ b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngine.swift @@ -238,7 +238,7 @@ class RemoteSyncEngine: RemoteSyncEngineBehavior { } } - func submit(_ mutationEvent: MutationEvent, completion: @escaping (Result)->Void) { + func submit(_ mutationEvent: MutationEvent, completion: @escaping (Result)->Void) { // swiftlint:disable:this return_arrow_whitespace mutationEventIngester.submit(mutationEvent: mutationEvent, completion: completion) } diff --git a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngineBehavior.swift b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngineBehavior.swift index 5ad4e4e3f0..48510eb222 100644 --- a/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngineBehavior.swift +++ b/AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/RemoteSyncEngineBehavior.swift @@ -47,7 +47,7 @@ protocol RemoteSyncEngineBehavior: AnyObject { /// Submits a new mutation for synchronization to the remote API. The response will be handled by the appropriate /// reconciliation queue - func submit(_ mutationEvent: MutationEvent, completion: @escaping (Result)->Void) + func submit(_ mutationEvent: MutationEvent, completion: @escaping (Result)->Void) // swiftlint:disable:this return_arrow_whitespace var publisher: AnyPublisher { get } } diff --git a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift index eae556550d..37f98d5c9e 100644 --- a/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift +++ b/AmplifyPlugins/Storage/Sources/AWSS3StoragePlugin/Service/Storage/AWSS3StorageService.swift @@ -56,7 +56,7 @@ class AWSS3StorageService: AWSS3StorageServiceBehaviour, StorageServiceProxy { let awsS3 = AWSS3Adapter(s3Client, config: clientConfig) let preSignedURLBuilder = AWSS3PreSignedURLBuilderAdapter(config: clientConfig, bucket: bucket) - var _sessionConfiguration: URLSessionConfiguration + var _sessionConfiguration: URLSessionConfiguration // swiftlint:disable:this identifier_name if let sessionConfiguration = sessionConfiguration { _sessionConfiguration = sessionConfiguration } else { From dc20be260c848b5d3b9f84f18e12ff549e1d8636 Mon Sep 17 00:00:00 2001 From: Ian Saultz <52051793+atierian@users.noreply.github.com> Date: Fri, 23 Sep 2022 10:12:58 -0400 Subject: [PATCH 3/3] more swiftlint:disable and add cache path to plugin --- .../CredentialStore/MigrateLegacyCredentialStore.swift | 4 ++-- .../Resolvers/SignIn/SignInState+Resolver.swift | 2 +- Plugins/SwiftLintPlugin/plugin.swift | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift index e62cb091a7..4f2940196c 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/CredentialStore/MigrateLegacyCredentialStore.swift @@ -22,8 +22,8 @@ struct MigrateLegacyCredentialStore: Action { private let AWSCredentialsProviderKeychainExpiration = "expiration" private let AWSCredentialsProviderKeychainIdentityId = "identityId" - private let FederationProviderKey = "federationProvider" - private let LoginsMapKey = "loginsMap" + private let FederationProviderKey = "federationProvider" // swiftlint:disable:this identifier_name + private let LoginsMapKey = "loginsMap" // swiftlint:disable:this identifier_name private let AWSCognitoAuthUserPoolCurrentUser = "currentUser" private let AWSCognitoAuthUserAccessToken = "accessToken" diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift index d9925bde63..7266821b0b 100644 --- a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift +++ b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift @@ -13,7 +13,7 @@ extension SignInState { typealias StateType = SignInState let defaultState = SignInState.notStarted - func resolve( // swiftlint:disable:this cyclomatic_complexity + func resolve( // swiftlint:disable:this cyclomatic_complexity function_body_length oldState: SignInState, byApplying event: StateMachineEvent) -> StateResolution { diff --git a/Plugins/SwiftLintPlugin/plugin.swift b/Plugins/SwiftLintPlugin/plugin.swift index 29b8f295af..8bf129f3de 100644 --- a/Plugins/SwiftLintPlugin/plugin.swift +++ b/Plugins/SwiftLintPlugin/plugin.swift @@ -13,7 +13,7 @@ struct SwiftLintPlugin: BuildToolPlugin { context: PluginContext, target: Target ) async throws -> [Command] { - dump(target) + print(context.pluginWorkDirectory) return [ .buildCommand( displayName: "Linting \(target.name)", @@ -21,10 +21,13 @@ struct SwiftLintPlugin: BuildToolPlugin { arguments: [ "lint", "--in-process-sourcekit", - "--path", - target.directory.string, + "--cache-path", + "\(context.pluginWorkDirectory)", "--config", "\(context.package.directory.string)/Plugins/SwiftLintPlugin/swiftlint.yml", +// "--path", + target.directory.string + ], environment: [:] )