Replace swift format with swift-format (#626)

* swift-format

* Update CONTRIBUTING.md

Author: adam-fowler

.github/workflows/validate.yml

@@ -5,16 +5,12 @@ on:
 
 jobs:
   validate:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
     - name: Checkout
       uses: actions/checkout@v4
       with:
         fetch-depth: 1
-    - name: Install Dependencies
-      run: |
-        brew install mint
-        mint install nicklockwood/swiftformat@0.53.10 --no-link
     - name: run script
       run: ./scripts/validate.sh

.swift-format

@@ -0,0 +1,63 @@
+{
+  "version" : 1,
+  "indentation" : {
+    "spaces" : 4
+  },
+  "tabWidth" : 4,
+  "fileScopedDeclarationPrivacy" : {
+    "accessLevel" : "private"
+  },
+  "spacesAroundRangeFormationOperators" : false,
+  "indentConditionalCompilationBlocks" : false,
+  "indentSwitchCaseLabels" : false,
+  "lineBreakAroundMultilineExpressionChainComponents" : false,
+  "lineBreakBeforeControlFlowKeywords" : false,
+  "lineBreakBeforeEachArgument" : true,
+  "lineBreakBeforeEachGenericRequirement" : true,
+  "lineLength" : 150,
+  "maximumBlankLines" : 1,
+  "respectsExistingLineBreaks" : true,
+  "prioritizeKeepingFunctionOutputTogether" : true,
+  "multiElementCollectionTrailingCommas" : true,
+  "rules" : {
+    "AllPublicDeclarationsHaveDocumentation" : false,
+    "AlwaysUseLiteralForEmptyCollectionInit" : false,
+    "AlwaysUseLowerCamelCase" : false,
+    "AmbiguousTrailingClosureOverload" : true,
+    "BeginDocumentationCommentWithOneLineSummary" : false,
+    "DoNotUseSemicolons" : true,
+    "DontRepeatTypeInStaticProperties" : true,
+    "FileScopedDeclarationPrivacy" : true,
+    "FullyIndirectEnum" : true,
+    "GroupNumericLiterals" : true,
+    "IdentifiersMustBeASCII" : true,
+    "NeverForceUnwrap" : false,
+    "NeverUseForceTry" : false,
+    "NeverUseImplicitlyUnwrappedOptionals" : false,
+    "NoAccessLevelOnExtensionDeclaration" : true,
+    "NoAssignmentInExpressions" : true,
+    "NoBlockComments" : true,
+    "NoCasesWithOnlyFallthrough" : true,
+    "NoEmptyTrailingClosureParentheses" : true,
+    "NoLabelsInCasePatterns" : true,
+    "NoLeadingUnderscores" : false,
+    "NoParensAroundConditions" : true,
+    "NoVoidReturnOnFunctionSignature" : true,
+    "OmitExplicitReturns" : true,
+    "OneCasePerLine" : true,
+    "OneVariableDeclarationPerLine" : true,
+    "OnlyOneTrailingClosureArgument" : true,
+    "OrderedImports" : true,
+    "ReplaceForEachWithForLoop" : true,
+    "ReturnVoidInsteadOfEmptyTuple" : true,
+    "UseEarlyExits" : false,
+    "UseExplicitNilCheckInConditions" : false,
+    "UseLetInEveryBoundCaseVariable" : false,
+    "UseShorthandTypeNames" : true,
+    "UseSingleLinePropertyGetter" : false,
+    "UseSynthesizedInitializer" : false,
+    "UseTripleSlashForDocumentationComments" : true,
+    "UseWhereClausesInForLoops" : false,
+    "ValidateDocumentationComments" : false
+  }
+}

.swiftformat

@@ -10,9 +10,12 @@ let package = Package(
         .package(name: "Benchmark", url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
     ],
     targets: [
-        .target(name: "soto-benchmark", dependencies: [
-            .product(name: "SotoCore", package: "soto-core"),
-            .product(name: "Benchmark", package: "Benchmark"),
-        ]),
+        .target(
+            name: "soto-benchmark",
+            dependencies: [
+                .product(name: "SotoCore", package: "soto-core"),
+                .product(name: "Benchmark", package: "Benchmark"),
+            ]
+        )
     ]
 )

Benchmark/Package.swift

@@ -65,13 +65,25 @@ let awsClientSuite = BenchmarkSuite(name: "AWSClient", settings: Iterations(1000
         middlewares: [RequestThrowMiddleware()]
     )
     let jsonService = AWSServiceConfig(
-        region: .useast1, partition: .aws, service: "test-service", serviceProtocol: .json(version: "1.1"), apiVersion: "10-10-2010"
+        region: .useast1,
+        partition: .aws,
+        service: "test-service",
+        serviceProtocol: .json(version: "1.1"),
+        apiVersion: "10-10-2010"
     )
     let xmlService = AWSServiceConfig(
-        region: .useast1, partition: .aws, service: "test-service", serviceProtocol: .restxml, apiVersion: "10-10-2010"
+        region: .useast1,
+        partition: .aws,
+        service: "test-service",
+        serviceProtocol: .restxml,
+        apiVersion: "10-10-2010"
     )
     let queryService = AWSServiceConfig(
-        region: .useast1, partition: .aws, service: "test-service", serviceProtocol: .query, apiVersion: "10-10-2010"
+        region: .useast1,
+        partition: .aws,
+        service: "test-service",
+        serviceProtocol: .query,
+        apiVersion: "10-10-2010"
     )
 
     suite.benchmark("empty-request") {

Benchmark/Sources/soto-benchmark/AWSClientSuite.swift

@@ -22,10 +22,20 @@ let awsSignerV4Suite = BenchmarkSuite(name: "AWSSignerV4", settings: Iterations(
     let signer = AWSSigner(credentials: credentials, name: "s3", region: "eu-west-1")
 
     suite.benchmark("sign-headers") {
-        _ = signer.signHeaders(url: URL(string: "https://test-bucket.s3.amazonaws.com/test-put.txt")!, method: .GET, headers: ["Content-Type": "application/x-www-form-urlencoded; charset=utf-8"], body: .string(string))
+        _ = signer.signHeaders(
+            url: URL(string: "https://test-bucket.s3.amazonaws.com/test-put.txt")!,
+            method: .GET,
+            headers: ["Content-Type": "application/x-www-form-urlencoded; charset=utf-8"],
+            body: .string(string)
+        )
     }
 
     suite.benchmark("sign-url") {
-        _ = signer.signURL(url: URL(string: "https://test-bucket.s3.amazonaws.com/test-put.txt")!, method: .GET, body: .string(string), expires: .hours(1))
+        _ = signer.signURL(
+            url: URL(string: "https://test-bucket.s3.amazonaws.com/test-put.txt")!,
+            method: .GET,
+            body: .string(string),
+            expires: .hours(1)
+        )
     }
 }

Benchmark/Sources/soto-benchmark/AWSSignerV4Suite.swift

@@ -15,6 +15,7 @@
 import Benchmark
 import Foundation
 import SotoCore
+
 #if compiler(>=5.10)
 internal import SotoXML
 #else

Benchmark/Sources/soto-benchmark/EncoderSuites.swift

@@ -28,15 +28,15 @@ The main development branch of the repository is  `main`. Each major version rel
 
 ### Formatting
 
-We use Nick Lockwood's SwiftFormat for formatting code. PRs will not be accepted if they haven't be formatted. The current version of SwiftFormat we are using is v0.53.10.
+We use Apple's swift-format for formatting code. PRs will not be accepted if they haven't be formatted.
 
 All new files need to include the following file header at the top
 ```swift
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Soto for AWS open source project
 //
-// Copyright (c) 2017-2020 the Soto project authors
+// Copyright (c) 2017-2024 the Soto project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information

CONTRIBUTING.md

@@ -76,20 +76,23 @@ let package = Package(
             ],
             swiftSettings: swiftSettings
         ),
-        .target(name: "SotoTestUtils", dependencies: [
-            .byName(name: "SotoCore"),
-            .byName(name: "SotoXML"),
-            .product(name: "Logging", package: "swift-log"),
-            .product(name: "NIO", package: "swift-nio"),
-            .product(name: "NIOFoundationCompat", package: "swift-nio"),
-            .product(name: "NIOHTTP1", package: "swift-nio"),
-            .product(name: "NIOPosix", package: "swift-nio"),
-            .product(name: "NIOTestUtils", package: "swift-nio"),
-        ]),
+        .target(
+            name: "SotoTestUtils",
+            dependencies: [
+                .byName(name: "SotoCore"),
+                .byName(name: "SotoXML"),
+                .product(name: "Logging", package: "swift-log"),
+                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOFoundationCompat", package: "swift-nio"),
+                .product(name: "NIOHTTP1", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
+                .product(name: "NIOTestUtils", package: "swift-nio"),
+            ]
+        ),
         .target(
             name: "SotoXML",
             dependencies: [
-                .byName(name: "CSotoExpat"),
+                .byName(name: "CSotoExpat")
             ],
             swiftSettings: swiftSettings
         ),
@@ -107,16 +110,25 @@ let package = Package(
                 .product(name: "NIOPosix", package: "swift-nio"),
             ]
         ),
-        .testTarget(name: "SotoSignerV4Tests", dependencies: [
-            .byName(name: "SotoSignerV4"),
-        ]),
-        .testTarget(name: "SotoXMLTests", dependencies: [
-            .byName(name: "SotoXML"),
-            .byName(name: "SotoCore"),
-        ]),
-        .testTarget(name: "INIParserTests", dependencies: [
-            .byName(name: "INIParser"),
-        ]),
+        .testTarget(
+            name: "SotoSignerV4Tests",
+            dependencies: [
+                .byName(name: "SotoSignerV4")
+            ]
+        ),
+        .testTarget(
+            name: "SotoXMLTests",
+            dependencies: [
+                .byName(name: "SotoXML"),
+                .byName(name: "SotoCore"),
+            ]
+        ),
+        .testTarget(
+            name: "INIParserTests",
+            dependencies: [
+                .byName(name: "INIParser")
+            ]
+        ),
     ],
     swiftLanguageVersions: [.v5, .version("6")]
 )

Package.swift

@@ -22,8 +22,8 @@ public final class INIParser {
     internal var _sections: [String: [String: String]] = [:]
     internal var _anonymousSection: [String: String] = [:]
 
-    public var sections: [String: [String: String]] { return self._sections }
-    public var anonymousSection: [String: String] { return self._anonymousSection }
+    public var sections: [String: [String: String]] { self._sections }
+    public var anonymousSection: [String: String] { self._anonymousSection }
 
     public enum Error: Swift.Error {
         case invalidSyntax

Sources/INIParser/INIParser.swift

@@ -71,8 +71,8 @@ extension AWSClient {
                 if let input {
                     let output = try await self.sequence.command(input, self.sequence.logger)
                     if let token = output[keyPath: sequence.outputKey],
-                       sequence.inputKey == nil || token != input[keyPath: sequence.inputKey!],
-                       sequence.moreResultsKey == nil || output[keyPath: sequence.moreResultsKey!] == true
+                        sequence.inputKey == nil || token != input[keyPath: sequence.inputKey!],
+                        sequence.moreResultsKey == nil || output[keyPath: sequence.moreResultsKey!] == true
                     {
                         self.input = input.usingPaginationToken(token)
                     } else {
@@ -86,7 +86,7 @@ extension AWSClient {
 
         /// Make async iterator
         public func makeAsyncIterator() -> AsyncIterator {
-            return AsyncIterator(sequence: self)
+            AsyncIterator(sequence: self)
         }
     }
 }