Move Current.gitlabPipelineLimit to BuildSystem.gitlabPipelineLimit

Author: finestructure

Sources/App/Commands/TriggerBuilds.swift

@@ -207,6 +207,7 @@ func triggerBuilds(on database: Database,
     AppMetrics.buildRunningJobsCount?.set(runningJobs)
 
     let newJobs = ActorIsolated(0)
+    let gitlabPipelineLimit = environment.gitlabPipelineLimit
 
     await withThrowingTaskGroup(of: Void.self) { group in
         for pkgId in packages {
@@ -219,7 +220,7 @@ func triggerBuilds(on database: Database,
             group.addTask {
                 // check if we have capacity to schedule more builds before querying for builds
                 var newJobCount = await newJobs.value
-                guard pendingJobs + newJobCount < Current.gitlabPipelineLimit() else {
+                guard pendingJobs + newJobCount < gitlabPipelineLimit() else {
                     Current.logger().info("too many pending pipelines (\(pendingJobs + newJobCount))")
                     return
                 }
@@ -228,7 +229,7 @@ func triggerBuilds(on database: Database,
                 let triggers = try await findMissingBuilds(database, packageId: pkgId)
 
                 newJobCount = await newJobs.value
-                guard pendingJobs + newJobCount < Current.gitlabPipelineLimit() else {
+                guard pendingJobs + newJobCount < gitlabPipelineLimit() else {
                     Current.logger().info("too many pending pipelines (\(pendingJobs + newJobCount))")
                     return
                 }

Sources/App/Core/AppEnvironment.swift

@@ -25,7 +25,6 @@ import FoundationNetworking
 struct AppEnvironment: Sendable {
     var fileManager: FileManager
     var git: Git
-    var gitlabPipelineLimit: @Sendable () -> Int
     var logger: @Sendable () -> Logger
     var setLogger: @Sendable (Logger) -> Void
     var shell: Shell
@@ -38,10 +37,6 @@ extension AppEnvironment {
     static let live = AppEnvironment(
         fileManager: .live,
         git: .live,
-        gitlabPipelineLimit: {
-            Environment.get("GITLAB_PIPELINE_LIMIT").flatMap(Int.init)
-            ?? Constants.defaultGitlabPipelineLimit
-        },
         logger: { logger },
         setLogger: { logger in Self.logger = logger },
         shell: .live

Sources/App/Core/Dependencies/EnvironmentClient.swift

@@ -42,6 +42,7 @@ struct EnvironmentClient {
     var current: @Sendable () -> Environment = { XCTFail("current"); return .development }
     var dbId: @Sendable () -> String?
     var gitlabApiToken: @Sendable () -> String?
+    var gitlabPipelineLimit: @Sendable () -> Int = { XCTFail("gitlabPipelineLimit"); return 100 }
     var gitlabPipelineToken: @Sendable () -> String?
     var hideStagingBanner: @Sendable () -> Bool = { XCTFail("hideStagingBanner"); return Constants.defaultHideStagingBanner }
     var loadSPIManifest: @Sendable (String) -> SPIManifest.Manifest?
@@ -112,6 +113,10 @@ extension EnvironmentClient: DependencyKey {
             current: { (try? Environment.detect()) ?? .development },
             dbId: { Environment.get("DATABASE_ID") },
             gitlabApiToken: { Environment.get("GITLAB_API_TOKEN") },
+            gitlabPipelineLimit: {
+                Environment.get("GITLAB_PIPELINE_LIMIT").flatMap(Int.init)
+                ?? Constants.defaultGitlabPipelineLimit
+            },
             gitlabPipelineToken: { Environment.get("GITLAB_PIPELINE_TOKEN") },
             hideStagingBanner: {
                 Environment.get("HIDE_STAGING_BANNER").flatMap(\.asBool)

Tests/AppTests/BuildTriggerTests.swift

@@ -569,6 +569,7 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.buildTimeout = { 10 }
             $0.environment.buildTriggerAllowList = { [] }
             $0.environment.buildTriggerDownscaling = { 1 }
+            $0.environment.gitlabPipelineLimit = { 300 }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.random = { @Sendable _ in 0 }
             $0.environment.siteURL = { "http://example.com" }
@@ -587,7 +588,6 @@ class BuildTriggerTests: AppTestCase {
         } operation: {
             // Ensure we respect the pipeline limit when triggering builds
             // setup
-            Current.gitlabPipelineLimit = { 300 }
             var triggerCount = 0
             let client = MockClient { _, res in
                 triggerCount += 1
@@ -696,6 +696,7 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.buildTriggerAllowList = { [] }
             $0.environment.buildTriggerDownscaling = { 1 }
             $0.environment.buildTriggerLatestSwiftVersionDownscaling = { 1 }
+            $0.environment.gitlabPipelineLimit = { 300 }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.random = { @Sendable _ in 0 }
             $0.environment.siteURL = { "http://example.com" }
@@ -714,7 +715,6 @@ class BuildTriggerTests: AppTestCase {
         } operation: {
             // Ensure we respect the pipeline limit when triggering builds for multiple package ids
             // setup
-            Current.gitlabPipelineLimit = { 300 }
             let client = MockClient { _, res in
                 triggerCount.withLockedValue { $0 += 1 }
                 try? res.content.encode(
@@ -748,13 +748,13 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.builderToken = { "builder token" }
             $0.environment.buildTriggerAllowList = { [] }
             $0.environment.buildTriggerDownscaling = { 1 }
+            $0.environment.gitlabPipelineLimit = { 300 }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.random = { @Sendable _ in 0 }
             $0.environment.siteURL = { "http://example.com" }
         } operation: {
             // Ensure we trim builds as part of triggering
             // setup
-            Current.gitlabPipelineLimit = { 300 }
 
             let client = MockClient { _, _ in }
 
@@ -789,6 +789,7 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.buildTimeout = { 10 }
             $0.environment.buildTriggerAllowList = { [] }
             $0.environment.buildTriggerDownscaling = { 1 }
+            $0.environment.gitlabPipelineLimit = { 300 }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.random = { @Sendable _ in 0 }
             $0.environment.siteURL = { "http://example.com" }
@@ -807,7 +808,6 @@ class BuildTriggerTests: AppTestCase {
         } operation: {
             // Ensure we trim builds as part of triggering
             // setup
-            Current.gitlabPipelineLimit = { 300 }
             var triggerCount = 0
             let client = MockClient { _, res in
                 // let the 5th trigger succeed to ensure we don't early out on errors
@@ -918,6 +918,7 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.buildTimeout = { 10 }
             $0.environment.buildTriggerAllowList = { [] }
             $0.environment.buildTriggerDownscaling = { 1 }
+            $0.environment.gitlabPipelineLimit = { Constants.defaultGitlabPipelineLimit }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.random = { @Sendable _ in 0 }
             $0.environment.siteURL = { "http://example.com" }
@@ -997,6 +998,7 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.buildTimeout = { 10 }
             $0.environment.buildTriggerAllowList = { [] }
             $0.environment.buildTriggerDownscaling = { 0.05 } // 5% downscaling rate
+            $0.environment.gitlabPipelineLimit = { Constants.defaultGitlabPipelineLimit }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.siteURL = { "http://example.com" }
             // Use live dependency but replace actual client with a mock so we can
@@ -1075,6 +1077,7 @@ class BuildTriggerTests: AppTestCase {
             $0.environment.buildTimeout = { 10 }
             $0.environment.buildTriggerAllowList = { [.id0] }
             $0.environment.buildTriggerDownscaling = { 0.05 } // 5% downscaling rate
+            $0.environment.gitlabPipelineLimit = { Constants.defaultGitlabPipelineLimit }
             $0.environment.gitlabPipelineToken = { "pipeline token" }
             $0.environment.siteURL = { "http://example.com" }
             // Use live dependency but replace actual client with a mock so we can

Tests/AppTests/Mocks/AppEnvironment+mock.swift

@@ -24,7 +24,6 @@ extension AppEnvironment {
         .init(
             fileManager: .mock,
             git: .mock,
-            gitlabPipelineLimit: { Constants.defaultGitlabPipelineLimit },
             logger: { logger },
             setLogger: { logger in Self.logger = logger },
             shell: .mock