summaryrefslogtreecommitdiff
path: root/lib/google_api
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-10-04 16:04:45 +0900
committerShinya Maeda <shinya@gitlab.com>2017-10-04 16:04:45 +0900
commit20abcbffae71f8177223f2b978c8ad56102da271 (patch)
tree629fb9a3af6015233bac78d19ecf2b01bb52bf84 /lib/google_api
parentc6d53250de7f439bc25740913d85ada6e3b2fed4 (diff)
downloadgitlab-ce-20abcbffae71f8177223f2b978c8ad56102da271.tar.gz
Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix static analysys.
Diffstat (limited to 'lib/google_api')
-rw-r--r--lib/google_api/auth.rb2
-rw-r--r--lib/google_api/cloud_platform/client.rb15
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/google_api/auth.rb b/lib/google_api/auth.rb
index 8c962af51d7..99a82c849e0 100644
--- a/lib/google_api/auth.rb
+++ b/lib/google_api/auth.rb
@@ -46,7 +46,7 @@ module GoogleApi
config.app_id,
config.app_secret,
site: 'https://accounts.google.com',
- token_url: '/o/oauth2/token',
+ token_url: '/o/oauth2/token',
authorize_url: '/o/oauth2/auth'
)
end
diff --git a/lib/google_api/cloud_platform/client.rb b/lib/google_api/cloud_platform/client.rb
index f50c99578bc..d13e3290cf5 100644
--- a/lib/google_api/cloud_platform/client.rb
+++ b/lib/google_api/cloud_platform/client.rb
@@ -44,16 +44,15 @@ module GoogleApi
service.authorization = access_token
request_body = Google::Apis::ContainerV1::CreateClusterRequest.new(
- {
- "cluster": {
- "name": cluster_name,
- "initial_node_count": cluster_size,
- "node_config": {
- "machine_type": machine_type # Default 3.75 GB, if ommit
- }
+ {
+ "cluster": {
+ "name": cluster_name,
+ "initial_node_count": cluster_size,
+ "node_config": {
+ "machine_type": machine_type
}
}
- )
+ } )
service.create_cluster(project_id, zone, request_body)
end