diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 23:16:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-10 23:16:38 +0000 |
commit | 21585f82e753689cc46f59c02d8e207756d794bf (patch) | |
tree | 493d73c46d111ef3805760aa4092aaf67af43182 /app | |
parent | 08a8aa66ef41708976c27734587fc06e489a134f (diff) | |
download | gitlab-ce-21585f82e753689cc46f59c02d8e207756d794bf.tar.gz |
Add latest changes from gitlab-org/security/gitlab@13-8-stable-ee
Diffstat (limited to 'app')
-rw-r--r-- | app/models/project_services/prometheus_service.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index d0e62a1afba..ab043227832 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -183,7 +183,17 @@ class PrometheusService < MonitoringService manual_configuration? && google_iap_audience_client_id.present? && google_iap_service_account_json.present? end + def clean_google_iap_service_account + return unless google_iap_service_account_json + + google_iap_service_account_json + .then { |json| Gitlab::Json.parse(json) } + .except('token_credential_uri') + end + def iap_client - @iap_client ||= Google::Auth::Credentials.new(Gitlab::Json.parse(google_iap_service_account_json), target_audience: google_iap_audience_client_id).client + @iap_client ||= Google::Auth::Credentials + .new(clean_google_iap_service_account, target_audience: google_iap_audience_client_id) + .client end end |