From d5de2f0b674a7834a9b30a081f7d2352da2bdb71 Mon Sep 17 00:00:00 2001
From: Eric Johnson <erjohnso@google.com>
Date: Tue, 1 Apr 2014 16:23:05 +0000
Subject: [PATCH] [google] fix service_account scopes

---
 lib/fog/google/examples/eric-fail.rb    | 20 +++++++++++++-------
 lib/fog/google/models/compute/server.rb | 10 ++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/lib/fog/google/examples/eric-fail.rb b/lib/fog/google/examples/eric-fail.rb
index 2caa66b68..e55dae448 100755
--- a/lib/fog/google/examples/eric-fail.rb
+++ b/lib/fog/google/examples/eric-fail.rb
@@ -2,25 +2,31 @@ def test
   connection = Fog::Compute.new({ :provider => "Google" })
 
   name = "fog-smoke-test-#{Time.now.to_i}"
+  zone = "us-central1-a"
 
   disk = connection.disks.create({
     :name => name,
     :size_gb => 10,
-    :zone_name => 'us-central1-a',
-    :source_image => 'debian-7-wheezy-v20131120',
+    :zone_name => zone,
+    :source_image => 'debian-7-wheezy-v20140318',
   })
 
   disk.wait_for { disk.ready? }
 
+  scopes = [
+    "https://www.googleapis.com/auth/compute",
+    "devstorage.full_control",
+    "userinfo.email"
+  ]
+
   server = connection.servers.create({
     :name => name,
     :disks => [disk],
     :machine_type => "n1-standard-1",
-    :zone_name => "us-central1-a",
-    :private_key_path => File.expand_path("~/.ssh/id_rsa"),
-    :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
-    :username => 'root',
-    :metadata => {'foo' => 'bar'}
+    :zone_name => zone,
+    :metadata => {'foo' => 'bar'},
+    :tags => ["t1", "t2", "t3"],
+    :servce_accounts => scopes
   })
   sleep(90)
 
diff --git a/lib/fog/google/models/compute/server.rb b/lib/fog/google/models/compute/server.rb
index 4f9195126..9b7c53e12 100644
--- a/lib/fog/google/models/compute/server.rb
+++ b/lib/fog/google/models/compute/server.rb
@@ -156,6 +156,16 @@ module Fog
               'tags' => tags
           }.delete_if {|key, value| value.nil?}
 
+          if service_accounts
+            options['serviceAccounts'] = [{
+              "kind" => "compute#serviceAccount",
+              "email" => "default",
+              "scopes" => service_accounts.map {
+                |w| w.start_with?("https://") ? w : "https://www.googleapis.com/auth/#{w}"
+              }
+            }]
+          end
+
           service.insert_server(name, zone_name, options)
           data = service.backoff_if_unfound {service.get_server(self.name, self.zone_name).body}