Merge pull request #1209 from travis-ci/sc-fix-caches

Fix caches in GCS

Author: travis-architect

lib/travis/services/find_caches.rb

@@ -154,7 +154,7 @@ 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(config.to_h[:json_key])
+          json_key_io = StringIO.new(JSON.dump(config.to_h[:json_key]))
           bucket_name = config[:bucket_name]
 
           storage.authorization = ::Google::Auth::ServiceAccountCredentials.make_creds(

spec/lib/services/find_caches_spec.rb

@@ -71,7 +71,7 @@
     end
 
     context 'with GCS configuration' do
-      let(:cache_options) { { gcs: { bucket_name: '', json_key: '' } } }
+      let(:cache_options) { { gcs: { bucket_name: '', json_key: { type: 'service_account', project_id: 'test-project-id' } } } }
       its(:size) { is_expected.to eq 0 }
     end
   end