Skip to content

chore(storage): fix test failures for universe domain and requester pays #36483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aandreassa merged 1 commit into from
Aug 28, 2026
Merged

chore(storage): fix test failures for universe domain and requester pays #36483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .kokoro/continuous/acceptance.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ env_vars: {

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "ruby-main-ci-service-account,ruby-firestore-ci-service-account"
value:
"client-library-test-universe-domain,"
"client-library-test-universe-domain-credential,"
"client-library-test-universe-project-id,"
"client-library-test-universe-storage-location,"
"ruby-firestore-ci-service-account,"
"ruby-main-ci-service-account"
}

env_vars: {
Expand Down
8 changes: 7 additions & 1 deletion .kokoro/nightly/acceptance-newest.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ env_vars: {

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "ruby-main-ci-service-account,ruby-firestore-ci-service-account"
value:
"client-library-test-universe-domain,"
"client-library-test-universe-domain-credential,"
"client-library-test-universe-project-id,"
"client-library-test-universe-storage-location,"
"ruby-firestore-ci-service-account,"
"ruby-main-ci-service-account"
}

env_vars: {
Expand Down
8 changes: 7 additions & 1 deletion .kokoro/nightly/acceptance-oldest.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ env_vars: {

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "ruby-main-ci-service-account,ruby-firestore-ci-service-account"
value:
"client-library-test-universe-domain,"
"client-library-test-universe-domain-credential,"
"client-library-test-universe-project-id,"
"client-library-test-universe-storage-location,"
"ruby-firestore-ci-service-account,"
"ruby-main-ci-service-account"
}

env_vars: {
Expand Down
8 changes: 7 additions & 1 deletion .kokoro/presubmit/acceptance.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ env_vars: {

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "client-library-test-universe-domain, client-library-test-universe-project-id, client-library-test-universe-storage-location, client-library-test-universe-domain-credential,ruby-main-ci-service-account,ruby-firestore-ci-service-account"
value:
"client-library-test-universe-domain,"
"client-library-test-universe-domain-credential,"
"client-library-test-universe-project-id,"
"client-library-test-universe-storage-location,"
"ruby-firestore-ci-service-account,"
"ruby-main-ci-service-account"
}

env_vars: {
Expand Down
15 changes: 10 additions & 5 deletions google-cloud-storage/acceptance/storage/universe_domain_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,16 @@

describe Google::Cloud::Storage, :universe_domain do
if ENV["KOKORO_GFILE_DIR"]
# Fetch secret values from the secret_manager path
TEST_UNIVERSE_PROJECT_ID = File.read(File.realpath(File.join(ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-project-id")))
TEST_UNIVERSE_LOCATION = File.read(File.realpath(File.join(ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-storage-location")))
TEST_UNIVERSE_DOMAIN = File.read(File.realpath(File.join( ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-domain")))
TEST_UNIVERSE_DOMAIN_CREDENTIAL = File.realpath(File.join( ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-domain-credential"))
begin
# Fetch secret values from the secret_manager path
TEST_UNIVERSE_PROJECT_ID = File.read(File.realpath(File.join(ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-project-id")))
TEST_UNIVERSE_LOCATION = File.read(File.realpath(File.join(ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-storage-location")))
TEST_UNIVERSE_DOMAIN = File.read(File.realpath(File.join( ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-domain")))
TEST_UNIVERSE_DOMAIN_CREDENTIAL = File.realpath(File.join( ENV["KOKORO_GFILE_DIR"], "secret_manager", "client-library-test-universe-domain-credential"))
rescue StandardError => e
puts "Unable to load universe domain secrets: #{e.message}"
next
end

let :ud_storage do
Google::Cloud::Storage.new(
Expand Down
Loading