Merge remote-tracking branch 'origin/main' into TNZ-44895-recreate

Author: PeteLevineA

Gemfile.lock

@@ -486,7 +486,7 @@ GEM
       rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.44.1)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -544,7 +544,7 @@ GEM
       rack-protection (= 3.2.0)
       sinatra (= 3.2.0)
       tilt (~> 2.0)
-    solargraph (0.55.0)
+    solargraph (0.55.1)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)

app/controllers/internal/metrics_controller.rb

@@ -3,6 +3,8 @@
 
 module VCAP::CloudController
   module Internal
+    # This controller is only used when the webserver is not Puma
+    # When using Puma, the metrics are served by a separate webserver in the main process
     class MetricsController < RestController::BaseController
       allow_unauthenticated_access
       get '/internal/v4/metrics', :index

app/jobs/runtime/failed_jobs_cleanup.rb

@@ -20,6 +20,18 @@ def perform
 
           old_delayed_jobs.delete
 
+          # There were some very old jobs in the table which did not get cleaned up
+          # This deletes those orphaned jobs, which were scheduled to run before the cutoff age + 1 day
+          force_delete_after = cutoff_age_in_days.to_i + 1
+          orphaned_delayed_jobs = Delayed::Job.
+                                  where(Sequel.lit("run_at < CURRENT_TIMESTAMP - INTERVAL '?' DAY", force_delete_after))
+
+          unless orphaned_delayed_jobs.count.zero?
+            logger.info("Deleting #{orphaned_delayed_jobs.count} orphaned Delayed Jobs older than #{force_delete_after} days")
+
+            orphaned_delayed_jobs.delete
+          end
+
           return if max_number_of_failed_delayed_jobs.nil?
 
           ids_exceeding_limit = Delayed::Job.

app/models/runtime/app_model.rb

@@ -125,6 +125,12 @@ def database_uri
       DatabaseUriGenerator.new(service_binding_uris).database_uri
     end
 
+    def windows_gmsa_credential_refs
+      service_bindings.sort_by(&:id).map do |binding|
+        binding.credentials['credhub-windows-gmsa-credential-ref'] if binding.credentials.present?
+      end.compact
+    end
+
     def staging_in_progress?
       builds_dataset.where(state: BuildModel::STAGING_STATE).any?
     end

app/models/runtime/process_model.rb

@@ -453,6 +453,8 @@ def database_uri
       DatabaseUriGenerator.new(service_binding_uris).database_uri
     end
 
+    delegate :windows_gmsa_credential_refs, to: :app
+
     def max_app_disk_in_mb
       VCAP::CloudController::Config.config.get(:maximum_app_disk_in_mb)
     end

config/version

@@ -1 +1 @@
-3.196.0
+3.197.0

config/version_v2

@@ -1 +1 @@
-2.261.0
+2.262.0

docs/v2/info/get_info.html

@@ -103,7 +103,7 @@ <h4>Body</h4>
   "token_endpoint": "http://localhost:8080/uaa",
   "min_cli_version": null,
   "min_recommended_cli_version": null,
-  "api_version": "2.261.0",
+  "api_version": "2.262.0",
   "app_ssh_endpoint": "ssh.system.domain.example.com:2222",
   "app_ssh_host_key_fingerprint": "47:0d:d1:c8:c3:3d:0a:36:d1:49:2f:f2:90:27:31:d0",
   "app_ssh_oauth_client": null,

docs/v3/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
     http_parser.rb (0.8.0)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.11.3)
+    json (2.12.2)
     kramdown (2.4.0)
       rexml
     libv8-node (23.6.1.0)

lib/cloud_controller/config_schemas/base/api_schema.rb

@@ -134,7 +134,8 @@ class ApiSchema < VCAP::Config
 
             nginx: {
               use_nginx: bool,
-              instance_socket: String
+              instance_socket: String,
+              optional(:metrics_socket) => String
             },
 
             quota_definitions: Hash,