Skip to content

Issue 3655 swift testing cleanup #3718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 10, 2025
Merged

Issue 3655 swift testing cleanup #3718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5a9c5c9
Remove unused SnapshotTestCase
finestructure Mar 8, 2025
b4dd86c
Drop PostgresNIO.PostgresError.Code Sendable annotation
finestructure Mar 8, 2025
cb69d0c
Use proper locking in AppMetrics
finestructure Mar 7, 2025
e84ce77
Drop VaporToOpenAPI
finestructure Mar 8, 2025
2a6a622
configure accepts `databasePort: Int?` input
finestructure Mar 6, 2025
79a3fa3
Update AppTestCase
finestructure Mar 8, 2025
b32d42b
Make databasePort optional
finestructure Mar 8, 2025
dc97f44
Remove AppTestCase and move pieces into individual files
finestructure Mar 8, 2025
4ff77ed
Drop #warning
finestructure Mar 10, 2025
f21aa51
Drop WithExample protocol + extensions
finestructure Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VaporToOpenAPI is not thread-safe. It causes crashes when running tests in parallel. Rather than create openapi.json dynamically on the fly from the routes, we should switch to using the swift-openapi-generator.

Since the OpenAPI spec isn't a critical piece I've simply removed it for now.

.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"),
Expand Down Expand Up @@ -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,
Expand Down
296 changes: 0 additions & 296 deletions Sources/App/Controllers/API/Types+WithExample.swift
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions Sources/App/Core/AppMetrics.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
13 changes: 0 additions & 13 deletions Sources/App/Core/Authentication/User.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import Authentication
import Dependencies
import JWTKit
import Vapor
import VaporToOpenAPI


struct User: Authenticatable, Equatable {
Expand Down Expand Up @@ -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.")
}
}
Loading
Loading