Merge branch 'cloudfoundry:main' into keep_running_records

Author: joyvuu-dave

Gemfile

@@ -31,7 +31,7 @@ gem 'redis'
 gem 'rubyzip', '>= 1.3.0'
 gem 'sequel', '~> 5.99'
 gem 'sequel_pg', require: 'sequel'
-gem 'sinatra', '~> 3.2'
+gem 'sinatra', '~> 4.2'
 gem 'sinatra-contrib'
 gem 'statsd-ruby', '~> 1.5.0'
 gem 'steno'
@@ -79,7 +79,7 @@ group :test do
   gem 'rspec-its'
   gem 'rspec-rails', '~> 8.0.2'
   gem 'rspec-wait'
-  gem 'rubocop', '~> 1.81.7'
+  gem 'rubocop', '~> 1.82.0'
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
   gem 'rubocop-rails', '~> 2.34'
@@ -88,6 +88,7 @@ group :test do
   gem 'rubocop-sequel', '~> 0.4.1'
   gem 'timecop'
   gem 'webmock', '> 2.3.1'
+  gem 'webrick', '~> 1.9.2'
 end
 
 group :development do

Gemfile.lock

@@ -129,8 +129,8 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    date (3.5.0)
-    debug (1.11.0)
+    date (3.5.1)
+    debug (1.11.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
     declarative (0.0.20)
@@ -141,7 +141,7 @@ GEM
     docile (1.1.5)
     domain_name (0.6.20240107)
     drb (2.2.3)
-    erb (5.1.3)
+    erb (6.0.1)
     erubi (1.13.1)
     excon (1.3.0)
       logger
@@ -261,14 +261,14 @@ GEM
       mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.1)
+    io-console (0.8.2)
     ipaddress (0.8.3)
-    irb (1.15.2)
+    irb (1.16.0)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.6.1)
-    json (2.16.0)
+    json (2.18.0)
     json-diff (0.4.1)
     json-schema (6.0.0)
       addressable (~> 2.8)
@@ -337,7 +337,7 @@ GEM
     oj (3.16.13)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    openssl (3.3.2)
+    openssl (4.0.0)
     os (1.1.4)
     ostruct (0.6.3)
     palm_civet (1.1.0)
@@ -362,24 +362,25 @@ GEM
     pry-byebug (3.11.0)
       byebug (~> 12.0)
       pry (>= 0.13, < 0.16)
-    psych (5.2.6)
+    psych (5.3.1)
       date
       stringio
     public_suffix (7.0.0)
     puma (7.1.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.21)
-    rack-protection (3.2.0)
+    rack (3.2.4)
+    rack-protection (4.2.1)
       base64 (>= 0.1.0)
-      rack (~> 2.2, >= 2.2.4)
-    rack-session (1.0.2)
-      rack (< 3)
+      logger (>= 1.6.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
+    rackup (2.3.1)
+      rack (>= 3)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -403,7 +404,7 @@ GEM
       ffi (~> 1.0)
     rbs (3.9.5)
       logger
-    rdoc (6.15.0)
+    rdoc (7.0.1)
       erb
       psych (>= 4.0.0)
       tsort
@@ -412,7 +413,7 @@ GEM
     redis-client (0.26.1)
       connection_pool
     regexp_parser (2.11.3)
-    reline (0.6.2)
+    reline (0.6.3)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -463,15 +464,15 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.81.7)
+    rubocop (1.82.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.47.1, < 2.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.48.0)
@@ -507,7 +508,7 @@ GEM
     securerandom (0.4.1)
     sequel (5.99.0)
       bigdecimal
-    sequel_pg (1.18.0)
+    sequel_pg (1.18.2)
       pg (>= 0.18.0, != 1.2.0)
       sequel (>= 4.38.0)
     sexp_processor (4.7.0)
@@ -521,16 +522,18 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sinatra (3.2.0)
+    sinatra (4.2.1)
+      logger (>= 1.6.0)
       mustermann (~> 3.0)
-      rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.2.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.2.1)
+      rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sinatra-contrib (3.2.0)
+    sinatra-contrib (4.2.1)
       multi_json (>= 0.0.2)
       mustermann (~> 3.0)
-      rack-protection (= 3.2.0)
-      sinatra (= 3.2.0)
+      rack-protection (= 4.2.1)
+      sinatra (= 4.2.1)
       tilt (~> 2.0)
     solargraph (0.57.0)
       backport (~> 1.2)
@@ -560,7 +563,7 @@ GEM
     steno (1.3.5)
       fluent-logger
       yajl-ruby (~> 1.0)
-    stringio (3.1.7)
+    stringio (3.2.0)
     talentbox-delayed_job_sequel (4.3.0)
       delayed_job (~> 4.1.0)
       sequel (>= 3.38, < 6.0)
@@ -586,7 +589,7 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.9.1)
+    webrick (1.9.2)
     xml-simple (1.1.9)
       rexml
     yajl-ruby (1.4.3)
@@ -663,7 +666,7 @@ DEPENDENCIES
   rspec-rails (~> 8.0.2)
   rspec-wait
   rspec_api_documentation (>= 6.1.0)
-  rubocop (~> 1.81.7)
+  rubocop (~> 1.82.0)
   rubocop-capybara
   rubocop-factory_bot
   rubocop-rails (~> 2.34)
@@ -673,7 +676,7 @@ DEPENDENCIES
   rubyzip (>= 1.3.0)
   sequel (~> 5.99)
   sequel_pg
-  sinatra (~> 3.2)
+  sinatra (~> 4.2)
   sinatra-contrib
   solargraph
   spork!
@@ -686,6 +689,7 @@ DEPENDENCIES
   uri (~> 1.1)
   vmstat (~> 2.3)
   webmock (> 2.3.1)
+  webrick (~> 1.9.2)
 
 BUNDLED WITH
    2.4.19

app/actions/v3/service_instance_update_managed.rb

@@ -159,6 +159,7 @@ def complete_instance_and_save(instance, broker_response)
           u[:maintenance_info] = maintenance_info if maintenance_info_updated?
         end
         updates[:dashboard_url] = broker_response[:dashboard_url] if broker_response.key?(:dashboard_url)
+        updates[:broker_provided_metadata] = broker_response[:broker_provided_metadata] if broker_response.key?(:broker_provided_metadata)
 
         ManagedServiceInstance.db.transaction do
           service_instance.save_with_new_operation(
@@ -174,6 +175,7 @@ def complete_instance_and_save(instance, broker_response)
       def save_incomplete_instance(instance, broker_response)
         attributes_to_update = {}
         attributes_to_update[:dashboard_url] = broker_response[:dashboard_url] if broker_response.key?(:dashboard_url)
+        attributes_to_update[:broker_provided_metadata] = broker_response[:broker_provided_metadata] if broker_response.key?(:broker_provided_metadata)
 
         instance.save_with_new_operation(
           attributes_to_update,

app/controllers/internal/app_crashed_controller.rb

@@ -26,7 +26,8 @@ def crashed(lrp_process_guid)
     private
 
     def crashed_request
-      payload = body.read
+      request.body.rewind
+      payload = request.body.read
       Oj.load(payload)
     rescue StandardError => e
       logger.error('diego.app_crashed.parse-error', payload: payload, error: e.to_s)

app/controllers/internal/app_readiness_changed_controller.rb

@@ -25,7 +25,8 @@ def readiness_changed(process_guid)
     private
 
     def readiness_request
-      payload = body.read
+      request.body.rewind
+      payload = request.body.read
       Oj.load(payload)
     rescue StandardError => e
       logger.error('diego.app_readiness_changed.parse-error', payload: payload, error: e.to_s)

app/controllers/internal/app_rescheduling_controller.rb

@@ -25,7 +25,8 @@ def rescheduling(process_guid)
     private
 
     def rescheduling_request
-      payload = body.read
+      request.body.rewind
+      payload = request.body.read
       Oj.load(payload)
     rescue StandardError => e
       logger.error('diego.app_rescheduling.parse-error', payload: payload, error: e.to_s)

app/controllers/internal/staging_completion_controller.rb

@@ -121,7 +121,8 @@ def prometheus_updater
     attr_reader :stagers
 
     def read_body
-      payload          = body.read
+      request.body.rewind
+      payload = request.body.read
       Oj.load(payload, symbol_keys: true)
     rescue StandardError => e
       logger.error('diego.staging.parse-error', payload: payload, error: e.to_s)

app/controllers/internal/task_completion_controller.rb

@@ -25,7 +25,8 @@ def complete_task(task_guid, task_response)
     end
 
     def read_body
-      payload = body.read
+      request.body.rewind
+      payload = request.body.read
       Oj.load(payload, symbol_keys: true)
     rescue StandardError => e
       logger.error('diego.task.parse-error', payload: payload, error: e.to_s)

app/models/services/managed_service_instance.rb

@@ -21,7 +21,7 @@ class ManagedServiceInstance < ServiceInstance
 
     plugin :after_initialize
 
-    serialize_attributes :json, :maintenance_info
+    serialize_attributes :json, :maintenance_info, :broker_provided_metadata
 
     def validation_policies
       if space

app/presenters/v3/service_instance_presenter.rb

@@ -77,7 +77,7 @@ def hash_common
         end
 
         def hash_additions_managed
-          {
+          base_hash = {
             type: 'managed',
             maintenance_info: maintenance_info,
             upgrade_available: upgrade_available,
@@ -101,6 +101,10 @@ def hash_additions_managed
               }
             }
           }
+
+          base_hash[:broker_provided_metadata] = service_instance.broker_provided_metadata if service_instance.broker_provided_metadata.present?
+
+          base_hash
         end
 
         def hash_additions_user_provided