diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-04 10:04:45 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-04 10:04:45 +0300 |
| commit | 20abcbffae71f8177223f2b978c8ad56102da271 (patch) | |
| tree | 629fb9a3af6015233bac78d19ecf2b01bb52bf84 /app/services/ci | |
| parent | c6d53250de7f439bc25740913d85ada6e3b2fed4 (diff) | |
Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix static analysys.
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/fetch_gcp_operation_service.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/finalize_cluster_creation_service.rb | 2 | ||||
| -rw-r--r-- | app/services/ci/provision_cluster_service.rb | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/app/services/ci/fetch_gcp_operation_service.rb b/app/services/ci/fetch_gcp_operation_service.rb index 24892d1ab47..415afaf901f 100644 --- a/app/services/ci/fetch_gcp_operation_service.rb +++ b/app/services/ci/fetch_gcp_operation_service.rb @@ -1,7 +1,7 @@ module Ci class FetchGcpOperationService def execute(cluster) - api_client = + api_client = GoogleApi::CloudPlatform::Client.new(cluster.gcp_token, nil) operation = api_client.projects_zones_operations( diff --git a/app/services/ci/finalize_cluster_creation_service.rb b/app/services/ci/finalize_cluster_creation_service.rb index 03cd761deb7..a469acc0467 100644 --- a/app/services/ci/finalize_cluster_creation_service.rb +++ b/app/services/ci/finalize_cluster_creation_service.rb @@ -1,7 +1,7 @@ module Ci class FinalizeClusterCreationService def execute(cluster) - api_client = + api_client = GoogleApi::CloudPlatform::Client.new(cluster.gcp_token, nil) begin diff --git a/app/services/ci/provision_cluster_service.rb b/app/services/ci/provision_cluster_service.rb index 3e7e565b361..6fcbdd8b483 100644 --- a/app/services/ci/provision_cluster_service.rb +++ b/app/services/ci/provision_cluster_service.rb @@ -6,12 +6,11 @@ module Ci begin operation = api_client.projects_zones_clusters_create( - cluster.gcp_project_id, - cluster.gcp_cluster_zone, - cluster.gcp_cluster_name, - cluster.gcp_cluster_size, - machine_type: cluster.gcp_machine_type - ) + cluster.gcp_project_id, + cluster.gcp_cluster_zone, + cluster.gcp_cluster_name, + cluster.gcp_cluster_size, + machine_type: cluster.gcp_machine_type) rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e return cluster.errored!("Failed to request to CloudPlatform; #{e.message}") end |