Strict Concurrency Support (#10)

* Declare Sendable conformances

* Enable strict concurrency checking

* Address Sendable warnings

* Fix warning

* Upgrade AWS SDK

* Replace use of ISO8601DateFormatter

* Replace SwiftLint plugin with Danger Swift

* SwiftLint fixes

* Remove macOS  directive

* Update toolchain

* Replace @retroactive with fully qualified names

Author: mgacy

.github/workflows/danger.yml

@@ -0,0 +1,26 @@
+name: Run Danger
+on:
+  workflow_dispatch:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  build:
+    if: github.event.pull_request.draft == false
+    name: Run Danger
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+    steps:
+      - name: Git checkout
+        uses: actions/checkout@v4
+      - name: Danger
+        uses: 417-72KI/danger-swiftlint@v5.9
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dangerfile.swift

@@ -0,0 +1,15 @@
+import Danger
+
+extension String: Error {}
+
+let danger = Danger()
+
+if danger.github.pullRequest.body == nil {
+    danger.fail("Please add a description to this Pull Request")
+}
+
+SwiftLint
+    .lint(
+        .all(directory: nil),
+        configFile: ".swiftlint.yml"
+    )

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -12,7 +12,7 @@ let package = Package(
         .library(name: "Secrets", targets: ["Secrets"])
     ],
     dependencies: [
-        .package(url: "https://github.com/awslabs/aws-sdk-swift.git", from: "0.19.0")
+        .package(url: "https://github.com/awslabs/aws-sdk-swift.git", from: "1.0.0")
     ],
     targets: [
         .testTarget(
@@ -30,7 +30,7 @@ let package = Package(
     ]
 )
 
-let genericTargets: [Target] = [
+let regularTargets: [Target] = [
     .target(
         name: "EmailSender",
         dependencies: [
@@ -51,11 +51,8 @@ let genericTargets: [Target] = [
     )
 ]
 
-#if os(macOS)
-package.dependencies.append(.package(url: "https://github.com/realm/SwiftLint.git", exact: "0.54.0"))
-for target in genericTargets {
-    target.plugins = [.plugin(name: "SwiftLintPlugin", package: "SwiftLint")]
+for target in regularTargets {
+    target.swiftSettings = [.enableExperimentalFeature("StrictConcurrency")]
 }
-#endif
 
-package.targets.append(contentsOf: genericTargets)
+package.targets.append(contentsOf: regularTargets)

Package.swift

@@ -4,7 +4,7 @@ Swifty helpers for working with the Swift [AWS SDK](https://github.com/awslabs/a
 
 ## 📱 Requirements
 
-Swift 5.7 toolchain with Swift Package Manager.
+Swift 5.9 toolchain with Swift Package Manager.
 
 ## 🖥 Installation
 

README.md

@@ -5,11 +5,11 @@
 //  Created by Mathew Gacy on 12/8/23.
 //
 
-import AWSSES
+@preconcurrency import AWSSES
 import Foundation
 
 /// A type that sends emails.
-public struct EmailSender {
+public struct EmailSender: Sendable {
     /// A closure returning a message ID after sending an email.
     public var send: @Sendable (Recipients, Sender, Subject, Body) async throws -> MessageID?
 

Sources/EmailSender/EmailSender.swift

@@ -5,7 +5,7 @@
 //  Created by Mathew Gacy on 12/8/23.
 //
 
-import AWSDynamoDB
+@preconcurrency import AWSDynamoDB
 import Foundation
 
 /// Represents the data for an attribute. Each attribute value is described as a name-value pair.
@@ -15,7 +15,7 @@ import Foundation
 public typealias AttributeValue = DynamoDBClientTypes.AttributeValue
 
 /// A type that persists collections of attributes.
-public struct Persistence {
+public struct Persistence: Sendable {
     /// A closure to modify the attributes of persisted values.
     ///
     /// Use this to add additional attributes like a timestamp or to perform validation of all
@@ -67,7 +67,7 @@ public extension Persistence {
 }
 
 /// A type that creates ``Persistence`` instances.
-public struct PersistenceFactory {
+public struct PersistenceFactory: Sendable {
     /// The region where the table is located.
     public typealias Region = String
 

Sources/Persistence/Persistence.swift

@@ -8,21 +8,28 @@
 import Foundation
 
 /// A class of types providing user-readable representations of dates.
-public protocol DateFormatting {
+public protocol DateFormatting: Sendable {
     /// Returns a string representation of the specified date.
     ///
     /// - Parameter date: The date to be represented.
     /// - Returns: A user-readable string representing the date.
     func string(from date: Date) -> String
 }
 
-extension DateFormatter: DateFormatting {}
-
-extension ISO8601DateFormatter: DateFormatting {}
+extension DateFormatter: DateFormatting {
+    public static let iso8601: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZZZZ"
+        formatter.calendar = Calendar(identifier: .iso8601)
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        return formatter
+    }()
+}
 
 /// A type to provide timestamps.
-public struct TimestampProvider {
-    private let dateProvider: () -> Date
+public struct TimestampProvider: Sendable {
+    private let dateProvider: @Sendable () -> Date
     private let formatter: any DateFormatting
 
     /// Creates an instance.
@@ -31,7 +38,7 @@ public struct TimestampProvider {
     ///   - dateProvider: A closure returning the current date.
     ///   - formatter: The date formatter to use to format the current date.
     public init(
-        dateProvider: @escaping () -> Date,
+        dateProvider: @escaping @Sendable () -> Date,
         formatter: DateFormatting
     ) {
         self.dateProvider = dateProvider
@@ -48,7 +55,7 @@ public extension TimestampProvider {
     /// A live implementation.
     static var live: Self {
         .init(
-            dateProvider: Date.init,
-            formatter: ISO8601DateFormatter())
+            dateProvider: { Date() },
+            formatter: DateFormatter.iso8601)
     }
 }

Sources/Persistence/TimestampProvider.swift

@@ -32,6 +32,22 @@ protocol SecretValue: Equatable {
     var secretString: String? { get }
 }
 
+extension AWSSecretsManager.GetSecretValueOutput: Swift.Equatable {
+    public static func == (lhs: GetSecretValueOutput, rhs: GetSecretValueOutput) -> Bool {
+        lhs.arn == rhs.arn
+        && lhs.name == rhs.name
+        && lhs.secretBinary == rhs.secretBinary
+        && lhs.secretString == rhs.secretString
+    }
+}
 extension GetSecretValueOutput: SecretValue {}
 
+extension AWSSecretsManager.SecretsManagerClientTypes.SecretValueEntry: Swift.Equatable {
+    public static func == (lhs: SecretsManagerClientTypes.SecretValueEntry, rhs: SecretsManagerClientTypes.SecretValueEntry) -> Bool {
+        lhs.arn == rhs.arn
+        && lhs.name == rhs.name
+        && lhs.secretBinary == rhs.secretBinary
+        && lhs.secretString == rhs.secretString
+    }
+}
 extension SecretsManagerClientTypes.SecretValueEntry: SecretValue {}

Sources/Secrets/SecretValue.swift

@@ -5,7 +5,7 @@
 //  Created by Mathew Gacy on 12/22/23.
 //
 
-import AWSSecretsManager
+@preconcurrency import AWSSecretsManager
 import Foundation
 
 /// A secret stored by AWS Secrets Manager.