fog-google 1.7.1 → 1.8.0

data/test/integration/compute/core_compute/test_client_options.rb

@@ -0,0 +1,12 @@
+require "helpers/integration_test_helper"
+
+class TestComputeClient < FogIntegrationTest
+  def test_client_options
+    # XXX This is a very rudimentary test checking that proxy option is applied
+    client_options = { proxy_url: "https://user:password@host:8080" }
+    connection = Fog::Compute::Google.new(google_client_options: client_options)
+
+    err = assert_raises(ArgumentError) { connection.servers.all }
+    assert_match(/unsupported proxy/, err.message)
+  end
+end

data/test/integration/compute/core_compute/test_disk_types.rb

@@ -16,6 +16,15 @@ class TestDiskTypes < FogIntegrationTest
                     "Number of all disk type references should be greater or equal to test zones * disk types")
   end
 
+  def test_scoped_all
+    subject_list = @subject.all
+    scoped_subject_list = @subject.all(zone: TEST_ZONE)
+
+    # Assert that whatever .all(scope) returns is a subset of .all
+    assert(scoped_subject_list.all? { |x| subject_list.include? x },
+           "Output of @subject.all(zone:#{TEST_ZONE}) must be a subset of @subject.all")
+  end
+
   def test_get
     NAMES.each do |name|
       ZONES.each do |zone|

data/test/integration/compute/core_compute/test_images.rb

@@ -8,4 +8,25 @@ class TestImages < FogIntegrationTest
     @subject = Fog::Compute[:google].images
     @factory = ImagesFactory.new(namespaced_name)
   end
+
+  def test_get_specific_image
+    image = @subject.get(TEST_IMAGE)
+    refute_nil(image, "Images.get(#{TEST_IMAGE}) should not return nil")
+    assert_equal(image.family, TEST_IMAGE_FAMILY)
+    assert_equal(image.project, TEST_IMAGE_PROJECT)
+  end
+
+  def test_get_specific_image_from_project
+    image = @subject.get(TEST_IMAGE,TEST_IMAGE_PROJECT)
+    refute_nil(image, "Images.get(#{TEST_IMAGE}) should not return nil")
+    assert_equal(image.family, TEST_IMAGE_FAMILY)
+    assert_equal(image.project, TEST_IMAGE_PROJECT)
+  end
+
+  def test_get_from_family
+    image = @subject.get_from_family(TEST_IMAGE_FAMILY)
+    refute_nil(image,"Images.get_from_family(#{TEST_IMAGE_FAMILY}) should not return nil")
+    assert_equal(image.family, TEST_IMAGE_FAMILY)
+    assert_equal(image.project, TEST_IMAGE_PROJECT)
+  end
 end

data/test/integration/compute/core_compute/test_machine_types.rb

@@ -23,6 +23,15 @@ class TestMachineTypes < FogIntegrationTest
                     "Number of all machine types should be greater or equal to test zones * machine_types")
   end
 
+  def test_scoped_all
+    subject_list = @subject.all
+    scoped_subject_list = @subject.all(zone: TEST_ZONE)
+
+    # Assert that whatever .all(scope) returns is a subset of .all
+    assert(scoped_subject_list.all? { |x| subject_list.include? x },
+           "Output of @subject.all(zone:#{TEST_ZONE}) must be a subset of @subject.all")
+  end
+
   def test_get
     # This tests only in last zone since not all zones contain all machine types
     NAMES.each do |name|
@@ -39,4 +48,8 @@ class TestMachineTypes < FogIntegrationTest
   def test_enumerable
     assert_respond_to @subject, :each
   end
+
+  def test_nil_get
+    assert_nil @subject.get(nil)
+  end
 end

data/test/integration/compute/core_compute/test_operations.rb

@@ -1,6 +1,6 @@
 require "helpers/integration_test_helper"
 
-class TestRoutes < FogIntegrationTest
+class TestOperations < FogIntegrationTest
   def setup
     @subject = Fog::Compute[:google].operations
   end
@@ -17,6 +17,24 @@ class TestRoutes < FogIntegrationTest
     end
   end
 
+  def test_zone_scoped_all
+    subject_list = @subject.all
+    scoped_subject_list = @subject.all(zone: TEST_ZONE)
+
+    # Assert that whatever .all(scope) returns is a subset of .all
+    assert(scoped_subject_list.all? { |x| subject_list.include? x },
+           "Output of @subject.all(zone:#{TEST_ZONE}) must be a subset of @subject.all")
+  end
+
+  def test_region_scoped_all
+    subject_list = @subject.all
+    scoped_subject_list = @subject.all(region: TEST_REGION)
+
+    # Assert that whatever .all(scope) returns is a subset of .all
+    assert(scoped_subject_list.all? { |x| subject_list.include? x },
+           "Output of @subject.all(region:#{TEST_REGION}) must be a subset of @subject.all")
+  end
+
   def test_bad_get
     assert_nil @subject.get("bad-name")
   end

data/test/integration/compute/instance_groups/test_instance_group_managers.rb

@@ -1,7 +1,7 @@
 require "helpers/integration_test_helper"
 require "integration/factories/instance_group_manager_factory"
 
-class TestInstanceGroupManager < FogIntegrationTest
+class TestInstanceGroupManagers < FogIntegrationTest
   include TestCollection
 
   def setup

data/test/integration/factories/addresses_factory.rb

@@ -9,6 +9,10 @@ class AddressesFactory < CollectionFactory
     @subject.get(identity, TEST_REGION)
   end
 
+  def all
+    @subject.all(region: TEST_REGION)
+  end
+
   def params
     { :name => resource_name,
       :region => TEST_REGION }

data/test/integration/factories/collection_factory.rb

@@ -12,7 +12,7 @@ class CollectionFactory
   # @param async [FalseClass or TrueClass] perform resource destruction asynchronously
   def cleanup(async = false)
     suit_name = @example.gsub(/\W/, "").tr("_", "-").downcase.split('-')[0]
-    resources = @subject.all.select { |resource| resource.name.match /#{PREFIX}-[0-9]*-#{suit_name}/ }
+    resources = @subject.all.select { |resource| resource.name.match(/#{PREFIX}-[0-9]*-#{suit_name}/) }
     if DEBUG
       p "Cleanup invoked in #{self} for example: #{@example}"
       p "Resources to be deleted: #{resources.map { |r| r.name }}"

data/test/integration/factories/disks_factory.rb

@@ -9,6 +9,10 @@ class DisksFactory < CollectionFactory
     @subject.get(identity, TEST_ZONE)
   end
 
+  def all
+    @subject.all(zone: TEST_ZONE)
+  end
+
   def params
     { :name => resource_name,
       :zone_name => TEST_ZONE,

data/test/integration/factories/forwarding_rules_factory.rb

@@ -12,6 +12,10 @@ class ForwardingRulesFactory < CollectionFactory
     @target_pools.cleanup
   end
 
+  def all
+    @subject.all(region: TEST_REGION)
+  end
+
   def params
     { :name => resource_name,
       :port_range => "80-80",

data/test/integration/factories/images_factory.rb

@@ -5,6 +5,10 @@ class ImagesFactory < CollectionFactory
     super(Fog::Compute[:google].images, example)
   end
 
+  def get(identity)
+    @subject.get(identity, TEST_PROJECT)
+  end
+
   def params
     { :name => resource_name,
       :raw_disk => { :source => TEST_RAW_DISK_SOURCE } }

data/test/integration/factories/instance_group_manager_factory.rb

@@ -12,6 +12,14 @@ class InstanceGroupManagerFactory < CollectionFactory
     @instance_template.cleanup
   end
 
+  def get(identity)
+    @subject.get(identity, TEST_ZONE)
+  end
+
+  def all
+    @subject.all(zone: TEST_ZONE)
+  end
+
   def params
     { :name => resource_name,
       :zone => TEST_ZONE,

data/test/integration/factories/instance_groups_factory.rb

@@ -9,6 +9,10 @@ class InstanceGroupsFactory < CollectionFactory
     @subject.get(identity, TEST_ZONE)
   end
 
+  def all
+    @subject.all(zone: TEST_ZONE)
+  end
+
   def params
     { :name => resource_name,
       :zone => TEST_ZONE }

data/test/integration/factories/servers_factory.rb

@@ -13,6 +13,14 @@ class ServersFactory < CollectionFactory
     @disks.cleanup
   end
 
+  def get(identity)
+    @subject.get(identity, TEST_ZONE)
+  end
+
+  def all
+    @subject.all(zone: TEST_ZONE)
+  end
+
   def params
     { :name => resource_name,
       :zone => TEST_ZONE,

data/test/integration/factories/subnetworks_factory.rb

@@ -13,6 +13,10 @@ class SubnetworksFactory < CollectionFactory
     @subject.get(identity, TEST_REGION)
   end
 
+  def all
+    @subject.all(region: TEST_REGION)
+  end
+
   def params
     { :name => resource_name,
       :network => "default",

data/test/integration/factories/target_instances_factory.rb

@@ -12,6 +12,10 @@ class TargetInstancesFactory < CollectionFactory
     @servers.cleanup
   end
 
+  def all
+    @subject.all(zone: TEST_ZONE)
+  end
+
   def params
     { :name => resource_name,
       :zone => TEST_ZONE,

data/test/integration/factories/target_pools_factory.rb

@@ -15,6 +15,10 @@ class TargetPoolsFactory < CollectionFactory
     @http_health_checks.cleanup
   end
 
+  def all
+    @subject.all(region: TEST_REGION)
+  end
+
   def params
     { :name => resource_name,
       :region => TEST_REGION,

data/test/unit/compute/test_common_collections.rb

@@ -3,29 +3,40 @@ require "helpers/test_helper"
 class UnitTestCollections < MiniTest::Test
   def setup
     Fog.mock!
-    @client = Fog::Compute.new(:provider => "Google", :google_project => "foo")
 
-    # Top-level ancestors we do not dest
-    common_ancestors = [Fog::Collection, Fog::Association, Fog::PagedCollection]
-    # Projects do not have a "list" method in compute API
-    exceptions = [Fog::Compute::Google::Projects]
+    @client = Fog::Compute.new(provider: "google",
+                               google_project: "foo")
+
+    # Exceptions that do not pass test_common_methods:
+    #
+    # Projects do not have a "list" method in compute API, so 'all' is not implemented
+    @common_method_exceptions = [Fog::Compute::Google::Projects]
     # Enumerate all descendants of Fog::Collection
     descendants = ObjectSpace.each_object(Fog::Collection.singleton_class).to_a
 
-    @collections = descendants - common_ancestors - exceptions
+    @collections = descendants.select { |d| d.name.match(/Fog::Compute::Google/) }
   end
 
   def teardown
     Fog.unmock!
   end
 
+  # This tests whether Fog::Compute::Google collections have common lifecycle methods
   def test_common_methods
-    # This tests whether Fog::Compute::Google collections have common lifecycle methods
-    @collections.each do |klass|
+    subjects = @collections - @common_method_exceptions
+    subjects.each do |klass|
       obj = klass.new
       assert obj.respond_to?(:all), "#{klass} should have an .all method"
       assert obj.respond_to?(:get), "#{klass} should have a .get method"
       assert obj.respond_to?(:each), "#{klass} should behave like Enumerable"
     end
   end
+
+  def test_collection_get_arguments
+    @collections.each do |klass|
+      obj = klass.new
+      assert_operator(obj.method(:get).arity, :<=, 1,
+                      "#{klass} should have at most 1 required parameter in get()")
+    end
+  end
 end

data/test/unit/compute/test_common_models.rb

@@ -3,22 +3,21 @@ require "helpers/test_helper"
 class UnitTestModels < MiniTest::Test
   def setup
     Fog.mock!
-    @client = Fog::Compute.new(:provider => "Google", :google_project => "foo")
+    @client = Fog::Compute.new(provider: "google",
+                               google_project: "foo")
 
-    # Top-level ancestors we do not test
-    common_ancestors = [Fog::Model, Fog::Compute::Server]
     # Do not test models that do not have a create method in API
-    exceptions = [ Fog::Compute::Google::MachineType,
-                   Fog::Compute::Google::Region,
-                   Fog::Compute::Google::DiskType,
-                   Fog::Compute::Google::Operation,
-                   Fog::Compute::Google::Zone,
-                   Fog::Compute::Google::Snapshot,
-                   Fog::Compute::Google::Project ]
+    exceptions = [Fog::Compute::Google::MachineType,
+                  Fog::Compute::Google::Region,
+                  Fog::Compute::Google::DiskType,
+                  Fog::Compute::Google::Operation,
+                  Fog::Compute::Google::Zone,
+                  Fog::Compute::Google::Snapshot,
+                  Fog::Compute::Google::Project]
     # Enumerate all descendants of Fog::Model
     descendants = ObjectSpace.each_object(Fog::Model.singleton_class).to_a
 
-    @models = descendants - common_ancestors - exceptions
+    @models = descendants.select { |d| d.name.match(/Fog::Compute::Google/) } - exceptions
   end
 
   def teardown

data/test/unit/compute/test_server.rb

@@ -3,7 +3,8 @@ require "helpers/test_helper"
 class UnitTestServer < MiniTest::Test
   def setup
     Fog.mock!
-    @client = Fog::Compute.new(:provider => "Google", :google_project => "foo")
+    @client = Fog::Compute.new(provider: "google",
+                               google_project: "foo")
   end
 
   def teardown

data/test/unit/dns/test_common_collections.rb

@@ -0,0 +1,43 @@
+require "helpers/test_helper"
+
+class UnitTestDNSCollections < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::DNS.new(provider: "google",
+                           google_project: "foo")
+
+    # Exceptions that do not pass test_common_methods:
+    #
+    # DNS Projects API does not support 'list', so 'all' method is not possible
+    @common_methods_exceptions = [Fog::DNS::Google::Projects]
+    # Enumerate all descendants of Fog::Collection
+    descendants = ObjectSpace.each_object(Fog::Collection.singleton_class)
+
+    @collections = descendants.select { |d| d.name.match(/Fog::DNS::Google/) }
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  # This tests whether Fog::Compute::Google collections have common lifecycle methods
+  def test_common_methods
+    subjects = @collections - @common_methods_exceptions
+    subjects.each do |klass|
+      obj = klass.new
+      assert obj.respond_to?(:all), "#{klass} should have an .all method"
+      assert obj.respond_to?(:get), "#{klass} should have a .get method"
+      assert obj.respond_to?(:each), "#{klass} should behave like Enumerable"
+    end
+  end
+
+  def test_collection_get_arguments
+    # TODO: Fixture for #352
+    skip
+    @collections.each do |klass|
+      obj = klass.new
+      assert_operator(obj.method(:get).arity, :<=, 1,
+                      "#{klass} should have at most 1 required parameter in get()")
+    end
+  end
+end

data/test/unit/monitoring/test_comon_collections.rb

@@ -0,0 +1,44 @@
+require "helpers/test_helper"
+
+class UnitTestMonitoringCollections < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Monitoring.new(provider: "google",
+                                  google_project: "foo")
+
+    # Exceptions that do not pass test_common_methods:
+    #
+    # TimeSeries API has no 'get' method
+    @common_method_exceptions = [Fog::Google::Monitoring::TimeseriesCollection]
+    # Enumerate all descendants of Fog::Collection
+    descendants = ObjectSpace.each_object(Fog::Collection.singleton_class).to_a
+
+    @collections = descendants.select { |d| d.name.match(/Fog::Google::Monitoring/) }
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  # This tests whether Fog::Compute::Google collections have common lifecycle methods
+  def test_common_methods
+    subjects = @collections - @common_method_exceptions
+
+    subjects.each do |klass|
+      obj = klass.new
+      assert obj.respond_to?(:all), "#{klass} should have an .all method"
+      assert obj.respond_to?(:get), "#{klass} should have a .get method"
+      assert obj.respond_to?(:each), "#{klass} should behave like Enumerable"
+    end
+  end
+
+  def test_collection_get_arguments
+    @collections.each do |klass|
+      obj = klass.new
+      if obj.respond_to?(:get)
+        assert_operator(obj.method(:get).arity, :<=, 1,
+                        "#{klass} should have at most 1 required parameter in get()")
+      end
+    end
+  end
+end

data/test/unit/pubsub/test_common_collections.rb

@@ -0,0 +1,35 @@
+require "helpers/test_helper"
+
+class UnitTestPubsubCollections < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Google::Pubsub.new(google_project: "foo")
+
+    # Enumerate all descendants of Fog::Collection
+    descendants = ObjectSpace.each_object(Fog::Collection.singleton_class)
+
+    @collections = descendants.select { |d| d.name.match(/Fog::Google::Pubsub/) }
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  def test_common_methods
+    # This tests whether Fog::Compute::Google collections have common lifecycle methods
+    @collections.each do |klass|
+      obj = klass.new
+      assert obj.respond_to?(:all), "#{klass} should have an .all method"
+      assert obj.respond_to?(:get), "#{klass} should have a .get method"
+      assert obj.respond_to?(:each), "#{klass} should behave like Enumerable"
+    end
+  end
+
+  def test_collection_get_arguments
+    @collections.each do |klass|
+      obj = klass.new
+      assert_operator(obj.method(:get).arity, :<=, 1,
+                      "#{klass} should have at most 1 required parameter in get()")
+    end
+  end
+end