Skip to content

Consider case when GCS config is a string #1220

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Consider case when GCS config is a string #1220

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
6 changes: 4 additions & 2 deletions lib/travis/services/find_caches.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ def fetch_s3(cache_objects, options)
def fetch_gcs(cache_objects, options)
config = cache_options[:gcs]
storage = ::Google::Apis::StorageV1::StorageService.new
json_key_io = StringIO.new(JSON.dump(config.to_h[:json_key]))
bucket_name = config[:bucket_name]
json_key_obj = config.to_h[:json_key]
json_key_obj = JSON.dump(json_key_obj) unless json_key_obj.is_a?(String)
json_key_io = StringIO.new(json_key_obj)
bucket_name = config[:bucket_name]

storage.authorization = ::Google::Auth::ServiceAccountCredentials.make_creds(
json_key_io: json_key_io,
Expand Down
5 changes: 5 additions & 0 deletions spec/lib/services/find_caches_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@
context 'with GCS configuration' do
let(:cache_options) { { gcs: { bucket_name: '', json_key: { type: 'service_account', project_id: 'test-project-id' } } } }
its(:size) { is_expected.to eq 0 }

context 'when configuration is a String' do
let(:cache_options) { { gcs: { bucket_name: '', json_key: JSON.dump(type: 'service_account', project_id: 'test-project-id') } } }
its(:size) { is_expected.to eq 0 }
end
end
end
end