Commit d2df9a11 authored by Andrejs Cunskis's avatar Andrejs Cunskis

Detect if knapsack gcs credentials is a file path or json string

parent ccf33f48
...@@ -95,10 +95,7 @@ module QA ...@@ -95,10 +95,7 @@ module QA
# #
# @return [Fog::Storage::GoogleJSON] # @return [Fog::Storage::GoogleJSON]
def client def client
@client ||= Fog::Storage::Google.new( @client ||= Fog::Storage::Google.new(google_project: PROJECT, **gcs_credentials)
google_project: PROJECT,
google_json_key_location: gcs_credentials
)
end end
# Base path of knapsack report # Base path of knapsack report
...@@ -132,13 +129,16 @@ module QA ...@@ -132,13 +129,16 @@ module QA
@report_name ||= ENV["CI_JOB_NAME"].split(" ").first.tr(":", "-") @report_name ||= ENV["CI_JOB_NAME"].split(" ").first.tr(":", "-")
end end
# Path to GCS credentials json # GCS credentials json
# #
# @return [String] # @return [Hash]
def gcs_credentials def gcs_credentials
@gcs_credentials ||= ENV["QA_KNAPSACK_REPORT_GCS_CREDENTIALS"] || raise( json_key = ENV["QA_KNAPSACK_REPORT_GCS_CREDENTIALS"] || raise(
"QA_KNAPSACK_REPORT_GCS_CREDENTIALS env variable is required!" "QA_KNAPSACK_REPORT_GCS_CREDENTIALS env variable is required!"
) )
return { google_json_key_location: json_key } if File.exist?(json_key)
{ google_json_key_string: json_key }
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment