Merge pull request #3718 from SwiftPackageIndex/issue-3655-swift-testing-cleanup

Issue 3655 swift testing cleanup

Author: finestructure

Package.resolved

@@ -36,7 +36,6 @@ let package = Package(
         .package(url: "https://github.com/SwiftPackageIndex/SemanticVersion.git", from: "0.3.0"),
         .package(url: "https://github.com/SwiftPackageIndex/ShellOut.git", from: "3.1.4"),
         .package(url: "https://github.com/swiftlang/swift-package-manager.git", branch: "release/5.10"),
-        .package(url: "https://github.com/dankinsoid/VaporToOpenAPI.git", from: "4.4.4"),
         .package(url: "https://github.com/pointfreeco/swift-custom-dump.git", from: "1.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.8.0"),
         .package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0"),
@@ -75,7 +74,6 @@ let package = Package(
                     .product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
                     .product(name: "SwiftPMPackageCollections", package: "swift-package-manager"),
                     .product(name: "Vapor", package: "vapor"),
-                    .product(name: "VaporToOpenAPI", package: "VaporToOpenAPI"),
                     .product(name: "SotoCognitoAuthentication", package: "soto-cognito-authentication")
                 ],
                 swiftSettings: swiftSettings,

Package.swift

@@ -15,17 +15,18 @@
 import Dependencies
 import Metrics
 import Prometheus
+import Synchronization
 import Vapor
 
 
 enum AppMetrics {
 
-    nonisolated(unsafe) static var initialized = false
+    static let initialized = Mutex(false)
 
     static func bootstrap() {
         // prevent tests from boostrapping multiple times
-        guard !initialized else { return }
-        defer { initialized = true }
+        guard !initialized.withLock({ $0 }) else { return }
+        defer { initialized.withLock{ $0 = true } }
         let client = PrometheusClient()
         MetricsSystem.bootstrap(PrometheusMetricsFactory(client: client))
     }

Sources/App/Controllers/API/Types+WithExample.swift

@@ -16,7 +16,6 @@ import Authentication
 import Dependencies
 import JWTKit
 import Vapor
-import VaporToOpenAPI
 
 
 struct User: Authenticatable, Equatable {
@@ -67,15 +66,3 @@ extension User {
         }
     }
 }
-
-
-extension AuthSchemeObject {
-    static var apiBearerToken: Self {
-        .bearer(id: "api_token",
-               description: "Token used for API access.")
-    }
-    static var builderBearerToken: Self {
-        .bearer(id: "builder_token",
-               description: "Token used for build result reporting.")
-    }
-}