fog-google 1.6.0 → 1.7.0

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

@@ -50,7 +50,7 @@ module Fog
 
           if disks.nil? || disks.empty?
             # create the persistent boot disk
-            source_img = service.images.get_from_family("debian-8")
+            source_img = service.images.get_from_family("debian-9")
             disk_defaults = {
               :name => name,
               :size_gb => 10,

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

@@ -24,7 +24,7 @@ module Fog
           )
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -26,7 +26,7 @@ module Fog
           data = service.insert_subnetwork(identity, region, network, ip_cidr_range, attributes)
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -18,7 +18,7 @@ module Fog
           )
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -10,11 +10,24 @@ module Fog
         attribute :kind, :aliases => "kind"
         attribute :self_link, :aliases => "selfLink"
         attribute :url_map, :aliases => "urlMap"
+        # Array of SSL Certificates
+        # @example
+        #
+        #   [cert_one.self_link', cert_two.self_link]
+        #
+        # , where 'cert_one' and 'cert_two' are instances of
+        # Fog::Compute::Google::SslCertificate
+        #
+        # @return [Array<String>]
         attribute :ssl_certificates, :aliases => "sslCertificates"
 
         def save
           requires :identity, :url_map, :ssl_certificates
 
+          unless ssl_certificates.is_a?(Array)
+            raise Fog::Errors::Error.new("ssl_certificates attribute must be an array")
+          end
+
           data = service.insert_target_https_proxy(
             identity,
             :description => description,
@@ -23,7 +36,7 @@ module Fog
           )
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -26,7 +26,7 @@ module Fog
           data = service.insert_target_instance(identity, zone, options)
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name, data.zone)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -25,7 +25,7 @@ module Fog
           operation = Fog::Compute::Google::Operations
                       .new(:service => service)
                       .get(data.name, nil, data.region)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -36,7 +36,7 @@ module Fog
           end
           operation = Fog::Compute::Google::Operations.new(:service => service)
                                                       .get(data.name)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

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

@@ -50,7 +50,7 @@ module Fog
         #       :disks => [
         #         {
         #           :initialize_params => {
-        #             :source_image => "projects/debian-cloud/global/images/family/debian-8"
+        #             :source_image => "projects/debian-cloud/global/images/family/debian-9"
         #           }
         #         }
         #       ]

data/lib/fog/dns/google/models/record.rb

@@ -72,7 +72,7 @@ module Fog
           change = Fog::DNS::Google::Changes
                    .new(:service => service, :zone => zone)
                    .get(data.id)
-          change.wait_for { !pending? }
+          change.wait_for { ready? }
           self
         end
 

data/lib/fog/google/models/sql/instance.rb

@@ -318,7 +318,7 @@ module Fog
 
           data = service.update_instance(identity, settings_version, tier, settings)
           operation = Fog::Google::SQL::Operations.new(:service => service).get(data.name)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
           reload
         end
 

data/lib/fog/google/models/sql/user.rb

@@ -42,7 +42,7 @@ module Fog
           end
 
           operation = Fog::Google::SQL::Operations.new(:service => service).get(resp.name)
-          operation.wait_for { !pending? }
+          operation.wait_for { ready? }
         end
       end
     end

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.6.0".freeze
+    VERSION = "1.7.0".freeze
   end
 end

data/lib/fog/storage/google_json.rb

@@ -16,7 +16,10 @@ module Fog
         :google_key_location,
         :google_key_string,
         :google_json_key_location,
-        :google_json_key_string
+        :google_json_key_string,
+        :open_timeout_sec,
+        :read_timeout_sec,
+        :send_timeout_sec
       )
 
       # https://cloud.google.com/storage/docs/json_api/v1/

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

@@ -5,8 +5,11 @@ module Fog
         include Utils
         include Fog::Google::Shared
 
+        MockClient = Struct.new(:issuer)
+
         def initialize(options = {})
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          @client = MockClient.new('test')
         end
 
         def signature(_params)

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

@@ -112,9 +112,9 @@ module Fog
         end
 
         # params[:expires] : Eg: Time.now to integer value.
-        def url(expires)
+        def url(expires, options = {})
           requires :key
-          collection.get_https_url(key, expires)
+          collection.get_https_url(key, expires, options)
         end
 
         private

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

@@ -40,9 +40,9 @@ module Fog
           nil
         end
 
-        def get_https_url(key, expires)
+        def get_https_url(key, expires, options = {})
           requires :directory
-          service.get_object_https_url(directory.key, key, expires)
+          service.get_object_https_url(directory.key, key, expires, options)
         end
 
         def metadata(key, options = {})

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

@@ -15,6 +15,9 @@ module Fog
 
           @client = initialize_google_client(options)
           @storage_json = ::Google::Apis::StorageV1::StorageService.new
+          @storage_json.client_options.open_timeout_sec = options[:open_timeout_sec] if options[:open_timeout_sec]
+          @storage_json.client_options.read_timeout_sec = options[:read_timeout_sec] if options[:read_timeout_sec]
+          @storage_json.client_options.send_timeout_sec = options[:send_timeout_sec] if options[:send_timeout_sec]
         end
 
         def signature(params)

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

@@ -2,15 +2,14 @@ module Fog
   module Storage
     class GoogleJSON
       module GetObjectHttpUrl
-        def get_object_http_url(bucket_name, object_name, expires)
+        def get_object_http_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("object_name is required") unless object_name
-          http_url({
-                     :headers  => {},
-                     :host     => @host,
-                     :method   => "GET",
-                     :path     => "#{bucket_name}/#{object_name}"
-                   }, expires)
+          http_url(options.merge(:headers  => {},
+                                 :host     => @host,
+                                 :method   => "GET",
+                                 :path     => "#{bucket_name}/#{object_name}"),
+                   expires)
         end
       end
 

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

@@ -2,16 +2,15 @@ module Fog
   module Storage
     class GoogleJSON
       module GetObjectHttpsUrl
-        def get_object_https_url(bucket_name, object_name, expires)
+        def get_object_https_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("object_name is required") unless object_name
 
-          https_url({
-                      :headers  => {},
-                      :host     => @host,
-                      :method   => "GET",
-                      :path     => "#{bucket_name}/#{object_name}"
-                    }, expires)
+          https_url(options.merge(:headers  => {},
+                                  :host     => @host,
+                                  :method   => "GET",
+                                  :path     => "#{bucket_name}/#{object_name}"),
+                    expires)
         end
       end
 

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

@@ -4,16 +4,16 @@ module Fog
       class Real
         # Get an expiring object url from GCS
         # Deprecated, redirects to get_object_https_url.rb
-        def get_object_url(bucket_name, object_name, expires)
+        def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
-          get_object_https_url(bucket_name, object_name, expires)
+          get_object_https_url(bucket_name, object_name, expires, options)
         end
       end
 
       class Mock # :nodoc:all
-        def get_object_url(bucket_name, object_name, expires)
+        def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
-          get_object_https_url(bucket_name, object_name, expires)
+          get_object_https_url(bucket_name, object_name, expires, options)
         end
       end
     end

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

@@ -20,7 +20,13 @@ module Fog
         def host_path_query(params, expires)
           params[:headers]["Date"] = expires.to_i
           params[:path] = URI.encode(params[:path]).gsub("%2F", "/")
-          query = [params[:query]].compact
+          query = []
+
+          if params[:query]
+            filtered = params[:query].reject { |k, v| k.nil? || v.nil? }
+            query = filtered.map { |k, v| [k.to_s, Fog::Google.escape(v)].join("=") }
+          end
+
           query << "GoogleAccessId=#{@client.issuer}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"

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

@@ -116,9 +116,9 @@ module Fog
           true
         end
 
-        def url(expires)
+        def url(expires, options = {})
           requires :key
-          collection.get_http_url(key, expires)
+          collection.get_http_url(key, expires, options)
         end
 
         private

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

@@ -66,14 +66,14 @@ module Fog
           nil
         end
 
-        def get_http_url(key, expires)
+        def get_http_url(key, expires, options = {})
           requires :directory
-          service.get_object_http_url(directory.key, key, expires)
+          service.get_object_http_url(directory.key, key, expires, options)
         end
 
-        def get_https_url(key, expires)
+        def get_https_url(key, expires, options = {})
           requires :directory
-          service.get_object_https_url(directory.key, key, expires)
+          service.get_object_https_url(directory.key, key, expires, options)
         end
 
         def head(key, options = {})

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

@@ -2,15 +2,16 @@ module Fog
   module Storage
     class GoogleXML
       module GetObjectHttpUrl
-        def get_object_http_url(bucket_name, object_name, expires)
+        def get_object_http_url(bucket_name, object_name, expires, options = {})
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("object_name is required") unless object_name
-          http_url({
-                     :headers  => {},
-                     :host     => @host,
-                     :method   => "GET",
-                     :path     => "#{bucket_name}/#{object_name}"
-                   }, expires)
+
+          https_url(options.merge(:headers  => {},
+                                  :host     => @host,
+                                  :method   => "GET",
+                                  :path     => "#{bucket_name}/#{object_name}"),
+                    expires)
+          http_url(url_options, expires)
         end
       end
 

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

@@ -2,15 +2,15 @@ module Fog
   module Storage
     class GoogleXML
       module GetObjectHttpsUrl
-        def get_object_https_url(bucket_name, object_name, expires)
+        def get_object_https_url(bucket_name, object_name, expires, options)
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("object_name is required") unless object_name
-          https_url({
-                      :headers  => {},
-                      :host     => @host,
-                      :method   => "GET",
-                      :path     => "#{bucket_name}/#{object_name}"
-                    }, expires)
+
+          https_url(options.merge(:headers  => {},
+                                  :host     => @host,
+                                  :method   => "GET",
+                                  :path     => "#{bucket_name}/#{object_name}"),
+                    expires)
         end
       end
 

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

@@ -8,21 +8,22 @@ module Fog
         # * bucket_name<~String> - Name of bucket containing object
         # * object_name<~String> - Name of object to get expiring url for
         # * expires<~Time> - An expiry time for this url
+        # * options<~Hash> - A list of key-value pairs to send as query strings
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
 
-        def get_object_url(bucket_name, object_name, expires)
+        def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})")
-          get_object_https_url(bucket_name, object_name, expires)
+          get_object_https_url(bucket_name, object_name, expires, options)
         end
       end
 
       class Mock # :nodoc:all
-        def get_object_url(bucket_name, object_name, expires)
+        def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(1..1).first})")
-          get_object_https_url(bucket_name, object_name, expires)
+          get_object_https_url(bucket_name, object_name, expires, options)
         end
       end
     end

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

@@ -31,7 +31,13 @@ module Fog
         def host_path_query(params, expires)
           params[:headers]["Date"] = expires.to_i
           params[:path] = Fog::Google.escape(params[:path]).gsub("%2F", "/")
-          query = [params[:query]].compact
+          query = []
+
+          if params[:query]
+            filtered = params[:query].reject { |k, v| k.nil? || v.nil? }
+            query = filtered.map { |k, v| [k.to_s, Fog::Google.escape(v)].join("=") }
+          end
+
           query << "GoogleAccessId=#{@google_storage_access_key_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"

data/tasks/test.rake

@@ -17,28 +17,40 @@ namespace :test do
   multitask :parallel => ["test:compute",
                           "test:monitoring",
                           "test:pubsub",
-                          "test:sqlv1",
-                          "test:sqlv2",
+                          "test:sql",
                           "test:storage"]
 
   Rake::TestTask.new do |t|
     t.name = "unit"
     t.description = "Run Unit tests"
     t.libs << "test"
-    t.pattern = FileList['test/unit/**/test_*.rb']
+    t.pattern = FileList["test/unit/**/test_*.rb"]
     t.warning = false
     t.verbose = true
   end
 
-  Rake::TestTask.new do |t|
-    t.name = "compute"
-    t.description = "Run Compute API tests"
-    t.libs << "test"
-    t.pattern = FileList["test/integration/compute/test_*.rb"]
-    t.warning = false
-    t.verbose = true
+  # This autogenerates rake tasks based on test folder structures
+  # This is done to simplify running many test suites in parallel
+  COMPUTE_TEST_TASKS = []
+  Dir.glob("test/integration/compute/**").each do |task|
+    suite_collection = task.gsub(/test\/integration\/compute\//, "")
+    component_name = task.gsub(/test\/integration\//, "").split("/").first
+    Rake::TestTask.new(:"#{component_name}-#{suite_collection}") do |t|
+      t.libs << "test"
+      t.description = "Autotask - run #{component_name} integration tests - #{suite_collection}"
+      t.pattern = FileList["test/integration/#{component_name}/#{suite_collection}/test_*.rb"]
+      t.warning = false
+      t.verbose = true
+    end
+    COMPUTE_TEST_TASKS << "#{component_name}-#{suite_collection}"
   end
 
+  desc "Run Compute API tests"
+  task :compute => COMPUTE_TEST_TASKS
+
+  desc "Run Compute API tests in parallel"
+  multitask :compute_parallel => COMPUTE_TEST_TASKS
+
   Rake::TestTask.new do |t|
     t.name = "monitoring"
     t.description = "Run Monitoring API tests"
@@ -57,23 +69,33 @@ namespace :test do
     t.verbose = true
   end
 
-  desc "Run all SQL API tests"
-  task :sql => [:sqlv1, :sqlv2]
-
-  Rake::TestTask.new do |t|
-    t.name = "sqlv1"
-    t.description = "Run SQLv1 API tests"
-    t.libs << "test"
-    t.pattern = FileList["test/integration/sql/test_common*.rb", "test/integration/sql/test_v1*.rb"]
-    t.warning = false
-    t.verbose = true
+  # This autogenerates rake tasks based on test folder structures
+  # This is done to simplify running many test suites in parallel
+  SQL_TEST_TASKS = []
+  Dir.glob("test/integration/sql/**").each do |task|
+    suite_collection = task.gsub(/test\/integration\/sql\//, "")
+    component_name = task.gsub(/test\/integration\//, "").split("/").first
+    Rake::TestTask.new(:"#{component_name}-#{suite_collection}") do |t|
+      t.libs << "test"
+      t.description = "Autotask - run #{component_name} integration tests - #{suite_collection}"
+      t.pattern = FileList["test/integration/#{component_name}/#{suite_collection}/test_*.rb"]
+      t.warning = false
+      t.verbose = true
+    end
+    SQL_TEST_TASKS << "#{component_name}-#{suite_collection}"
   end
 
+  desc "Run SQL API tests"
+  task :compute => SQL_TEST_TASKS
+
+  desc "Run SQL API tests in parallel"
+  multitask :compute_parallel => SQL_TEST_TASKS
+
   Rake::TestTask.new do |t|
-    t.name = "sqlv2"
-    t.description = "Run SQLv2 API tests"
+    t.name = "sql"
+    t.description = "Run SQL API tests"
     t.libs << "test"
-    t.pattern = FileList["test/integration/sql/test_v2*.rb"]
+    t.pattern = FileList["test/integration/sql/test_*.rb"]
     t.warning = false
     t.verbose = true
   end