Issue 3655 swift testing cleanup

Package.swift

@@ -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,

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

@@ -14,17 +14,23 @@
 
 import Foundation
 
-import VaporToOpenAPI
 import DependencyResolution
 import PackageCollectionsSigning
 
+#warning("Keep this?")
+protocol WithExample { }
+
 
 // MARK: - External types
 
-extension Date: VaporToOpenAPI.WithExample {
+extension Date: WithExample {
     public static var example: Self { .init(rfc1123: "Sat, 25 Apr 2020 10:55:00 UTC")! }
 }
 
+extension UUID: WithExample {
+    static var example: Self { .init() }
+}
+
 
 // MARK: - Internal types
 
@@ -101,7 +107,7 @@
     }
 }
 
-extension PackageCollectionModel.V1.Collection: VaporToOpenAPI.WithExample {
+extension PackageCollectionModel.V1.Collection: WithExample {
     public static var example: Self {
         .init(name: "Packages by mona",
               overview: "A collection of packages authored by mona from the Swift Package Index",
@@ -120,7 +126,7 @@
     }
 }
 
-extension PackageCollectionModel.V1.Signature.Certificate: VaporToOpenAPI.WithExample {
+extension PackageCollectionModel.V1.Signature.Certificate: WithExample {
     public static var example: Self {
         .init(subject: .init(userID: "V676TFACYJ",
                              commonName: "Swift Package Collection: SPI Operations Limited",
@@ -133,13 +139,13 @@
     }
 }
 
-extension PackageCollectionModel.V1.Signature: VaporToOpenAPI.WithExample {
+extension PackageCollectionModel.V1.Signature: WithExample {
     public static var example: Self {
         .init(signature: "ewogICJhbGciIDogIlJ...<snip>...WD1pXXPrkvVJlv4w", certificate: .example)
     }
 }
 
-extension PackageCollectionSigning.Model.SignedCollection: VaporToOpenAPI.WithExample {
+extension PackageCollectionSigning.Model.SignedCollection: WithExample {
     public static var example: Self {
         .init(collection: .example, signature: .example)
     }

Sources/App/Core/AppMetrics.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/Core/Authentication/User.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.")
-    }
-}

Sources/App/Core/Extensions/PSQLError+ext.swift

@@ -14,7 +14,6 @@
 
 import PostgresKit
 
-extension PostgresNIO.PostgresError.Code: @unchecked Swift.Sendable {}
 
 extension PSQLError {
     // TODO: upstream to FluentKit's DatabaseError

Sources/App/configure.swift

@@ -19,7 +19,7 @@ import Vapor
 
 
 @discardableResult
-public func configure(_ app: Application) async throws -> String {
+public func configure(_ app: Application, databasePort: Int? = nil) async throws -> String {
     #if DEBUG && os(macOS)
     // The bundle is only loaded if /Applications/InjectionIII.app exists on the local development machine.
     // Requires InjectionIII 4.7.3 or higher to be loaded for compatibility with Package.swift files.
@@ -55,7 +55,7 @@ public func configure(_ app: Application) async throws -> String {
     // Setup database connection
     guard
         let host = Environment.get("DATABASE_HOST"),
-        let port = Environment.get("DATABASE_PORT").flatMap(Int.init),
+        let port = databasePort ?? Environment.get("DATABASE_PORT").flatMap(Int.init),
         let username = Environment.get("DATABASE_USERNAME"),
         let password = Environment.get("DATABASE_PASSWORD"),
         let database = Environment.get("DATABASE_NAME")

Sources/App/routes+documentation.swift

@@ -22,76 +22,76 @@ func docRoutes(_ app: Application) throws {
     // redirected to the fully formed documentation URL.
     app.get(":owner", ":repository", "documentation") { req -> Response in
         req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .documentation))
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", "documentation", "**") { req -> Response in
         req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .documentation))
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", "tutorials", "**") { req -> Response in
         req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .tutorials))
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "documentation") { req -> Response in
         req.redirect(to: SiteURL.relativeURL(for: try await req.getDocRedirect(), fragment: .documentation))
-    }.excludeFromOpenAPI()
+    }
 
     // Stable URLs with reference (real reference or ~)
     app.get(":owner", ":repository", ":reference", "documentation", ":archive") {
         let route = try await $0.getDocRoute(fragment: .documentation)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "documentation", ":archive", "**") {
         let route = try await $0.getDocRoute(fragment: .documentation)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", .fragment(.faviconIco)) {
         let route = try await $0.getDocRoute(fragment: .faviconIco)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", .fragment(.faviconSvg)) {
         let route = try await $0.getDocRoute(fragment: .faviconSvg)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "css", "**") {
         let route = try await $0.getDocRoute(fragment: .css)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "data", "**") {
         let route = try await $0.getDocRoute(fragment: .data)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "images", "**") {
         let fragment: DocRoute.Fragment = $0.parameters.hasSuffix(".svg", caseInsensitive: true) ? .svgImages : .images
         let route = try await $0.getDocRoute(fragment: fragment)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "img", "**") {
         let fragment: DocRoute.Fragment = $0.parameters.hasSuffix(".svg", caseInsensitive: true) ? .svgImg : .img
         let route = try await $0.getDocRoute(fragment: fragment)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "index", "**") {
         let route = try await $0.getDocRoute(fragment: .index)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "js", "**") {
         let route = try await $0.getDocRoute(fragment: .js)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", .fragment(.linkablePaths)) {
         let route = try await $0.getDocRoute(fragment: .linkablePaths)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", .fragment(.themeSettings)) {
         let route = try await $0.getDocRoute(fragment: .themeSettings)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "tutorials", "**") {
         let route = try await $0.getDocRoute(fragment: .tutorials)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
     app.get(":owner", ":repository", ":reference", "videos", "**") {
         let route = try await $0.getDocRoute(fragment: .videos)
         return try await PackageController.documentation(req: $0, route: route)
-    }.excludeFromOpenAPI()
+    }
 }