diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-01-11 11:27:19 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-11 18:57:15 +0000 |
| commit | 782378e2e9d6ddabae79819521723eefd31b0c19 (patch) | |
| tree | 747b0a109319b0e29c597e62f904acb0eda50309 /lib/google_api | |
| parent | 7b030bcd6b4b435e9d9f510a0c7b6e25c76a3ba8 (diff) | |
| download | gitlab-ce-782378e2e9d6ddabae79819521723eefd31b0c19.tar.gz | |
Merge branch 'gcp-fix' into 'master'10-4-stable-prepare-rc4
Fix GCP redirect
Closes #41867
See merge request gitlab-org/gitlab-ce!16355
(cherry picked from commit 59adc07f00f4f3ea326194d77c31580edfdfb2a4)
b44583e9 Extract GCP billing check as method
cf6258af Fix billing checking
0cdd56e6 Fix link to billing
e52bae3b Fix CheckGcpProjectBillingService spec
b8b2f5ff Fix CheckGcpProjectBillingWorker spec
8ba3e473 Fix GCP Controller spec
1f0a4fe6 Add missing user agent header to GCP client
6ef28ace Add API requirements to docs
0b294fc2 Use new tab for link in flash
cf95756a Refactor GCP redirect test suite
e6012d3e Change failed GCP billing check wording
35598274 Fix breadcumb of clusters show page
cf842986 Update links for GCP instructions
Diffstat (limited to 'lib/google_api')
| -rw-r--r-- | lib/google_api/cloud_platform/client.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb index f05d001fd02..ff638c07755 100644 --- a/lib/google_api/cloud_platform/client.rb +++ b/lib/google_api/cloud_platform/client.rb @@ -47,15 +47,15 @@ module GoogleApi service.authorization = access_token service.fetch_all(items: :projects) do |token| - service.list_projects(page_token: token) + service.list_projects(page_token: token, options: user_agent_header) end end - def projects_get_billing_info(project_name) + def projects_get_billing_info(project_id) service = Google::Apis::CloudbillingV1::CloudbillingService.new service.authorization = access_token - service.get_project_billing_info("projects/#{project_name}") + service.get_project_billing_info("projects/#{project_id}", options: user_agent_header) end def projects_zones_clusters_get(project_id, zone, cluster_id) |