From a1da1e34d43110d6eea47594703eaa7838b74d28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 10:24:56 +0000 Subject: [PATCH 1/2] build(deps): bump uri from 0.13.1 to 1.0.3 Bumps [uri](https://github.com/ruby/uri) from 0.13.1 to 1.0.3. - [Release notes](https://github.com/ruby/uri/releases) - [Commits](https://github.com/ruby/uri/compare/v0.13.1...v1.0.3) --- updated-dependencies: - dependency-name: uri dependency-version: 1.0.3 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 0a72e534ce..b18d3293ee 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 6d4c50d410..e37c1f7725 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -585,7 +585,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 @@ -694,7 +694,7 @@ DEPENDENCIES talentbox-delayed_job_sequel (~> 4.3.0) thin timecop - uri (~> 0.13) + uri (~> 1.0) vmstat (~> 2.3) webmock (> 2.3.1) From 3632f9e8f6d72e612cb6f6fb30dafa2b913ab23e Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Fri, 18 Jul 2025 11:30:21 +0200 Subject: [PATCH 2/2] Fix URI::InvalidURIError assertions (missing space) --- spec/unit/lib/cloud_controller/config_spec.rb | 2 +- spec/unit/lib/cloud_controller/database_parts_parser_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/unit/lib/cloud_controller/config_spec.rb b/spec/unit/lib/cloud_controller/config_spec.rb index c44b5ebb1d..af5bc795eb 100644 --- a/spec/unit/lib/cloud_controller/config_spec.rb +++ b/spec/unit/lib/cloud_controller/config_spec.rb @@ -155,7 +155,7 @@ module VCAP::CloudController it "can't handle an unescaped @" do expect do DatabasePartsParser.database_parts_from_connection(uri) - end.to raise_error(URI::InvalidURIError, "bad URI(is not URI?): \"#{uri}\"") + end.to raise_error(URI::InvalidURIError, "bad URI (is not URI?): \"#{uri}\"") end end diff --git a/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb b/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb index e9cc8b01a0..059c61a679 100644 --- a/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb +++ b/spec/unit/lib/cloud_controller/database_parts_parser_spec.rb @@ -40,7 +40,7 @@ uri = 'mysql://user:p4s sw0rd@example.com:1234/databasename' expect do VCAP::CloudController::DatabasePartsParser.database_parts_from_connection(uri) - end.to raise_error(URI::InvalidURIError, "bad URI(is not URI?): \"#{uri}\"") + end.to raise_error(URI::InvalidURIError, "bad URI (is not URI?): \"#{uri}\"") end end end