Merge branch 'cloudfoundry:main' into keep_running_records

Author: joyvuu-dave

Gemfile

@@ -86,7 +86,7 @@ group :test do
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
   gem 'rubocop-rails', '~> 2.33'
-  gem 'rubocop-rspec', '~> 3.7'
+  gem 'rubocop-rspec', '~> 3.8'
   gem 'rubocop-rspec_rails'
   gem 'rubocop-sequel', '~> 0.4.1'
   gem 'timecop'

Gemfile.lock

@@ -270,7 +270,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.6.1)
-    json (2.15.2)
+    json (2.16.0)
     json-diff (0.4.1)
     json-schema (6.0.0)
       addressable (~> 2.8)
@@ -303,7 +303,7 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
     minitest (5.26.0)
-    mock_redis (0.52.0)
+    mock_redis (0.53.0)
       redis (~> 5)
     ms_rest (0.6.4)
       concurrent-ruby (~> 1.0)
@@ -327,7 +327,7 @@ GEM
     net-ssh (7.3.0)
     netaddr (2.0.6)
     netrc (0.11.0)
-    newrelic_rpm (9.22.0)
+    newrelic_rpm (9.23.0)
     nio4r (2.7.4)
     nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
@@ -412,7 +412,7 @@ GEM
       tsort
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.25.2)
+    redis-client (0.26.1)
       connection_pool
     regexp_parser (2.11.3)
     reline (0.6.2)
@@ -477,13 +477,13 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.47.1)
+    rubocop-ast (1.48.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-factory_bot (2.27.1)
+    rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rails (2.33.4)
@@ -492,10 +492,10 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.7.0)
+    rubocop-rspec (3.8.0)
       lint_roller (~> 1.1)
-      rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rspec_rails (2.31.0)
+      rubocop (~> 1.81)
+    rubocop-rspec_rails (2.32.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
@@ -677,7 +677,7 @@ DEPENDENCIES
   rubocop-capybara
   rubocop-factory_bot
   rubocop-rails (~> 2.33)
-  rubocop-rspec (~> 3.7)
+  rubocop-rspec (~> 3.8)
   rubocop-rspec_rails
   rubocop-sequel (~> 0.4.1)
   rubyzip (>= 1.3.0)

app/models/services/service_binding.rb

@@ -148,7 +148,8 @@ def active_per_instance
               order: [Sequel.desc(:created_at), Sequel.desc(:id)]
             ).as(:_rn)
           end.
-          from_self.where(_rn: 1)
+          from_self.where(_rn: 1).
+          order_by(:id)
       end
     end
   end

config/version

@@ -1 +1 @@
-3.206.0
+3.208.0

config/version_v2

@@ -1 +1 @@
-2.271.0
+2.273.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.271.0",
+  "api_version": "2.273.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/package-lock.json

@@ -22,7 +22,7 @@
   "devDependencies": {
     "cheerio": "^1.1.2",
     "express": "^5.1.0",
-    "glob": "^11.0.3",
+    "glob": "^11.1.0",
     "gulp": "^5.0.1",
     "gulp-cli": "^3.1.0",
     "linkinator": "^6.1.4"

docs/v3/package.json

@@ -1,5 +1,5 @@
 require 'syslog/logger'
-require 'vcap_request_id'
+require 'vcap_request_context_setter'
 require 'cors'
 require 'request_metrics'
 require 'request_logs'
@@ -24,7 +24,7 @@ def build(config, request_metrics, request_logs)
       Rack::Builder.new do
         use CloudFoundry::Middleware::RequestMetrics, request_metrics
         use CloudFoundry::Middleware::Cors, config.get(:allowed_cors_domains)
-        use CloudFoundry::Middleware::VcapRequestId
+        use CloudFoundry::Middleware::VcapRequestContextSetter
         use CloudFoundry::Middleware::BelowMinCliWarning if config.get(:warn_if_below_min_cli_version)
         use CloudFoundry::Middleware::NewRelicCustomAttributes if config.get(:newrelic_enabled)
         use CloudFoundry::Middleware::SecurityContextSetter, configurer

lib/cloud_controller/rack_app_builder.rb

@@ -31,6 +31,9 @@ def emit(event_name, entries, raw_entries={})
           INTEGER_FIELDS.include?(k)
         end.transform_values(&:to_i))
 
+        user_agent = ::VCAP::Request.user_agent
+        converted_entries['user-agent'] = user_agent if user_agent.present?
+
         resp = {
           'telemetry-source' => 'cloud_controller_ng',
           'telemetry-time' => Time.now.to_datetime.rfc3339,