Fix setting service accounts and scopes on GCE instances#305
Fix setting service accounts and scopes on GCE instances#305icco merged 2 commits intofog:masterfrom KohlsTechnology:fix-server-service-accounts
Conversation
Setting service accounts should use an array of hashes instead of a hash. See the resource.serviceAccounts[] field in the below Google API document for details. https://cloud.google.com/compute/docs/reference/rest/v1/instances/insert
| :scopes => map_scopes(service_accounts[:scopes]) | ||
| ) | ||
| if service_accounts && service_accounts[0] | ||
| service_accounts[0].merge!(:scopes => map_scopes(service_accounts[0][:scopes])) |
There was a problem hiding this comment.
Use service_accounts[0][:scopes] = map_scopes(service_accounts[0][:scopes]) instead of service_accounts[0].merge!(:scopes => map_scopes(service_accounts[0][:scopes])).
| ) | ||
| if service_accounts && service_accounts[0] | ||
| service_accounts[0][:scopes] = map_scopes(service_accounts[0][:scopes]) | ||
| options[:service_accounts] = service_accounts |
There was a problem hiding this comment.
Since people are possibly already passing in a scopes hash, could we still support that? Maybe modify the request to make sure only one service account is passed in and its in the right format?
There was a problem hiding this comment.
I will test this tonight and see if it works. But from what I recall it seemed like setting the service accounts and scopes was completely broken on the master branch.
I'll dig into it and let you know.
There was a problem hiding this comment.
I will not get to this until this weekend. Sorry for the delay.
There was a problem hiding this comment.
I tried out the latest code from master to see how it behaves. My initial test seems to indicate that simply setting scopes like this does not actually set the service account scopes. When I go into the Google Cloud Console no service account scopes are set on the GCE instance.
{:scopes => ["storage/full"] }
Some screen shots from my pry session trying to see how this currently works.
I will need to dig a little bit deeper on this to make sure I am understanding how this currently works. Current plan it to have more details in the next few days.
There was a problem hiding this comment.
I think actually I misread this, what I was asking doesn't make sense. I was thinking you were throwing away an option a user was passing in, which is not what is happening here. This actually looks great and I'm going to merge.
| ) | ||
| if service_accounts && service_accounts[0] | ||
| service_accounts[0][:scopes] = map_scopes(service_accounts[0][:scopes]) | ||
| options[:service_accounts] = service_accounts |
There was a problem hiding this comment.
I think actually I misread this, what I was asking doesn't make sense. I was thinking you were throwing away an option a user was passing in, which is not what is happening here. This actually looks great and I'm going to merge.
3 participants
Setting service accounts should use an array of hashes instead
of a hash. See the resource.serviceAccounts[] field in the below
Google API document for details.
https://cloud.google.com/compute/docs/reference/rest/v1/instances/insert