fog-google 0.3.2 → 0.4.0

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

@@ -14,7 +14,7 @@ module Fog
             end
           end
 
-          load(data["items"])
+          load(data)
         end
 
         def get(identity, zone = nil)
@@ -32,16 +32,22 @@ module Fog
           nil
         end
 
+        # TODO: To be deprecated
         def add_instance(params)
-          data = service.add_instance_group_instance(params[:group], params[:zone], params[:instance])
+          Fog::Logger.deprecation(
+            "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller.first})[/]"
+          )
+          params[:instance] = [params[:instance]] unless params[:instance] == Array
+          service.add_instance_group_instances(params[:group], params[:zone], params[:instance])
         end
 
+        # TODO: To be deprecated
         def remove_instance(params)
-          data = service.remove_instance_group_instance(params[:group], params[:zone], params[:instance])
-        end
-
-        def get_instances(params)
-          data = service.list_instance_group_instances(params[:group], params[:zone])
+          Fog::Logger.deprecation(
+            "#{self.class}.#{__method__} is deprecated, use Fog::Compute::Google::InstanceGroup.#{__method__} instead [light_black](#{caller.first})[/]"
+          )
+          params[:instance] = [params[:instance]] unless params[:instance] == Array
+          service.remove_instance_group_instances(params[:group], params[:zone], params[:instance])
         end
       end
     end

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

@@ -76,7 +76,7 @@ module Fog
           resources = [resources] unless resources.class == Array
           resources.map { |resource| resource.class == String ? resource : resource.self_link }
           service.add_zone_view_resources(self, resources, @zone) if @zone
-          service.add_region_view_resources(self, reources, @region) if @region
+          service.add_region_view_resources(self, resources, @region) if @region
           reload
         end
 

data/lib/fog/compute/google/requests/{add_instance_group_instance.rb → add_instance_group_instances.rb}

@@ -2,13 +2,13 @@ module Fog
   module Compute
     class Google
       class Mock
-        def add_instance_group_instance(_group_name, _zone, _instances)
+        def add_instance_group_instances(_group_name, _zone, _instances)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def add_instance_group_instance(group_name, zone, instance_name)
+        def add_instance_group_instances(group_name, zone, instances)
           api_method = @compute.instance_groups.add_instances
 
           parameters = {
@@ -17,12 +17,16 @@ module Fog
             "zone" => zone
           }
 
+          instances.map! do |instance|
+            if instance.start_with?("https:")
+              { "instance" => instance }
+            else
+              { "instance" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/instances/#{instance}\n" }
+            end
+          end
+
           body_object = {
-            "instances" => [
-              {
-                "instance" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/instances/#{instance_name}\n"
-              }
-            ]
+            "instances" => instances
           }
 
           request(api_method, parameters, body_object)

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

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class Google
+      # Returns the latest non-deprecated image that is part of an image family.
+      #
+      # ==== Parameters
+      # * family<~String> - Name of the image resource to return.
+      #
+      # ==== Returns
+      # * response<~Excon::Response>:
+      #   * body<~Hash> - corresponding compute#image resource
+      #
+      # ==== See also:
+      # https://cloud.google.com/compute/docs/reference/latest/images/getFromFamily
+      class Mock
+        def get_image_from_family(_family, _project = @project)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def get_image_from_family(family, project = nil)
+          api_method = @compute.images.get_from_family
+          project = @project if project.nil?
+          parameters = {
+            "family" => family,
+            "project" => project
+          }
+
+          request(api_method, parameters)
+        end
+      end
+    end
+  end
+end

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

@@ -161,6 +161,10 @@ module Fog
           if options.key? "preemptible"
             scheduling["preemptible"] = options.delete "preemptible"
             scheduling["preemptible"] = scheduling["preemptible"].class == TrueClass
+            # If we don't have an explicit value for "on_host_maintenance, then
+            # force the value to be 'TERMINATE' as it's the default and
+            # only-accepted value for preemptible vms
+            scheduling["onHostMaintenance"] = "TERMINATE" unless options.key? "on_host_maintenance"
           end
           if options.key? "on_host_maintenance"
             ohm = options.delete "on_host_maintenance"

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

@@ -8,12 +8,12 @@ module Fog
       end
 
       class Real
-        def list_instance_group_instances(group, zone)
+        def list_instance_group_instances(group_name, zone)
           api_method = @compute.instance_groups.list_instances
           parameters = {
+            "instanceGroup" => group_name,
             "project" => @project,
-            "zone" => zone,
-            "group" => group
+            "zone" => zone
           }
 
           request(api_method, parameters)

data/lib/fog/compute/google/requests/{remove_instance_group_instance.rb → remove_instance_group_instances.rb}

@@ -2,13 +2,13 @@ module Fog
   module Compute
     class Google
       class Mock
-        def remove_instance_group_instance(_group_name, _zone, _instances)
+        def add_instance_group_instances(_group, _zone, _instances)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def remove_instance_group_instance(group_name, zone, instance_name)
+        def remove_instance_group_instances(group_name, zone, instances)
           api_method = @compute.instance_groups.remove_instances
 
           parameters = {
@@ -17,12 +17,16 @@ module Fog
             "zone" => zone
           }
 
+          instances.map! do |instance|
+            if instance.start_with?("https:")
+              { "instance" => instance }
+            else
+              { "instance" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/instances/#{instance}\n" }
+            end
+          end
+
           body_object = {
-            "instances" => [
-              {
-                "instance" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/instances/#{instance_name}\n"
-              }
-            ]
+            "instances" => instances
           }
 
           request(api_method, parameters, body_object)

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.3.2".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/lib/fog/storage/google_json.rb

@@ -35,12 +35,11 @@ module Fog
       request :get_bucket_acl
       request :get_object
       request :get_object_acl
-      # request :get_object_torrent
       request :get_object_http_url
       request :get_object_https_url
       request :get_object_url
-      # request :get_service
       request :head_object
+      request :list_buckets
       request :put_bucket
       request :put_bucket_acl
       request :put_object

data/lib/fog/storage/google_json/models/directories.rb

@@ -4,11 +4,10 @@ module Fog
       class Directories < Fog::Collection
         model Fog::Storage::GoogleJSON::Directory
 
-        # TODO: get_service does not return items like this
-        # def all
-        #   data = service.get_service.body["items"]
-        #   load(data)
-        # end
+        def all
+          data = service.list_buckets.body["items"] || []
+          load(data)
+        end
 
         def get(key, options = {})
           remap_attributes(options,             :delimiter  => "delimiter",

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

@@ -52,9 +52,9 @@ module Fog
 
         attr_reader :directory
 
-        def copy(target_directory_key, target_file_key)
+        def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          service.copy_object(directory.key, key, target_directory_key, target_file_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
           target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end

data/lib/fog/storage/google_json/real.rb

@@ -18,13 +18,12 @@ module Fog
         end
 
         def signature(params)
-          string_to_sign =
-            <<-DATA
+          string_to_sign = <<-DATA
 #{params[:method]}
-          #{params[:headers]['Content-MD5']}
-          #{params[:headers]['Content-Type']}
-          #{params[:headers]['Date']}
-          DATA
+#{params[:headers]['Content-MD5']}
+#{params[:headers]['Content-Type']}
+#{params[:headers]['Date']}
+DATA
 
           google_headers = {}
           canonical_google_headers = ""
@@ -45,7 +44,7 @@ module Fog
           canonical_resource << params[:path].to_s
           canonical_resource << "?"
           for key in (params[:query] || {}).keys
-            if %w(acl cors location logging requestPayment torrent versions versioning).include?(key)
+            if %w(acl cors location logging requestPayment versions versioning).include?(key)
               canonical_resource << "#{key}&"
             end
           end

data/lib/fog/storage/google_json/requests/get_object_http_url.rb

@@ -15,7 +15,7 @@ module Fog
       end
 
       class Real
-        # Get an expiring object http url from S3
+        # Get an expiring object http url from GCS
         #
         # ==== Parameters
         # * bucket_name<~String> - Name of bucket containing object

data/lib/fog/storage/google_json/requests/get_object_url.rb

@@ -2,7 +2,7 @@ module Fog
   module Storage
     class GoogleJSON
       class Real
-        # Get an expiring object url from Google Storage
+        # Get an expiring object url from GCS
         # Deprecated, redirects to get_object_https_url.rb
 
         def get_object_url(bucket_name, object_name, expires)

data/lib/fog/storage/google_json/requests/list_buckets.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Storage
+    class GoogleJSON
+      class Real
+        # Retrieves a list of buckets for a given project.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash> - Hash of bucket items
+        #     * 'kind'<~String> - The kind of item this is (storage#buckets)
+        #     * 'items'<~Array> - The array of items.
+        #
+        # ==== See Also
+        # https://cloud.google.com/storage/docs/json_api/v1/buckets/list
+        # TODO: check if very large lists require working with nextPageToken
+        def list_buckets
+          api_method = @storage_json.buckets.list
+          parameters = {
+            "project" => @project
+          }
+
+          request(api_method, parameters)
+        end
+      end
+      class Mock
+        def list_buckets
+          Fog::Mock.not_implemented
+        end
+      end
+    end
+  end
+end

data/lib/fog/storage/google_json/requests/put_bucket.rb

@@ -2,19 +2,24 @@ module Fog
   module Storage
     class GoogleJSON
       class Real
-        # Create an Google Storage bucket
-        # https://cloud.google.com/storage/docs/json_api/v1/buckets/insert
+        # Create a Google Storage bucket
         #
         # ==== Parameters
         # * bucket_name<~String> - name of bucket to create
         # * options<~Hash> - config arguments for bucket.  Defaults to {}.
         #   * 'LocationConstraint'<~Symbol> - sets the location for the bucket
-        #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        #   * 'predefinedAcl'<~String> - Apply a predefined set of access controls to this bucket.
+        #   * 'predefinedDefaultObjectAcl'<~String> - Apply a predefined set of default object access controls to this bucket.
+        # * body_options<~Hash> - body arguments for bucket creation.
+        #   See https://cloud.google.com/storage/docs/json_api/v1/buckets/insert#request-body
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * status<~Integer> - 200
-        def put_bucket(bucket_name, options = {})
+        #
+        # ==== See also
+        # https://cloud.google.com/storage/docs/json_api/v1/buckets/insert
+        def put_bucket(bucket_name, options = {}, body_options = {})
           location = options["LocationConstraint"] if options["LocationConstraint"]
 
           api_method = @storage_json.buckets.insert
@@ -22,18 +27,19 @@ module Fog
             "project" => @project,
             "projection" => "full"
           }
+          parameters.merge! options
           body_object = {
             "name" => bucket_name,
             "location" => location
           }
-          parameters.merge! options
+          body_object.merge! body_options
 
           request(api_method, parameters, body_object = body_object)
         end
       end
 
       class Mock
-        def put_bucket(bucket_name, options = {})
+        def put_bucket(bucket_name, options = {}, _body_options = {})
           acl = options["x-goog-acl"] || "private"
           if !%w(private publicRead publicReadWrite authenticatedRead).include?(acl)
             raise Excon::Errors::BadRequest.new("invalid x-goog-acl")

data/lib/fog/storage/google_xml.rb

@@ -22,7 +22,6 @@ module Fog
       request :get_bucket_acl
       request :get_object
       request :get_object_acl
-      request :get_object_torrent
       request :get_object_http_url
       request :get_object_https_url
       request :get_object_url

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

@@ -45,9 +45,9 @@ module Fog
 
         attr_reader :directory
 
-        def copy(target_directory_key, target_file_key)
+        def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
-          service.copy_object(directory.key, key, target_directory_key, target_file_key)
+          service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
           target_directory = service.directories.new(:key => target_directory_key)
           target_directory.files.get(target_file_key)
         end

data/lib/fog/storage/google_xml/real.rb

@@ -64,7 +64,7 @@ DATA
           canonical_resource << params[:path].to_s
           canonical_resource << "?"
           (params[:query] || {}).keys.each do |key|
-            if %w(acl cors location logging requestPayment torrent versions versioning).include?(key)
+            if %w(acl cors location logging requestPayment versions versioning).include?(key)
               canonical_resource << "#{key}&"
             end
           end

data/lib/fog/storage/google_xml/requests/get_object_http_url.rb

@@ -15,7 +15,7 @@ module Fog
       end
 
       class Real
-        # Get an expiring object http url from S3
+        # Get an expiring object http url from GCS
         #
         # ==== Parameters
         # * bucket_name<~String> - Name of bucket containing object
@@ -25,9 +25,6 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include GetObjectHttpUrl
       end

data/lib/fog/storage/google_xml/requests/get_object_https_url.rb

@@ -25,9 +25,6 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include GetObjectHttpsUrl
       end

data/lib/fog/storage/google_xml/requests/get_object_url.rb

@@ -12,9 +12,6 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         def get_object_url(bucket_name, object_name, expires)
           Fog::Logger.deprecation("Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})")