From 56868d02c3ae9ff8bde3ed35ddba4f02d8ff6c64 Mon Sep 17 00:00:00 2001 From: Torrey Payne <11740989+torreypayne@users.noreply.github.com> Date: Thu, 15 Oct 2026 21:54:51 +0000 Subject: [PATCH 1/2] chore(bigtable): use string keys when building IAM policy JSON in tests --- .../test/google/cloud/bigtable/backup/iam_policy_test.rb | 4 ++-- .../test/google/cloud/bigtable/instance/iam_policy_test.rb | 4 ++-- .../test/google/cloud/bigtable/table/iam_policy_test.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb index 20b3cc2b733e..ebc2f12eb15c 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb @@ -77,7 +77,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: backup.path, policy: set_req backup.service.mocked_tables = mock @@ -111,7 +111,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: backup.path, policy: set_req backup.service.mocked_tables = mock diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb index 6f40fc353ce0..551876afd0cb 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb @@ -78,7 +78,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: instance.path, policy: set_req instance.service.mocked_instances = mock @@ -112,7 +112,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: instance.path, policy: set_req instance.service.mocked_instances = mock diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb index 2aa0c4b22ab1..15d16f5c663a 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb @@ -86,7 +86,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: table.path, policy: set_req table.service.mocked_tables = mock @@ -120,7 +120,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: table.path, policy: set_req table.service.mocked_tables = mock From f02a8da79981ba9fae610e5e346a04bc1c9c02e1 Mon Sep 17 00:00:00 2001 From: Torrey Payne <11740989+torreypayne@users.noreply.github.com> Date: Sat, 17 Oct 2026 00:08:23 +0000 Subject: [PATCH 2/2] chore(ci): preserve gem lockfile resolution under toys 0.22.0 and Bundler 4 --- .toys/.toys.rb | 28 +++++++++++++++++++ .../cloud/bigtable/backup/iam_policy_test.rb | 4 +-- .../bigtable/instance/iam_policy_test.rb | 4 +-- .../cloud/bigtable/table/iam_policy_test.rb | 4 +-- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.toys/.toys.rb b/.toys/.toys.rb index b0e851747cb6..83ec9771d71e 100644 --- a/.toys/.toys.rb +++ b/.toys/.toys.rb @@ -24,3 +24,31 @@ path: "toys/yoshi", update: true end + +# Work around two Bundler 4.0 + toys-core 0.22.0 issues during `toys test`: +# 1. `load_git` (`Toys::Utils::GitCache`) requires `json` before any bundle is +# set up, activating the newest `json` in GEM_HOME (e.g. 3.1.0), which +# `modified_gemfile_content` then injects into the temporary Gemfile over the +# gem's locked `json` version. +# 2. `delete_modified_gemfile` deletes the temporary lockfile in `setup_bundle`'s +# `ensure` block before the tool spawns its child ruby process, while Bundler +# 4.0+ leaves `ENV["BUNDLE_LOCKFILE"]` pointing at that deleted lockfile. +require "toys/utils/gems" +unless Toys::Utils::Gems.private_method_defined? :configure_lockfile + Toys::Utils::Gems.prepend( + Module.new do + private + + def create_modified_gemfile gemfile_path + ::Gem.loaded_specs.delete "json" + super + end + + def delete_modified_gemfile modified_gemfile_path + ::FileUtils.rm_f modified_gemfile_path + modified_lockfile_path = find_lockfile_path modified_gemfile_path + ::Toys::Utils::Gems.delete_at_exit modified_lockfile_path + end + end + ) +end diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb index ebc2f12eb15c..20b3cc2b733e 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/backup/iam_policy_test.rb @@ -77,7 +77,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: backup.path, policy: set_req backup.service.mocked_tables = mock @@ -111,7 +111,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: backup.path, policy: set_req backup.service.mocked_tables = mock diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb index 551876afd0cb..6f40fc353ce0 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/instance/iam_policy_test.rb @@ -78,7 +78,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: instance.path, policy: set_req instance.service.mocked_instances = mock @@ -112,7 +112,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: instance.path, policy: set_req instance.service.mocked_instances = mock diff --git a/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb b/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb index 15d16f5c663a..2aa0c4b22ab1 100644 --- a/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb +++ b/google-cloud-bigtable/test/google/cloud/bigtable/table/iam_policy_test.rb @@ -86,7 +86,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: table.path, policy: set_req table.service.mocked_tables = mock @@ -120,7 +120,7 @@ updated_policy_hash["bindings"].first["members"] << "user:newowner@example.com" set_req = Google::Iam::V1::Policy.decode_json(updated_policy_hash.to_json) - set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge("etag" => "eHl6").to_json) + set_res = Google::Iam::V1::Policy.decode_json(updated_policy_hash.merge(etag: "eHl6").to_json) mock.expect :set_iam_policy, set_res, resource: table.path, policy: set_req table.service.mocked_tables = mock