Merge remote-tracking branch 'upstream/main' into rate-limits-info

Author: nookala

.devcontainer/images/uaa/Dockerfile

@@ -20,7 +20,7 @@ RUN yq  e '.issuer.uri = "http://localhost:8080"' -i /uaa.yml \
   && yq e '.uaa.url = .issuer.uri' -i /uaa.yml
 
 # Runtime image
-FROM tomcat:9-jdk21
+FROM tomcat:10-jdk21
 
 # Copy config file from yq image
 COPY --from=yq /uaa.yml /uaa.yml

.github/workflows/unit_tests.yml

@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image: ["postgres:13", "postgres:15", "postgres:16"]
+        image: ["postgres:13", "postgres:15", "postgres:17"]
     services:
       postgres:
         image: ${{ matrix.image }}

.github/workflows/unit_tests_backwards_compatibility.yml

@@ -33,7 +33,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        image: ["postgres:13", "postgres:15", "postgres:16"]
+        image: ["postgres:13", "postgres:15", "postgres:17"]
     services:
       postgres:
         image: ${{ matrix.image }}

Gemfile

@@ -32,7 +32,7 @@ gem 'puma'
 gem 'rake'
 gem 'redis'
 gem 'rubyzip', '>= 1.3.0'
-gem 'sequel', '~> 5.94'
+gem 'sequel', '~> 5.95'
 gem 'sequel_pg', require: 'sequel'
 gem 'sinatra', '~> 3.2'
 gem 'sinatra-contrib'
@@ -41,7 +41,7 @@ gem 'statsd-ruby', '~> 1.5.0'
 gem 'steno'
 gem 'talentbox-delayed_job_sequel', '~> 4.3.0'
 gem 'thin'
-gem 'uri', '~> 0.13'
+gem 'uri', '~> 1.0'
 gem 'vmstat', '~> 2.3'
 
 # Rails Components
@@ -55,8 +55,8 @@ gem 'azure-storage-blob', git: 'https://github.com/sethboyles/azure-storage-ruby
 gem 'fog-aliyun'
 gem 'fog-aws'
 gem 'fog-azure-rm', git: 'https://github.com/fog/fog-azure-rm.git', branch: 'fog-arm-cf'
-gem 'fog-core', '~> 2.4.0'
-gem 'fog-google', '~> 1.24.1'
+gem 'fog-core', '~> 2.6.0'
+gem 'fog-google', '~> 1.25.0'
 gem 'fog-local'
 gem 'fog-openstack'
 
@@ -84,7 +84,7 @@ group :test do
   gem 'rspec-its'
   gem 'rspec-rails', '~> 8.0.1'
   gem 'rspec-wait'
-  gem 'rubocop', '~> 1.75.8'
+  gem 'rubocop', '~> 1.79.1'
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
   gem 'rubocop-rails', '~> 2.32'

Gemfile.lock

@@ -103,7 +103,7 @@ GEM
     azure_mgmt_traffic_manager (0.9.0)
       ms_rest_azure (~> 0.7.0)
     backport (1.2.0)
-    base64 (0.2.0)
+    base64 (0.3.0)
     beefcake (1.0.0)
     benchmark (0.4.1)
     bigdecimal (3.2.2)
@@ -145,7 +145,8 @@ GEM
     erb (5.0.1)
     erubi (1.13.1)
     eventmachine (1.2.7)
-    excon (0.112.0)
+    excon (1.2.8)
+      logger
     faraday (0.17.6)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.7)
@@ -166,19 +167,19 @@ GEM
       fog-json
       ipaddress (~> 0.8)
       xml-simple (~> 1.1)
-    fog-aws (3.28.0)
-      base64 (~> 0.2.0)
-      fog-core (~> 2.1)
+    fog-aws (3.33.0)
+      base64 (>= 0.2, < 0.4)
+      fog-core (~> 2.6)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
-    fog-core (2.4.0)
+    fog-core (2.6.0)
       builder
-      excon (~> 0.71)
+      excon (~> 1.0)
       formatador (>= 0.2, < 2.0)
       mime-types
-    fog-google (1.24.1)
+    fog-google (1.25.0)
       addressable (>= 2.7.0)
-      fog-core (< 2.5)
+      fog-core (~> 2.5)
       fog-json (~> 1.2)
       fog-xml (~> 0.1.0)
       google-apis-compute_v1 (~> 0.53)
@@ -197,10 +198,10 @@ GEM
     fog-openstack (1.1.5)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
-    fog-xml (0.1.4)
+    fog-xml (0.1.5)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (1.1.0)
+    formatador (1.1.1)
     google-apis-compute_v1 (0.86.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.3)
@@ -279,13 +280,13 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.6.1)
-    json (2.12.2)
+    json (2.13.2)
     json-diff (0.4.1)
     json-schema (5.2.1)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     json_pure (2.8.1)
-    jwt (2.8.1)
+    jwt (2.10.1)
       base64
     kramdown (2.5.1)
       rexml (>= 3.3.9)
@@ -315,11 +316,11 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0507)
+    mime-types-data (3.2025.0805)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
     minitest (5.25.5)
-    mock_redis (0.50.0)
+    mock_redis (0.51.0)
       redis (~> 5)
     ms_rest (0.6.4)
       concurrent-ruby (~> 1.0)
@@ -331,9 +332,9 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       ms_rest (~> 0.6.3)
     msgpack (1.7.2)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-parser (0.1.1)
-    multipart-post (2.4.0)
+    multipart-post (2.4.1)
     mustache (1.1.1)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
@@ -342,30 +343,32 @@ GEM
     net-ssh (7.3.0)
     netaddr (2.0.6)
     netrc (0.11.0)
-    newrelic_rpm (9.19.0)
+    newrelic_rpm (9.20.0)
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     observer (0.1.2)
     oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     openssl (3.3.0)
     os (1.1.4)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     palm_civet (1.1.0)
     parallel (1.27.0)
-    parallel_tests (5.3.0)
+    parallel_tests (5.4.0)
       parallel
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.9)
+    pg (1.6.1)
+    pg (1.6.1-x86_64-darwin)
+    pg (1.6.1-x86_64-linux)
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
@@ -382,7 +385,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.17)
@@ -421,9 +424,9 @@ GEM
     rdoc (6.14.1)
       erb
       psych (>= 4.0.0)
-    redis (5.4.0)
+    redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.24.0)
+    redis-client (0.25.1)
       connection_pool
     regexp_parser (2.10.0)
     reline (0.6.1)
@@ -477,18 +480,18 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.75.8)
+    rubocop (1.79.1)
       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.44.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -517,15 +520,15 @@ GEM
     ruby2_keywords (0.0.5)
     ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
-    rubyzip (2.4.1)
+    rubyzip (3.0.0)
     securerandom (0.4.1)
-    sequel (5.94.0)
+    sequel (5.95.1)
       bigdecimal
     sequel_pg (1.17.2)
       pg (>= 0.18.0, != 1.2.0)
       sequel (>= 4.38.0)
     sexp_processor (4.7.0)
-    signet (0.19.0)
+    signet (0.20.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -546,7 +549,7 @@ GEM
       rack-protection (= 3.2.0)
       sinatra (= 3.2.0)
       tilt (~> 2.0)
-    solargraph (0.56.1)
+    solargraph (0.56.2)
       backport (~> 1.2)
       benchmark (~> 0.4)
       bundler (~> 2.0)
@@ -566,7 +569,7 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
       yard-solargraph (~> 0.1)
-    spring (4.3.0)
+    spring (4.4.0)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sshkey (3.0.0)
@@ -584,7 +587,7 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       logger
       rack (>= 1, < 4)
-    thor (1.3.2)
+    thor (1.4.0)
     tilt (2.6.1)
     timecop (0.9.10)
     timeliness (0.4.5)
@@ -595,7 +598,7 @@ GEM
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
-    uri (0.13.2)
+    uri (1.0.3)
     useragent (0.16.11)
     vhd (0.0.4)
       bit-struct
@@ -638,8 +641,8 @@ DEPENDENCIES
   fog-aliyun
   fog-aws
   fog-azure-rm!
-  fog-core (~> 2.4.0)
-  fog-google (~> 1.24.1)
+  fog-core (~> 2.6.0)
+  fog-google (~> 1.25.0)
   fog-local
   fog-openstack
   googleapis-common-protos (>= 1.8.0)
@@ -682,15 +685,15 @@ DEPENDENCIES
   rspec-rails (~> 8.0.1)
   rspec-wait
   rspec_api_documentation (>= 6.1.0)
-  rubocop (~> 1.75.8)
+  rubocop (~> 1.79.1)
   rubocop-capybara
   rubocop-factory_bot
   rubocop-rails (~> 2.32)
   rubocop-rspec (~> 3.6)
   rubocop-rspec_rails
   rubocop-sequel (~> 0.4.1)
   rubyzip (>= 1.3.0)
-  sequel (~> 5.94)
+  sequel (~> 5.95)
   sequel_pg
   sinatra (~> 3.2)
   sinatra-contrib
@@ -704,7 +707,7 @@ DEPENDENCIES
   talentbox-delayed_job_sequel (~> 4.3.0)
   thin
   timecop
-  uri (~> 0.13)
+  uri (~> 1.0)
   vmstat (~> 2.3)
   webmock (> 2.3.1)
 

app/controllers/v3/spaces_controller.rb

@@ -1,5 +1,6 @@
 require 'presenters/v3/paginated_list_presenter'
 require 'presenters/v3/space_presenter'
+require 'presenters/v3/space_usage_summary_presenter'
 require 'messages/space_create_message'
 require 'messages/space_delete_unmapped_routes_message'
 require 'messages/space_update_message'
@@ -211,6 +212,14 @@ def list_members
     raise CloudController::Errors::ApiError.new_from_details('UaaUnavailable')
   end
 
+  def show_usage_summary
+    space = fetch_space(hashed_params[:guid])
+    space_not_found! unless space
+    space_not_found! unless permission_queryer.can_read_from_space?(space.id, space.organization_id)
+
+    render status: :ok, json: Presenters::V3::SpaceUsageSummaryPresenter.new(space)
+  end
+
   private
 
   def fetch_organization(guid)