fog 1.18.0 → 1.19.0

data/lib/fog/google/examples/create.rb

@@ -9,6 +9,7 @@ def test
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),
     :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
     :user => ENV['USER'],
+    :tags => ["fog"]
   })
 
   # My own wait_for because it hides errors

data/lib/fog/google/models/compute/disk.rb

@@ -38,7 +38,13 @@ module Fog
 
         def destroy
           requires :name, :zone_name
-          service.delete_disk(name, zone_name)
+          operation = service.delete_disk(name, zone_name)
+          # wait until "RUNNING" or "DONE" to ensure the operation doesn't fail, raises exception on error
+          Fog.wait_for do
+            operation = service.get_zone_operation(zone_name, operation.body["name"])
+            operation.body["status"] != "PENDING"
+          end
+          operation
         end
 
         def zone

data/lib/fog/google/models/compute/operation.rb

@@ -0,0 +1,42 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Google
+
+      class Operation < Fog::Model
+
+        identity :name
+
+        attribute :kind, :aliases => 'kind'
+        attribute :id, :aliases => 'id'
+        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :zone_name, :aliases => 'zone'
+        attribute :status, :aliases => 'status'
+        attribute :self_link, :aliases => 'selfLink'
+
+        def ready?
+          self.status == DONE_STATE
+        end
+
+        def pending?
+          self.status == PENDING_STATE
+        end
+
+        def reload
+          requires :identity
+
+          data = collection.get(identity, zone)
+          new_attributes = data.attributes
+          merge_attributes(new_attributes)
+          self
+        end
+
+        PENDING_STATE = "PENDING"
+        RUNNING_STATE = "RUNNING"
+        DONE_STATE = "DONE"
+
+      end
+    end
+  end
+end

data/lib/fog/google/models/compute/operations.rb

@@ -0,0 +1,26 @@
+require 'fog/core/collection'
+require 'fog/google/models/compute/operation'
+
+module Fog
+  module Compute
+    class Google
+
+      class Operations < Fog::Collection
+
+        model Fog::Compute::Google::Operation
+
+        def get(identity, zone=nil)
+          if zone.nil?
+            response = service.get_global_operation(identity)
+          else
+            response = service.get_zone_operation(zone, identity)
+          end
+          return nil if response.nil?
+          new(response.body)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/models/compute/server.rb

@@ -18,10 +18,25 @@ module Fog
         attribute :disks, :aliases => 'disks'
         attribute :kernel, :aliases => 'kernel'
         attribute :metadata
+        attribute :tags, :squash => 'items'
+
+        def flavor_id
+          machine_type
+        end
+
+        def flavor_id=(flavor_id)
+          machine_type=flavor_id
+        end
 
         def destroy
           requires :name, :zone
-          service.delete_server(name, zone)
+          operation = service.delete_server(name, zone)
+          # wait until "RUNNING" or "DONE" to ensure the operation doesn't fail, raises exception on error
+          Fog.wait_for do
+            operation = service.get_zone_operation(zone_name, operation.body["name"])
+            operation.body["status"] != "PENDING"
+          end
+          operation
         end
 
         def image
@@ -112,7 +127,8 @@ module Fog
               'externalIp' => external_ip,
               'disks' => disks,
               'kernel' => kernel,
-              'metadata' => metadata
+              'metadata' => metadata,
+              'tags' => tags
           }.delete_if {|key, value| value.nil?}
 
           service.insert_server(name, zone_name, options)

data/lib/fog/google/models/compute/servers.rb

@@ -47,13 +47,14 @@ module Fog
         def bootstrap(new_attributes = {})
           defaults = {
             :name => "fog-#{Time.now.to_i}",
-            :image_name => "debian-7-wheezy-v20130816",
+            :image_name => "debian-7-wheezy-v20131014",
             :machine_type => "n1-standard-1",
             :zone_name => "us-central1-b",
             :private_key_path => File.expand_path("~/.ssh/id_rsa"),
             :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
             :username => ENV['USER'],
           }
+
           if new_attributes[:disks]
             new_attributes[:disks].each do |disk|
               defaults.delete :image_name if disk['boot']

data/lib/fog/google/models/compute/zones.rb

@@ -15,7 +15,7 @@ module Fog
         end
 
         def get(identity)
-          data = connection.get_zone(identity).body
+          data = service.get_zone(identity).body
           new(data)
         rescue Excon::Errors::NotFound
           nil

data/lib/fog/google/models/storage/file.rb

@@ -121,7 +121,7 @@ module Fog
           options['Content-MD5'] = content_md5 if content_md5
           options['Content-Type'] = content_type if content_type
           options['Expires'] = expires if expires
-          options.merge(metadata)
+          options.merge!(metadata)
 
           data = service.put_object(directory.key, key, body, options)
           merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})

data/lib/fog/google/models/storage/files.rb

@@ -93,7 +93,7 @@ module Fog
 
         def new(attributes = {})
           requires :directory
-          super({ :directory => directory }.merge!(attributes))
+          super({ :directory => directory }.merge(attributes))
         end
 
       end

data/lib/fog/google/requests/compute/delete_disk.rb

@@ -4,8 +4,28 @@ module Fog
 
       class Mock
 
-        def delete_disk(disk_name)
-          Fog::Mock.not_implemented
+        def delete_disk(disk_name, zone_name)
+          get_disk(disk_name, zone_name)
+
+          operation = self.random_operation
+          self.data[:operations][operation] = {
+            "kind" => "compute#operation",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
+            "operationType" => "delete",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
+            "targetId" => self.data[:disks][disk_name]["id"],
+            "status" => Fog::Compute::Google::Operation::PENDING_STATE,
+            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
+            "progress" => 0,
+            "insertTime" => Time.now.iso8601,
+            "startTime" => Time.now.iso8601,
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+          }
+          self.data[:disks].delete disk_name
+
+          build_response(:body => self.data[:operations][operation])
         end
 
       end

data/lib/fog/google/requests/compute/delete_global_operation.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def delete_global_operation(operation)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+        # https://developers.google.com/compute/docs/reference/latest/globalOperations
+
+        def delete_global_operation(operation)
+          api_method = @compute.global_operations.delete
+          parameters = {
+            'project' => @project,
+            'operation' => operation
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/compute/delete_server.rb

@@ -28,21 +28,25 @@ module Fog
           server = self.data[:servers][server_name]
           server["status"] = "STOPPED"
           server["mock-deletionTimestamp"] = Time.now.iso8601
-          build_response(:body => {
+
+          operation = self.random_operation
+          self.data[:operations][operation] = {
             "kind" => "compute#operation",
-            "id" => "10035781241131638365",
-            "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
-            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
+            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "delete",
-            "targetLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
-            "targetId" => "14544909043643897380",
-            "status" => "PENDING",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
+            "targetId" => self.data[:servers][server_name]["id"],
+            "status" => Fog::Compute::Google::Operation::PENDING_STATE,
             "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
             "progress" => 0,
             "insertTime" => Time.now.iso8601,
             "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
-          })
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+          }
+
+          build_response(:body => self.data[:operations][operation])
         end
 
       end

data/lib/fog/google/requests/compute/delete_zone_operation.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def delete_zone_operation(zone, operation)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+        # https://developers.google.com/compute/docs/reference/latest/zoneOperations
+
+        def delete_zone_operation(zone_name, operation)
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+          api_method = @compute.zone_operations.delete
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+            'operation' => operation
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/compute/get_disk.rb

@@ -4,8 +4,32 @@ module Fog
 
       class Mock
 
-        def get_disk(disk_name)
-          Fog::Mock.not_implemented
+        def get_disk(disk_name, zone_name)
+          disk = self.data[:disks][disk_name]
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+          get_zone(zone_name)
+          zone = self.data[:zones][zone_name]
+          if disk.nil? or disk["zone"] != zone["selfLink"]
+            return build_response(:body => {
+              "error" => {
+                "errors" => [
+                 {
+                  "domain" => "global",
+                  "reason" => "notFound",
+                  "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}' was not found"
+                 }
+                ],
+                "code" => 404,
+                "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}' was not found"
+              }
+            })
+          end
+
+          # TODO transition the disk through the states
+
+          build_response(:body => disk)
         end
 
       end

data/lib/fog/google/requests/compute/{delete_operation.rb → get_global_operation.rb}

@@ -4,27 +4,26 @@ module Fog
 
       class Mock
 
-        def delete_operation(operation_name)
+        def get_global_operation(operation)
           Fog::Mock.not_implemented
         end
 
       end
 
       class Real
+        # https://developers.google.com/compute/docs/reference/latest/globalOperations
 
-        def delete_operation(operation_name)
-          api_method = @compute.operations.delete
+        def get_global_operation(operation)
+          api_method = @compute.global_operations.get
           parameters = {
             'project' => @project,
-            'operation' => operation_name
+            'operation' => operation
           }
 
           result = self.build_result(api_method, parameters)
           response = self.build_response(result)
         end
-
       end
-
     end
   end
 end

data/lib/fog/google/requests/compute/get_image.rb

@@ -5,17 +5,17 @@ module Fog
       class Mock
 
         def get_image(image_name, project=@project)
-          image = self.class.data[project][:images][image_name] || {
+          image = data(project)[:images][image_name] || {
             "error" => {
               "errors" => [
                 {
                   "domain" => "global",
                   "reason" => "invalid",
-                  "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
+                  "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/#{api_version}/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
                 }
               ],
               "code" => 400,
-              "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
+              "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/#{api_version}/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
             }
           }
           build_response(:body => image)

data/lib/fog/google/requests/compute/get_server.rb

@@ -6,6 +6,7 @@ module Fog
 
         def get_server(server_name, zone_name)
           server = self.data[:servers][server_name]
+          get_zone(zone_name)
           zone = self.data[:zones][zone_name]
           if server.nil? or server["zone"] != zone["selfLink"]
             return build_response(:body => {

data/lib/fog/google/requests/compute/get_zone_operation.rb

@@ -0,0 +1,58 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def get_zone_operation(zone_name, operation)
+          operation = self.data[:operations][operation]
+          if operation
+            case operation["status"]
+            when Fog::Compute::Google::Operation::PENDING_STATE
+              operation["status"] = Fog::Compute::Google::Operation::RUNNING_STATE
+              operation["progress"] = 50
+            else
+              operation["status"] = Fog::Compute::Google::Operation::DONE_STATE
+              operation["progress"] = 100
+            end
+          else
+            operation = {
+              "error" => {
+                "errors" => [
+                 {
+                  "domain" => "global",
+                  "reason" => "notFound",
+                  "message" => "The resource 'projects/#{project}/zones/#{zone_name}/operations/#{operation}' was not found"
+                 }
+                ],
+                "code" => 404,
+                "message" => "The resource 'projects/#{project}/zones/#{zone_name}/operations/#{operation}' was not found"
+              }
+            }
+          end
+          build_response(:body => operation)
+        end
+      end
+
+      class Real
+        # https://developers.google.com/compute/docs/reference/latest/zoneOperations
+
+        def get_zone_operation(zone_name, operation)
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+
+          api_method = @compute.zone_operations.get
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+            'operation' => operation
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end