fog-google 1.3.3 → 1.4.0

data/examples/get_list_images.rb

@@ -23,7 +23,7 @@ def test
 
   puts "Fetching a single image from a global project..."
   puts "------------------------------------------------"
-  img = connection.images.get("debian-8-jessie-v20161215")
+  img = connection.images.get("debian-8-jessie-v20180329")
   raise "Could not GET the image" unless img
   puts img.inspect
 

data/examples/load-balance.rb

@@ -24,7 +24,7 @@ def test
         :name => "#{name}-#{i}",
         :size_gb => 10,
         :zone_name => zone,
-        :source_image => "debian-8-jessie-v20160718"
+        :source_image => "debian-8-jessie-v20180329"
       )
       disk.wait_for { disk.ready? }
     rescue

data/examples/metadata.rb

@@ -15,7 +15,7 @@ def test
     :name => name,
     :size_gb => 10,
     :zone_name => "us-central1-f",
-    :source_image => "debian-8-jessie-v20161215"
+    :source_image => "debian-8-jessie-v20180329"
   )
 
   disk.wait_for { disk.ready? }

data/examples/network.rb

@@ -24,7 +24,7 @@ def test
     :name => name,
     :size_gb => 10,
     :zone_name => "us-central1-a",
-    :source_image => "debian-8-jessie-v20161215"
+    :source_image => "debian-8-jessie-v20180329"
   )
 
   disk.wait_for { disk.ready? }

data/examples/storage_json.rb

@@ -15,7 +15,7 @@ def test
 
   puts "Put a bucket..."
   puts "----------------"
-  connection.put_bucket("fog-smoke-test", options = { "predefinedAcl" => "publicReadWrite" })
+  connection.put_bucket("fog-smoke-test", predefined_acl: "publicReadWrite")
 
   puts "Get the bucket..."
   puts "-----------------"

data/fog-google.gemspec

@@ -25,14 +25,16 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-xml"
 
   # Hard Requirement as of 1.0
-  spec.add_dependency "google-api-client", "~> 0.19.1"
+  spec.add_dependency "google-api-client", "~> 0.23.0"
 
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "osrcry"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "retriable"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "shindo"
   spec.add_development_dependency "vcr"

data/lib/fog/compute/google.rb

@@ -26,8 +26,10 @@ module Fog
                                           https://www.googleapis.com/auth/ndev.cloudman
                                           https://www.googleapis.com/auth/cloud-platform).freeze
       GOOGLE_COMPUTE_DEFAULT_NETWORK = "default".freeze
+      # TODO: Do we need those constants?
       RUNNING = "RUNNING".freeze
       PROVISIONING = "PROVISIONING".freeze
+      STAGING = "STAGING".freeze
 
       request_path "fog/compute/google/requests"
       request :add_backend_service_backends

data/lib/fog/compute/google/mock.rb

@@ -181,25 +181,6 @@ module Fog
 
                     }
                   },
-                  :backend_services => {
-                    "test-backend-service" => {
-                      "kind" => "compute#backend_service",
-                      "id" => "1361932147851415729",
-                      "creationTimestamp" => "2014-08-23T10:06:13.951-07:00",
-                      "name" => "test-backend-service",
-                      "description" => "",
-                      "backends" => [
-                        {
-                          "description" => "",
-                          "group" => "https://www.googleapis.com/resourceviews/v1beta1/projects#{@project}/zones/us-central1-a/zoneViews/name",
-                          "balancingMode" => "RATE",
-                          "capacityScaler" => 1.1,
-                          "maxRate" => 0.5
-                        }
-                      ],
-                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/backendServices/test-backend-service"
-                    }
-                  },
                   :servers => {
                     "fog-1" => {
                       "kind" => "compute#instance",

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

@@ -33,14 +33,21 @@ module Fog
 
           options = {
             :description => description || default_description,
-            :source_image => source_image,
-            :source_snapshot => source_snapshot,
-            :size_gb => size_gb,
             :type => type,
-            :zone => zone
+            :size_gb => size_gb,
+            :source_image => source_image,
+            :source_snapshot => source_snapshot
           }
 
-          data = service.insert_disk(name, zone, source_image, options)
+          if options[:source_image]
+            unless source_image.include?("projects/")
+              options[:source_image] = service.images.get(source_image).self_link
+            end
+          end
+
+          # Request needs backward compatibility so source image is specified in
+          # method arguments
+          data = service.insert_disk(name, zone, options[:source_image], options)
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name, data.zone)
           operation.wait_for { !pending? }

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

@@ -33,6 +33,10 @@ module Fog
           service.delete_instance_group(name, zone_name)
         end
 
+        def add_instance(instance_id)
+          add_instances [instance_id]
+        end
+
         def add_instances(instances)
           requires :identity, :zone
 

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

@@ -11,8 +11,10 @@ module Fog
         attribute :auto_create_subnetworks, aliases => "autoCreateSubnetworks"
         attribute :creation_timestamp, aliases => "creationTimestamp"
         attribute :description
-        attribute :gateway_ipv4, aliases => %w(gateway_i_pv4 gatewayIPv4)
-        attribute :ipv4_range, aliases => %w(i_pv4_range IPv4Range)
+        # TODO: Naming issue in the client lib, rename after this is resolved:
+        # https://github.com/google/google-api-ruby-client/issues/666
+        attribute :gateway_i_pv4, aliases => %w(gateway_ipv4 gatewayIPv4)
+        attribute :i_pv4_range, aliases => %w(ipv4_range IPv4Range)
         attribute :id
         attribute :kind
         attribute :peerings
@@ -20,6 +22,10 @@ module Fog
         attribute :self_link, aliases => "selfLink"
         attribute :subnetworks
 
+        # TODO: Naming issue in the client lib, rename after this is resolved:
+        # https://github.com/google/google-api-ruby-client/issues/666
+        alias_method :ipv4_range, :i_pv4_range
+
         def save
           requires :identity, :ipv4_range
 

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

@@ -145,7 +145,7 @@ module Fog
         attribute :tags
 
         # @return [String]
-        attribute :zone
+        attribute :zone, :aliases => :zone_name
 
         GCE_SCOPE_ALIASES = {
           "default" => %w(
@@ -200,6 +200,14 @@ module Fog
           operation
         end
 
+        # Helper method that returns first public ip address
+        # for Fog::Compute::Server.ssh default behavior
+        #
+        # @return [String]
+        def public_ip_address
+          public_ip_addresses.first
+        end
+
         def public_ip_addresses
           addresses = []
           if network_interfaces.respond_to? :flat_map
@@ -342,15 +350,25 @@ module Fog
           reload
         end
 
+        # Set an instance metadata
+        #
+        # @param [Bool] async Perform the operation asyncronously
+        # @param [Hash] new_metadata A new metadata object
+        #   Format: {'foo' => 'bar', 'baz'=>'foo'}
+        #
+        # @returns [Fog::Compute::Google::Server] server object
         def set_metadata(new_metadata = {}, async = true)
           requires :identity, :zone
 
-          if new_metadata[:items] && new_metadata[:items].is_a?(Hash)
-            new_metadata[:items] = new_metadata[:items].map { |k, v| { :key => k, :value => v } }
+          unless new_metadata.is_a?(Hash)
+            raise Fog::Errors::Error.new("Instance metadata should be a hash")
           end
 
+          # If metadata is presented in {'foo' => 'bar', 'baz'=>'foo'}
+          new_metadata_items = new_metadata.each.map { |k, v| { :key => k.to_s, :value => v.to_s } }
+
           data = service.set_server_metadata(
-            identity, zone_name, metadata[:fingerprint], new_metadata
+            identity, zone_name, metadata[:fingerprint], new_metadata_items
           )
           operation = Fog::Compute::Google::Operations
                       .new(:service => service)
@@ -376,6 +394,12 @@ module Fog
           status == PROVISIONING
         end
 
+        # Check if instance is Staging. On staging vs. provisioning difference:
+        # https://cloud.google.com/compute/docs/instances/checking-instance-status
+        def staging?
+          status == STAGING
+        end
+
         def ready?
           status == RUNNING
         end

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

@@ -26,6 +26,7 @@ module Fog
           load(data)
         end
 
+        # TODO: This method needs to take self_links as well as names
         def get(identity, zone = nil)
           response = nil
           if zone

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

@@ -15,7 +15,7 @@ module Fog
           if region.nil?
             data = []
             service.list_aggregated_subnetworks(filters).to_h[:items].each_value do |region_obj|
-              data.concat(region_obj["subnetworks"]) if region_obj["subnetworks"]
+              data.concat(region_obj[:subnetworks]) if region_obj[:subnetworks]
             end
           else
             data = service.list_subnetworks(region, filters).to_h[:items]

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

@@ -97,6 +97,15 @@ module Fog
         #   behavior returns health checks for all instances associated with
         #   this check.
         # @returns [Hash<String, Array<Hash>>] a map of instance URL to health checks
+        #
+        # Example Hash:
+        # {
+        #   "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-f/instances/myinstance"=>
+        # [{:health_state=>"UNHEALTHY",
+        #   :instance=>"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-f/instances/myinstance"
+        # }]
+        # }
+        #
         def get_health(instance_name = nil)
           requires :identity, :region
 
@@ -104,9 +113,11 @@ module Fog
             instance = service.servers.get(instance_name)
             data = service.get_target_pool_health(identity, region, instance.self_link)
                           .to_h[:health_status] || []
-            results = [instance.self_link, data]
+            results = [[instance.self_link, data]]
           else
             results = instances.map do |self_link|
+              # TODO: Improve the returned object, current is hard to navigate
+              # [{instance => @instance, health_state => "HEALTHY"}, ...]
               data = service.get_target_pool_health(identity, region, self_link)
                             .to_h[:health_status] || []
               [self_link, data]

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

@@ -13,24 +13,31 @@ module Fog
         #
         # @param disk_name [String] Name of the disk to create
         # @param zone_name [String] Zone the disk reside in
-        # @param image_name [String] Optional image name to create the disk from
+        # @param source_image [String] Optional self_link or family formatted url of the image to
+        # create the disk from, see https://cloud.google.com/compute/docs/reference/latest/disks/insert
         # @param opts [Hash] Optional hash of options
         # @option options [String] size_gb Number of GB to allocate to an empty disk
         # @option options [String] source_snapshot Snapshot to create the disk from
         # @option options [String] description Human friendly description of the disk
         # @option options [String] type URL of the disk type resource describing which disk type to use
-        def insert_disk(disk_name, zone, image_name = nil,
+        # TODO: change source_image to keyword argument in 2.0 and properly deprecate
+        def insert_disk(disk_name, zone, source_image = nil,
                         description: nil, type: nil, size_gb: nil,
                         source_snapshot: nil, **_opts)
+
+          if source_image && !source_image.include?("projects/")
+            raise ArgumentError.new("source_image needs to be self-link formatted or specify a family")
+          end
+
           disk = ::Google::Apis::ComputeV1::Disk.new(
             :name => disk_name,
             :description => description,
             :type => type,
             :size_gb => size_gb,
-            :source_snapshot => source_snapshot
+            :source_snapshot => source_snapshot,
+            :source_image => source_image
           )
-          @compute.insert_disk(@project, zone.split("/")[-1], disk,
-                               :source_image => image_name)
+          @compute.insert_disk(@project, zone.split("/")[-1], disk)
         end
       end
     end

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

@@ -99,7 +99,12 @@ module Fog
           end
 
           if data[:tags]
-            data[:tags] = ::Google::Apis::ComputeV1::Tags.new(options[:tags])
+            if options[:tags].is_a?(Array)
+              # Process classic tag notation, i.e. ["fog"]
+              data[:tags] = ::Google::Apis::ComputeV1::Tags.new({ :items => options[:tags] })
+            else
+              data[:tags] = ::Google::Apis::ComputeV1::Tags.new(options[:tags])
+            end
           end
 
           instance = ::Google::Apis::ComputeV1::Instance.new(data)

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

@@ -16,7 +16,18 @@ module Fog
           url_map_obj = ::Google::Apis::ComputeV1::UrlMap.new(
             url_map.merge(:name => url_map_name)
           )
-          @compute.insert_url_map(@project, url_map_obj)
+          # HACK: Currently URL map insert may fail even though the backend
+          # service operation is done. Retriable is not used to not add another
+          # runtime dependency.
+          # TODO: Remove after that has been corrected.
+          begin
+            retries ||= 0
+            @compute.insert_url_map(@project, url_map_obj)
+          rescue ::Google::Apis::ClientError
+            Fog::Logger.warning("URL map insert failed, retrying...")
+            sleep 10
+            retry if (retries += 1) < 2
+          end
         end
       end
     end

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

@@ -18,6 +18,8 @@ module Fog
         #     instance.reload
         #     fingerprint = instance.metadata['fingerprint']
         # @param [Hash] metadata A new metadata object
+        #   Should have the following structure:
+        #   {:items=>[{:key=>"foo", :value=>"bar"}, {:key=>"baz", :value=>"foo"}]}
         #
         # @returns [::Google::Apis::ComputeV1::Operation] set operation
         def set_server_metadata(instance, zone, fingerprint, metadata_items = [])

data/lib/fog/google/shared.rb

@@ -42,12 +42,11 @@ module Fog
           require "google/apis/compute_#{Fog::Compute::Google::GOOGLE_COMPUTE_API_VERSION}"
           require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}"
           require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}"
-          require "google/apis/resourceviews_v1beta2"
           require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}"
           require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}"
           require "googleauth"
         rescue LoadError => error
-          Fog::Logger.error("Please install the google-api-client (>= 0.9) gem before using this provider")
+          Fog::Errors::Error.new("Please install the google-api-client (>= 0.9) gem before using this provider")
           raise error
         end
 

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.3.3".freeze
+    VERSION = "1.4.0".freeze
   end
 end

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

@@ -26,6 +26,24 @@ module Fog
 
         # attribute :body
 
+        # https://cloud.google.com/storage/docs/access-control/lists#predefined-acls
+        VALID_PREDEFINED_ACLS = [
+          "authenticatedRead",
+          "bucketOwnerFullControl",
+          "bucketOwnerRead",
+          "private",
+          "projectPrivate",
+          "publicRead",
+          "publicReadWrite"
+        ].freeze
+
+        def predefined_acl=(new_predefined_acl)
+          unless VALID_PREDEFINED_ACLS.include?(new_predefined_acl)
+            raise ArgumentError.new("acl must be one of [#{VALID_PREDEFINED_ACLS.join(', ')}]")
+          end
+          @predefined_acl = new_predefined_acl
+        end
+
         def body
           last_modified && (file = collection.get(identity)) ? attributes[:body] ||= file.body : attributes[:body] ||= ""
         end
@@ -52,6 +70,17 @@ module Fog
           false
         end
 
+        def public=(new_public)
+          unless new_public.nil?
+            if new_public
+              @predefined_acl = "publicRead"
+            else
+              @predefined_acl = "projectPrivate"
+            end
+          end
+          new_public
+        end
+
         def public_url
           requires :directory, :key
           "https://storage.googleapis.com/#{directory.key}/#{key}"
@@ -60,7 +89,6 @@ module Fog
         FILE_INSERTABLE_FIELDS = %i(
           content_type
           predefined_acl
-          acl
           cache_control
           content_disposition
           content_encoding
@@ -74,6 +102,8 @@ module Fog
             FILE_INSERTABLE_FIELDS.map { |k| [k, attributes[k]] }
                                   .reject { |pair| pair[1].nil? }
           ]
+          
+          options[:predefined_acl] ||= @predefined_acl
 
           service.put_object(directory.key, key, body, options)
           self.content_length = Fog::Storage.get_body_size(body)