VladPolskiy/gitlabhq
1
0
Fork 0
mirror of https://github.com/gitlabhq/gitlabhq.git synced 2025-08-15 23:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add google_api to TOP_LEVEL_ROUTES. Import/Export model failure fix. Fix static analysys.

Browse Source
This commit is contained in:
Shinya Maeda
2017-10-04 16:04:45 +09:00
parent c6d53250de
commit 20abcbffae
11 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/google_api/auth.rb
View File

@ -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

15
lib/google_api/cloud_platform/client.rb
View File

@ -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