fog-google 0.0.5 → 0.0.6

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

@@ -7,20 +7,33 @@ module Fog
       class TargetInstances < Fog::Collection
         model Fog::Compute::Google::TargetInstance
 
-        def all(zone = nil)
-          if zone.nil?
-            data = []
-            data = service.list_target_instances.body['items'] || []
-          
+        def all(filters={})
+          if filters['zone']
+            data = service.list_target_instances(filters['zone']).body['items'] || []
           else
-            data = service.list_target_instances(zone).body['items'] || []
+            data = []
+            service.list_aggregated_target_instances.body['items'].each_value do |zone|
+              data.concat(zone['targetInstances']) if zone['targetInstances']
+            end
           end
           load(data)
         end
 
         def get(identity, zone=nil)
-            response = service.get_target_instance(identity, zone)
-            new(response.body) unless response.nil?
+          response = nil
+          if zone
+            response = service.get_target_instance(identity, zone).body
+          else
+            target_instances = service.list_aggregated_target_instances(:filter => "name eq .*#{identity}").body['items']
+            target_instance = target_instances.each_value.select { |zone| zone.key?('targetInstances') }
+
+            # It can only be 1 target_instance with the same name across all regions
+            response = target_instance.first['targetInstances'].first unless target_instance.empty?
+          end
+          return nil if response.nil?
+          new(response)
+        rescue Fog::Errors::NotFound
+          nil
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Fog
 
         attribute :kind, :aliases => 'kind'
         attribute :creationTimestamp, :aliases => 'creation_timestamp'
-        attribute :defaultService, :aliases => 'default_service'
+        attribute :defaultService, :aliases => ['default_service', :default_service]
         attribute :description, :aliases => 'description'
         attribute :fingerprint, :aliases => 'fingerprint'
         attribute :hostRules, :aliases => 'host_rules'

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

@@ -13,8 +13,11 @@ module Fog
         end
 
         def get(identity)
-          response = service.get_url_map(identity)
-          new(response.body) unless response.nil?
+          if url_map = service.get_url_map(identity).body
+            new(url_map)
+          end
+        rescue Fog::Errors::NotFound
+          nil
         end
       end
     end

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

@@ -44,7 +44,7 @@ module Fog
             'project' => @project,
             'zone' => zone_name,
           }
-          body_object = { 'name' => target_pool_name }
+          body_object = { 'name' => target_instance_name }
           body_object.merge!(opts)
 
           request(api_method, parameters, body_object=body_object)

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

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class Google
+      # XXX @ihmccreery added this mock to get the Shindo tests to pass.  I don't really understand how mocks are supposed to work; I'm in the process of moving
+      # all testing over to Minitest, but in the meantime, the Shindo tests need to pass.  This Mock should be considered with a *lot* of skepticism.
+      class Mock
+        def list_aggregated_target_instances(options = {})
+          # Create a Hash of unique zones from the target_instances Array previously filled when target_instances are created
+          zones = Hash[self.data[:target_instances].values.map { |target_instance| ["zones/#{target_instance['zone'].split('/')[-1]}", {'targetInstances' => [] }] }]
+          if options[:filter]
+            # Look up for the target_instance name
+            target_instance = self.data[:target_instances][options[:filter].gsub(/name eq \.\*/, '')]
+            # Fill the zones Hash with the target_instance (if it's found)
+            zones["zones/#{target_instance['zone'].split('/')[-1]}"]['targetInstances'].concat([target_instance]) if target_instance
+          else
+            # Fill the zones Hash with the target_instances attached to each zone
+            self.data[:target_instances].values.each { |target_instance| zones["zones/#{target_instance['zone'].split('/')[-1]}"]['targetInstances'].concat([target_instance]) }
+          end
+          build_excon_response({
+            "kind" => "compute#targetInstanceAggregatedList",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/aggregated/targetInstances",
+            "id" => "projects/#{@project}/aggregated/targetInstances",
+            "items" => zones
+
+          })
+        end
+      end
+
+      class Real
+        def list_aggregated_target_instances(options = {})
+          api_method = @compute.target_instances.aggregated_list
+          parameters = {
+            'project' => @project,
+          }
+          parameters['filter'] = options[:filter] if options[:filter]
+
+          request(api_method, parameters)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/test/helpers/integration_test_helper.rb

@@ -0,0 +1,22 @@
+require 'helpers/test_helper'
+require 'helpers/test_collection'
+
+# Use :test credentials in ~/.fog for live integration testing
+# XXX not sure if this will work on Travis CI or not
+Fog.credential = :test
+
+# Helpers
+
+TEST_ZONE = "us-central1-f"
+TEST_REGION = "us-central1"
+TEST_SIZE_GB = 10
+TEST_MACHINE_TYPE = "n1-standard-1"
+# XXX This depends on a public image in gs://fog-test-bucket; there may be a better way to do this
+# The image was created like so: https://cloud.google.com/compute/docs/images#export_an_image_to_google_cloud_storage
+TEST_RAW_DISK_SOURCE = "http://storage.googleapis.com/fog-test-bucket/fog-test-raw-disk-source.image.tar.gz"
+
+class FogIntegrationTest < MiniTest::Test
+  def namespaced_name
+    "#{self.class.to_s}_#{name}"
+  end
+end

data/test/helpers/test_collection.rb

@@ -0,0 +1,37 @@
+module TestCollection
+  # Anything that includes TestCollection must, during setup, assign @subject and @factory, where
+  #   @subject is the collection under test, (e.g. Fog::Compute[:google].servers)
+  #   @factory is a CollectionFactory
+
+  def test_lifecycle
+    one = @subject.new(@factory.params)
+    one.save
+    two = @subject.create(@factory.params)
+
+    # XXX HACK compares identities
+    # should be replaced with simple includes? when `==` is properly implemented in fog-core; see fog/fog-core#148
+    assert_includes @subject.all.map(&:identity), one.identity
+    assert_includes @subject.all.map(&:identity), two.identity
+
+    assert_equal one.identity, @subject.get(one.identity).identity
+    assert_equal two.identity, @subject.get(two.identity).identity
+
+    one.destroy
+    two.destroy
+
+    Fog.wait_for { !@subject.all.map(&:identity).include? one.identity }
+    Fog.wait_for { !@subject.all.map(&:identity).include? two.identity }
+  end
+
+  def test_get_returns_nil_if_resource_does_not_exist
+    assert_nil @subject.get('fog-test-fake-identity')
+  end
+
+  def test_enumerable
+    assert_respond_to @subject, :each
+  end
+
+  def teardown
+    @factory.cleanup
+  end
+end

data/test/helpers/test_helper.rb

@@ -0,0 +1,19 @@
+# The next line was added to squelch a warning message in Ruby 1.9.
+# It ensures we're using the gem, not the built-in Minitest
+# See https://github.com/seattlerb/minitest/#install
+gem 'minitest'
+
+require 'minitest/autorun'
+
+if ENV['COVERAGE']
+  require 'coveralls'
+  require 'simplecov'
+
+  SimpleCov.start do
+    add_filter '/test/'
+  end
+end
+
+require File.join(File.dirname(__FILE__), '../../lib/fog/google.rb')
+
+Coveralls.wear! if ENV['COVERAGE']

data/test/integration/compute/test_backend_services.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/backend_services_factory"
+
+class TestBackendServices < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].backend_services
+    @factory = BackendServicesFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_disk_types.rb

@@ -0,0 +1,39 @@
+require "helpers/integration_test_helper"
+
+class TestDiskTypes < FogIntegrationTest
+  NAMES = %w(local-ssd pd-ssd pd-standard)
+  ZONES = %w(https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/us-central1-a
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/us-central1-b
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/us-central1-c
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/us-central1-f
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/europe-west1-b
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/europe-west1-c
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/europe-west1-d
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/asia-east1-a
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/asia-east1-b
+             https://www.googleapis.com/compute/v1/projects/graphite-fog/zones/asia-east1-c)
+
+  def setup
+    @subject = Fog::Compute[:google].disk_types
+  end
+
+  def test_all
+    assert_equal (NAMES.size * ZONES.size), @subject.all.size
+  end
+
+  def test_get
+    NAMES.each do |name|
+      ZONES.each do |zone|
+        refute_nil @subject.get(name, zone)
+      end
+    end
+  end
+
+  def test_bad_get
+    assert_nil @subject.get("bad-name")
+  end
+
+  def test_enumerable
+    assert_respond_to @subject, :each
+  end
+end

data/test/integration/compute/test_disks.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/disks_factory"
+
+class TestDisks < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].disks
+    @factory = DisksFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_forwarding_rules.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/forwarding_rules_factory"
+
+class TestForwardingRules < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].forwarding_rules
+    @factory = ForwardingRulesFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_global_forwarding_rules.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/global_forwarding_rules_factory"
+
+class TestGlobalForwardingRules < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].global_forwarding_rules
+    @factory = GlobalForwardingRulesFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_http_health_checks.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/http_health_checks_factory"
+
+class TestHttpHealthChecks < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].http_health_checks
+    @factory = HttpHealthChecksFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_images.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/images_factory"
+
+class TestImages < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].images
+    @factory = ImagesFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_regions.rb

@@ -0,0 +1,33 @@
+require "helpers/integration_test_helper"
+
+class TestRegions < FogIntegrationTest
+  NAMES = %w(asia-east1 europe-west1 us-central1)
+
+  def setup
+    @subject = Fog::Compute[:google].regions
+  end
+
+  def test_all
+    assert_equal NAMES.size, @subject.all.size
+  end
+
+  def test_get
+    NAMES.each do |name|
+      refute_nil @subject.get(name)
+    end
+  end
+
+  def test_up
+    NAMES.each do |name|
+      assert @subject.get(name).up?
+    end
+  end
+
+  def test_bad_get
+    assert_nil @subject.get("bad-name")
+  end
+
+  def test_enumerable
+    assert_respond_to @subject, :each
+  end
+end

data/test/integration/compute/test_servers.rb

@@ -0,0 +1,28 @@
+require "helpers/integration_test_helper"
+require "integration/factories/servers_factory"
+
+class TestServers < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].servers
+    @factory = ServersFactory.new(namespaced_name)
+  end
+
+  def test_bootstrap_ssh_destroy
+    resource_name = @factory.resource_name
+    instance = @subject.bootstrap({:name => resource_name})
+    assert instance.ready?
+    instance.wait_for { sshable? }
+    assert_match /Linux/, instance.ssh("uname").first.stdout
+    assert_equal instance.destroy.operation_type, "delete"
+    Fog.wait_for { !@subject.all.map(&:identity).include? instance.identity }
+    # XXX clean up after bootstrap's automatic creation of disks
+    # This should be removed when
+    #     https://github.com/fog/fog-google/issues/17
+    # is solved
+    disk = Fog::Compute[:google].disks.get(resource_name)
+    disk.destroy
+    Fog.wait_for { !Fog::Compute[:google].disks.all.map(&:identity).include? disk.identity }
+  end
+end

data/test/integration/compute/test_target_http_proxies.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/target_http_proxies_factory"
+
+class TestTargetHttpProxies < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].target_http_proxies
+    @factory = TargetHttpProxiesFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_target_instances.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/target_instances_factory"
+
+class TestTargetInstances < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].target_instances
+    @factory = TargetInstancesFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_target_pools.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/target_pools_factory"
+
+class TestTargetPools < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].target_pools
+    @factory = TargetPoolsFactory.new(namespaced_name)
+  end
+end

data/test/integration/compute/test_url_maps.rb

@@ -0,0 +1,11 @@
+require "helpers/integration_test_helper"
+require "integration/factories/url_maps_factory"
+
+class TestUrlMaps < FogIntegrationTest
+  include TestCollection
+
+  def setup
+    @subject = Fog::Compute[:google].url_maps
+    @factory = UrlMapsFactory.new(namespaced_name)
+  end
+end