Issue 3469 dependency transition 18

Sources/App/Commands/Alerting.swift

@@ -245,7 +245,8 @@ extension [Alerting.BuildInfo] {
     }
 
     func validateRunnerIdsPresent() -> Alerting.Validation {
-        var notSeen = Set(Current.runnerIds())
+        @Dependency(\.environment) var environment
+        var notSeen = Set(environment.runnerIds())
         for build in self where build.runnerId != nil {
             notSeen.remove(build.runnerId!)
             if notSeen.isEmpty { return .ok }
@@ -254,7 +255,8 @@ extension [Alerting.BuildInfo] {
     }
 
     func validateRunnerIdsSuccessful() -> Alerting.Validation {
-        var noSuccess = Set(Current.runnerIds())
+        @Dependency(\.environment) var environment
+        var noSuccess = Set(environment.runnerIds())
         for build in self where build.runnerId != nil && build.status == .ok {
             noSuccess.remove(build.runnerId!)
             if noSuccess.isEmpty { return .ok }

Sources/App/Core/AppEnvironment.swift

@@ -31,13 +31,8 @@ struct AppEnvironment: Sendable {
     var gitlabPipelineToken: @Sendable () -> String?
     var gitlabPipelineLimit: @Sendable () -> Int
     var logger: @Sendable () -> Logger
-    var metricsPushGatewayUrl: @Sendable () -> String?
-    var plausibleBackendReportingSiteID: @Sendable () -> String?
-    var processingBuildBacklog: @Sendable () -> Bool
-    var runnerIds: @Sendable () -> [String]
     var setLogger: @Sendable (Logger) -> Void
     var shell: Shell
-    var siteURL: @Sendable () -> String
     var storeS3Readme: @Sendable (_ owner: String,
                                   _ repository: String,
                                   _ readme: String) async throws(S3Readme.Error) -> String
@@ -75,20 +70,8 @@ extension AppEnvironment {
             ?? Constants.defaultGitlabPipelineLimit
         },
         logger: { logger },
-        metricsPushGatewayUrl: { Environment.get("METRICS_PUSHGATEWAY_URL") },
-        plausibleBackendReportingSiteID: { Environment.get("PLAUSIBLE_BACKEND_REPORTING_SITE_ID") },
-        processingBuildBacklog: {
-            Environment.get("PROCESSING_BUILD_BACKLOG").flatMap(\.asBool) ?? false
-        },
-        runnerIds: {
-            Environment.get("RUNNER_IDS")
-                .map { Data($0.utf8) }
-                .flatMap { try? JSONDecoder().decode([String].self, from: $0) }
-            ?? []
-        },
         setLogger: { logger in Self.logger = logger },
         shell: .live,
-        siteURL: { Environment.get("SITE_URL") ?? "http://localhost:8080" },
         storeS3Readme: { owner, repo, readme throws(S3Readme.Error) in
             try await S3Readme.storeReadme(owner: owner, repository: repo, readme: readme)
         },

Sources/App/Core/AppMetrics.swift

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Dependencies
 import Metrics
 import Prometheus
 import Vapor
@@ -170,7 +171,8 @@ extension AppMetrics {
     /// scrape target.
     /// - Parameter client: client for POST request
     static func push(client: Client, jobName: String) async throws {
-        guard let pushGatewayUrl = Current.metricsPushGatewayUrl() else {
+        @Dependency(\.environment) var environment
+        guard let pushGatewayUrl = environment.metricsPushGatewayUrl() else {
             throw AppError.envVariableNotSet("METRICS_PUSHGATEWAY_URL")
         }
         let url = URI(string: "\(pushGatewayUrl)/metrics/job/\(jobName)")

Sources/App/Core/Dependencies/EnvironmentClient.swift

@@ -45,7 +45,11 @@ struct EnvironmentClient {
     var loadSPIManifest: @Sendable (String) -> SPIManifest.Manifest?
     var maintenanceMessage: @Sendable () -> String?
     var mastodonCredentials: @Sendable () -> Mastodon.Credentials?
+    var metricsPushGatewayUrl: @Sendable () -> String?
+    var plausibleBackendReportingSiteID: @Sendable () -> String?
+    var processingBuildBacklog: @Sendable () -> Bool = { XCTFail("processingBuildBacklog"); return false }
     var random: @Sendable (_ range: ClosedRange<Double>) -> Double = { XCTFail("random"); return Double.random(in: $0) }
+    var runnerIds: @Sendable () -> [String] = { XCTFail("runnerIds"); return [] }
 
     enum FailureMode: String {
         case fetchMetadataFailed
@@ -55,7 +59,8 @@ struct EnvironmentClient {
         case repositorySaveFailed
         case repositorySaveUniqueViolation
     }
-    var shouldFail: @Sendable (_ failureMode: FailureMode) -> Bool = { _ in false }
+    var shouldFail: @Sendable (_ failureMode: FailureMode) -> Bool = { _ in XCTFail("shouldFail"); return false }
+    var siteURL: @Sendable () -> String = { XCTFail("siteURL"); return "" }
 }
 
 
@@ -79,10 +84,7 @@ extension EnvironmentClient: DependencyKey {
             builderToken: { Environment.get("BUILDER_TOKEN") },
             buildTimeout: { Environment.get("BUILD_TIMEOUT").flatMap(Int.init) ?? 10 },
             buildTriggerAllowList: {
-                Environment.get("BUILD_TRIGGER_ALLOW_LIST")
-                    .map { Data($0.utf8) }
-                    .flatMap { try? JSONDecoder().decode([Package.Id].self, from: $0) }
-                ?? []
+                Environment.decode("BUILD_TRIGGER_ALLOW_LIST", as: [Package.Id].self) ?? []
             },
             buildTriggerDownscaling: {
                 Environment.get("BUILD_TRIGGER_DOWNSCALING")
@@ -118,14 +120,19 @@ extension EnvironmentClient: DependencyKey {
                 Environment.get("MASTODON_ACCESS_TOKEN")
                     .map(Mastodon.Credentials.init(accessToken:))
             },
+            metricsPushGatewayUrl: { Environment.get("METRICS_PUSHGATEWAY_URL") },
+            plausibleBackendReportingSiteID: { Environment.get("PLAUSIBLE_BACKEND_REPORTING_SITE_ID") },
+            processingBuildBacklog: {
+                Environment.get("PROCESSING_BUILD_BACKLOG").flatMap(\.asBool) ?? false
+            },
             random: { range in Double.random(in: range) },
+            runnerIds: { Environment.decode("RUNNER_IDS", as: [String].self) ?? [] },
             shouldFail: { failureMode in
-                let shouldFail = Environment.get("FAILURE_MODE")
-                    .map { Data($0.utf8) }
-                    .flatMap { try? JSONDecoder().decode([String: Double].self, from: $0) } ?? [:]
+                let shouldFail = Environment.decode("FAILURE_MODE", as: [String: Double].self) ?? [:]
                 guard let rate = shouldFail[failureMode.rawValue] else { return false }
                 return Double.random(in: 0...1) <= rate
-            }
+            },
+            siteURL: { Environment.get("SITE_URL") ?? "http://localhost:8080" }
         )
     }
 }
@@ -156,6 +163,8 @@ extension EnvironmentClient: TestDependencyKey {
         mock.appVersion = { "test" }
         mock.current = { .development }
         mock.hideStagingBanner = { false }
+        mock.siteURL = { "http://localhost:8080" }
+        mock.shouldFail = { @Sendable _ in false }
         return mock
     }
 }
@@ -167,3 +176,12 @@ extension DependencyValues {
         set { self[EnvironmentClient.self] = newValue }
     }
 }
+
+
+private extension Environment {
+    static func decode<T: Decodable>(_ key: String, as type: T.Type) -> T? {
+        Environment.get(key)
+            .map { Data($0.utf8) }
+            .flatMap { try? JSONDecoder().decode(type, from: $0) }
+    }
+}

Sources/App/Core/Plausible.swift

@@ -47,7 +47,8 @@ enum Plausible {
     static let postEventURL = "https://plausible.io/api/event"
 
     static func postEvent(kind: Event.Kind, path: Path, user: User?) async throws {
-        guard let siteID = Current.plausibleBackendReportingSiteID() else {
+        @Dependency(\.environment) var environment
+        guard let siteID = environment.plausibleBackendReportingSiteID() else {
             throw Error(message: "PLAUSIBLE_BACKEND_REPORTING_SITE_ID not set")
         }
         let body = try JSONEncoder().encode(Event(name: .pageview,

Sources/App/Core/SiteURL.swift

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Dependencies
 import Plot
 import Vapor
 
@@ -341,7 +342,8 @@ enum SiteURL: Resourceable, Sendable {
     }
 
     static let _absoluteURL: @Sendable (String) -> String = { path in
-        Current.siteURL() + relativeURL(path)
+        @Dependency(\.environment) var environment
+        return environment.siteURL() + relativeURL(path)
     }
 
     static let _relativeURL: @Sendable (String) -> String = { path in

Sources/App/Views/PackageController/GetRoute.Model+ext.swift

@@ -619,7 +619,9 @@ extension API.PackageController.GetRoute.Model {
     }
 
     func noCompatibilityInformationExplainer() -> Node<HTML.BodyContext> {
-        .if(Current.processingBuildBacklog(),
+        @Dependency(\.environment) var environment
+
+        return .if(environment.processingBuildBacklog(),
             .group(
                 .p(
                     .text("This package currently has no compatibility information. "),

Tests/AppTests/AlertingTests.swift

@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import XCTest
+
 @testable import App
 
-import XCTest
+import Dependencies
 
 
 class AlertingTests: XCTestCase {
@@ -77,34 +79,40 @@ class AlertingTests: XCTestCase {
 
     func test_validateRunnerIdsPresent() throws {
         let runnerIds = ["a", "b", "c"]
-        Current.runnerIds = { runnerIds }
-        let all = runnerIds.map {
-            Alerting.BuildInfo.mock(runnerId: $0)
+        withDependencies {
+            $0.environment.runnerIds = { runnerIds }
+        } operation: {
+            let all = runnerIds.map {
+                Alerting.BuildInfo.mock(runnerId: $0)
+            }
+            XCTAssertEqual(all.validateRunnerIdsPresent(), .ok)
+            XCTAssertEqual(all.filter { $0.runnerId != "a" }.validateRunnerIdsPresent(),
+                           .failed(reasons: ["Missing runner id: a"]))
+            XCTAssertEqual(all.filter { $0.runnerId != "a" && $0.runnerId != "b" }.validateRunnerIdsPresent(),
+                           .failed(reasons: ["Missing runner id: a", "Missing runner id: b"]))
         }
-        XCTAssertEqual(all.validateRunnerIdsPresent(), .ok)
-        XCTAssertEqual(all.filter { $0.runnerId != "a" }.validateRunnerIdsPresent(),
-                       .failed(reasons: ["Missing runner id: a"]))
-        XCTAssertEqual(all.filter { $0.runnerId != "a" && $0.runnerId != "b" }.validateRunnerIdsPresent(),
-                       .failed(reasons: ["Missing runner id: a", "Missing runner id: b"]))
     }
 
     func test_validateRunnerIdsSuccessful() throws {
         let runnerIds = ["a", "b", "c"]
-        Current.runnerIds = { runnerIds }
-        let all = runnerIds.map {
-            Alerting.BuildInfo.mock(runnerId: $0, status: .ok)
+        withDependencies {
+            $0.environment.runnerIds = { runnerIds }
+        } operation: {
+            let all = runnerIds.map {
+                Alerting.BuildInfo.mock(runnerId: $0, status: .ok)
+            }
+            XCTAssertEqual(all.validateRunnerIdsSuccessful(), .ok)
+            XCTAssertEqual(all.filter { $0.runnerId != "a" }.validateRunnerIdsSuccessful(),
+                           .failed(reasons: ["Runner id without successful builds: a"]))
+            XCTAssertEqual(
+                Array(all.filter { $0.runnerId != "a" })
+                    .appending(.mock(runnerId: "a", status: .failed))
+                    .validateRunnerIdsSuccessful(),
+                .failed(reasons: ["Runner id without successful builds: a"])
+            )
+            XCTAssertEqual(all.filter { $0.runnerId != "a" && $0.runnerId != "b" }.validateRunnerIdsSuccessful(),
+                           .failed(reasons: ["Runner id without successful builds: a", "Runner id without successful builds: b"]))
         }
-        XCTAssertEqual(all.validateRunnerIdsSuccessful(), .ok)
-        XCTAssertEqual(all.filter { $0.runnerId != "a" }.validateRunnerIdsSuccessful(),
-                       .failed(reasons: ["Runner id without successful builds: a"]))
-        XCTAssertEqual(
-            Array(all.filter { $0.runnerId != "a" })
-                .appending(.mock(runnerId: "a", status: .failed))
-            .validateRunnerIdsSuccessful(),
-            .failed(reasons: ["Runner id without successful builds: a"])
-        )
-        XCTAssertEqual(all.filter { $0.runnerId != "a" && $0.runnerId != "b" }.validateRunnerIdsSuccessful(),
-                       .failed(reasons: ["Runner id without successful builds: a", "Runner id without successful builds: b"]))
     }
 
     func test_validateSuccessRateInRange() throws {

Tests/AppTests/BuildTests.swift

@@ -133,9 +133,9 @@ class BuildTests: AppTestCase {
             $0.environment.awsDocsBucket = { "awsDocsBucket" }
             $0.environment.builderToken = { "builder token" }
             $0.environment.buildTimeout = { 10 }
+            $0.environment.siteURL = { "http://example.com" }
         } operation: {
             Current.gitlabPipelineToken = { "pipeline token" }
-            Current.siteURL = { "http://example.com" }
             // setup
             let p = try await savePackage(on: app.db, "1")
             let v = try Version(package: p, reference: .branch("main"))
@@ -201,11 +201,11 @@ class BuildTests: AppTestCase {
             $0.environment.awsDocsBucket = { "awsDocsBucket" }
             $0.environment.builderToken = { "builder token" }
             $0.environment.buildTimeout = { 10 }
+            $0.environment.siteURL = { "http://example.com" }
         } operation: {
             // Same test as test_trigger above, except we trigger with isDocBuild: true
             // and expect a 15m TIMEOUT instead of 10m
             Current.gitlabPipelineToken = { "pipeline token" }
-            Current.siteURL = { "http://example.com" }
             // setup
             let p = try await savePackage(on: app.db, "1")
             let v = try Version(package: p, reference: .branch("main"))