fog-google 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc1f39d88b02301c3862a372a55a6086209a845
-  data.tar.gz: 756283b7749001656eb11ecebdf31bf3417796de
+  metadata.gz: ad43648d6ec49a3e00c06ef22da0f2c12e84919c
+  data.tar.gz: cf6f8b28815b5ee18dfdce87306559c058eb49b9
 SHA512:
-  metadata.gz: 021a04a4a181e6ad9853c5f76ba17ad8dbceb2a1792b7b3708331ed1fe006d68b68f6e44bc0ea564fcc383dd64f94298671aeb910baf25cb5d09ad8537b49ae0
-  data.tar.gz: 18c9ff430a290e8f226aeb7f28f00f81a07eb9fbf05e266fd7388062d8b741d2d3f70abf130f493bfa08b1baadb05b4fe709586363c106de662c13818e4cc352
+  metadata.gz: 5df9ade71b8ac3430be566e5f8006425f6b8dd38ffeb5130f53c6c0d76a12fa56d73eec811a2c72342cbb669fdc0de2df796c037c3fbd32a26be2e2e6c41e8b2
+  data.tar.gz: aaa5bbe014e6d4c44438f068d8137abeb18276b25196ebb212ed54af9e98ca3c9d46d794a780cfd5869399451f654aac190095d983f23a56a7a45de7c54adf87

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 sudo: false
 matrix:
   fast_finish: true
@@ -7,9 +8,10 @@ matrix:
     - rvm: 2.2
     - rvm: 2.3.0
     - rvm: 2.3.1
+    - rvm: 2.4.0
     - rvm: jruby-head
   allow_failures:
     - rvm: jruby-head
-
+    - rvm: 2.4.0
 notifications:
   email: false

data/examples/create_instance.rb

@@ -9,13 +9,12 @@ Bundler.require(:default, :development)
 def test
   connection = Fog::Compute.new(:provider => "Google")
 
-  name = "fog-smoke-test-#{Time.now.to_i}"
-
   disk = connection.disks.create(
-    :name => name,
+    :name => "fog-smoke-test-#{Time.now.to_i}",
     :size_gb => 10,
     :zone_name => "us-central1-f",
-    :source_image => "debian-7-wheezy-v20151104")
+    :source_image => "debian-8-jessie-v20161215"
+  )
 
   disk.wait_for { disk.ready? }
 
@@ -28,7 +27,8 @@ def test
     :zone_name => "us-central1-f",
     :user => ENV["USER"],
     :tags => ["fog"],
-    :service_accounts => %w(sql-admin bigquery https://www.googleapis.com/auth/compute))
+    :service_accounts => %w(sql-admin bigquery https://www.googleapis.com/auth/compute)
+  )
 
   # Wait_for routine copied here to show errors, if necessary.
   duration = 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-7-wheezy-v20151104")
+  img = connection.images.get("debian-8-jessie-v20161215")
   raise "Could not GET the image" unless img
   puts img.inspect
 

data/examples/metadata.rb

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

data/examples/network.rb

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

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

@@ -17,80 +17,69 @@ module Fog
               when "debian-cloud"
                 {
                   :images => {
-                    "debian-6-squeeze-v20130816" => {
+                    "debian-8-jessie-v20161215" => {
+                      "archiveSizeBytes" => "3436783050",
+                      "creationTimestamp" => "2016-12-15T12 =>53 =>12.508-08 =>00",
+                      "description" => "Debian, Debian GNU/Linux, 8 (jessie), amd64 built on 2016-12-15",
+                      "diskSizeGb" => "10",
+                      "family" => "debian-8",
+                      "id" => "7187216073735715927",
                       "kind" => "compute#image",
-                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-6-squeeze-v20130816",
-                      "id" => "14841592146580482051",
-                      "creationTimestamp" => "2013-09-04T13:21:53.292-07:00",
-                      "name" => "debian-6-squeeze-v20130816",
-                      "description" => "Debian GNU/Linux 6.0.7 (squeeze) built on 2013-08-16",
-                      "sourceType" => "RAW",
+                      "licenses" => [
+                        "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/licenses/debian-8-jessie"
+                      ],
+                      "name" => "debian-8-jessie-v20161215",
                       "rawDisk" => {
                         "containerType" => "TAR",
                         "source" => ""
                       },
-                      "status" => "READY"
-                    },
-                    "debian-7-wheezy-v20130816" => {
-                      "kind" => "compute#image",
-                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20130816",
-                      "id" => "4213305957435180899",
-                      "creationTimestamp" => "2013-09-04T13:24:30.479-07:00",
-                      "name" => "debian-7-wheezy-v20130816",
-                      "description" => "Debian GNU/Linux 7.1 (wheezy) built on 2013-08-16",
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-8-jessie-v20161215",
                       "sourceType" => "RAW",
-                      "rawDisk" => {
-                        "containerType" => "TAR",
-                        "source" => ""
-                      },
                       "status" => "READY"
-                    },
-                    "debian-7-wheezy-v20131014" => {
+                    }
+                  }
+                }
+              when "centos-cloud"
+                {
+                  :images => {
+                    "centos-6-v20161212" => {
+                      "archiveSizeBytes" => "3942360630",
+                      "creationTimestamp" => "2016-12-14T10 =>30 =>52.053-08 =>00",
+                      "description" => "CentOS, CentOS, 6, x86_64 built on 2016-12-12",
+                      "diskSizeGb" => "10",
+                      "family" => "centos-6",
+                      "id" => "5262726857160929587",
                       "kind" => "compute#image",
-                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
-                      "id" => "4213305957435180899",
-                      "creationTimestamp" => "2013-09-04T13:24:30.479-07:00",
-                      "name" => "debian-7-wheezy-v20131014",
-                      "description" => "Debian GNU/Linux 7.1 (wheezy) built on 2013-10-14",
-                      "sourceType" => "RAW",
+                      "licenses" => [
+                        "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/licenses/centos-6"
+                      ],
+                      "name" => "centos-6-v20161212",
                       "rawDisk" => {
                         "containerType" => "TAR",
                         "source" => ""
                       },
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/images/centos-6-v20161212",
+                      "sourceType" => "RAW",
                       "status" => "READY"
                     },
-                    "debian-7-wheezy-v20140408" => {
+                    "centos-7-v20161212" => {
+                      "archiveSizeBytes" => "4491098988",
+                      "creationTimestamp" => "2016-12-14T10 =>29 =>44.741-08 =>00",
+                      "description" => "CentOS, CentOS, 7, x86_64 built on 2016-12-12",
+                      "diskSizeGb" => "10",
+                      "family" => "centos-7",
+                      "id" => "8650499281020268919",
                       "kind" => "compute#image",
-                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20140408",
-                      "id" => "17312518942796567788",
-                      "creationTimestamp" => "2013-11-25T15:17:00.436-08:00",
-                      "name" => "debian-7-wheezy-v20131120",
-                      "description" => "Debian GNU/Linux 7.2 (wheezy) built on 2013-11-20",
-                      "sourceType" => "RAW",
+                      "licenses" => [
+                        "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/licenses/centos-7"
+                      ],
+                      "name" => "centos-7-v20161212",
                       "rawDisk" => {
                         "containerType" => "TAR",
                         "source" => ""
                       },
-                      "status" => "READY",
-                      "archiveSizeBytes" => "341857472"
-                    }
-                  }
-                }
-              when "centos-cloud"
-                {
-                  :images => {
-                    "centos-6-v20130813" => {
-                      "kind" => "compute#image",
-                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/images/centos-6-v20130813",
-                      "id" => "4670523370938782739",
-                      "creationTimestamp" => "2013-08-19T11:56:47.004-07:00",
-                      "name" => "centos-6-v20130813",
-                      "description" => "SCSI-enabled CentOS 6; Created Tue, 13 Aug 2013 00:00:00 +0000",
+                      "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/centos-cloud/global/images/centos-7-v20161212",
                       "sourceType" => "RAW",
-                      "rawDisk" => {
-                        "containerType" => "TAR",
-                        "source" => ""
-                      },
                       "status" => "READY"
                     }
                   }

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

@@ -11,6 +11,8 @@ module Fog
         attribute :deprecated
         attribute :description
         attribute :disk_size_gb, :aliases => "diskSizeGb"
+        attribute :family
+        attribute :licenses
         attribute :self_link, :aliases => "selfLink"
         attribute :source_type, :aliases => "sourceType"
         attribute :status

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

@@ -221,7 +221,7 @@ module Fog
           metadata[metadata_key] += "\n" unless metadata[metadata_key].empty?
           metadata[metadata_key] += "#{username}:#{key.strip}"
 
-          metadata
+          set_metadata(metadata)
         end
 
         def map_service_accounts(scope_array)

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

@@ -45,7 +45,7 @@ module Fog
               :name => name,
               :size_gb => 10,
               :zone_name => zone,
-              :source_image => "debian-7-wheezy-v20151104"
+              :source_image => "debian-8-jessie-v20161215"
             }
 
             # backwards compatibility to pre-v1

data/lib/fog/google/shared.rb

@@ -64,7 +64,7 @@ module Fog
           options[:google_api_scope_url],
           options[:app_name],
           options[:app_version],
-          options[:google_client_options]
+          options[:google_client_options] || {}
         )
       end
 
@@ -105,18 +105,21 @@ module Fog
       ##
       # Create a Google API Client with a user email and a pkcs12 key
       #
-      # @param [String] google_client_email A @developer.gserviceaccount.com email address to use
-      # @param [OpenSSL::PKey] signing_key The private key for signing
-      # @param [String] google_api_scope_url Access scope URLs
-      # @param [String] app_name The app name to set in the user agent
-      # @param [String] app_version The app version to set in the user agent
-      # @return [Google::APIClient] Google API Client
-      def new_pk12_google_client(google_client_email, signing_key, google_api_scope_url, app_name = nil, app_version = nil, google_client_options = [])
+      # @param google_client_email [String] A @developer.gserviceaccount.com.
+      #   email address to use
+      # @param signing_key [OpenSSL::PKey] The private key for signing
+      # @param google_api_scope_url [String] Access scope URLs
+      # @param app_name [String] The app name to set in the user agent
+      # @param app_version [String] The app version to set in the user agent
+      # @param google_client_options [Hash] additional options to pass to the
+      #   underlying google client
+      # @return [Google::APIClient] a newly-constructed Google API Client
+      def new_pk12_google_client(google_client_email, signing_key, google_api_scope_url, app_name = nil, app_version = nil, google_client_options = {})
         application_name = app_name.nil? ? "fog" : "#{app_name}/#{app_version || '0.0.0'} fog"
         api_client_options = {
           :application_name => application_name,
           :application_version => Fog::Google::VERSION
-        }
+        }.merge(google_client_options)
         client = ::Google::APIClient.new(api_client_options)
 
         client.authorization = Signet::OAuth2::Client.new(
@@ -126,8 +129,7 @@ module Fog
           :issuer => google_client_email,
           :scope => google_api_scope_url,
           :signing_key => signing_key,
-          :token_credential_uri => "https://accounts.google.com/o/oauth2/token",
-          :google_client_options => google_client_options
+          :token_credential_uri => "https://accounts.google.com/o/oauth2/token"
         )
         client.authorization.fetch_access_token!
 

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "0.5.0".freeze
+    VERSION = "0.5.1".freeze
   end
 end

data/test/helpers/client_helper.rb

@@ -0,0 +1,35 @@
+##
+# Helper mixin for tests (especially compute-based ones). Provide access to the
+# client in use via the #client method to use.
+
+module ClientHelper
+  # Check to see if an operation is finished.
+  #
+  # @param op [Excon::Response] the operation object returned from an api call
+  # @return [Boolean] true if the operation is no longer executing, false
+  #   otherwise
+  def operation_finished?(op)
+    # TODO: support both zone and region operations
+    region = op[:body]["region"]
+    name = op[:body]["name"]
+
+    result = client.get_region_operation(region, name)
+    !%w(PENDING RUNNING).include?(result[:body]["status"])
+  end
+
+  # Pause execution until an operation returned from a passed block is finished.
+  #
+  # @example Pause until server is provisioned
+  #   @result = wait_until_complete { client.insert_server(name, zone, opts) }
+  # @yieldreturn [Excon::Response] the resulting operation object from a block.
+  # @return [Excon::Response] the final completed operation object
+  def wait_until_complete
+    result = yield
+    return result unless result[:body]["kind"] == "compute#operation"
+
+    # TODO: support both zone and region operations
+    region = result[:body]["region"]
+    Fog.wait_for { operation_finished?(result) }
+    client.get_region_operation(region, result[:body]["name"])
+  end
+end

data/test/integration/compute/requests/test_compute_address_requests.rb

@@ -0,0 +1,84 @@
+require "helpers/integration_test_helper"
+require "helpers/client_helper"
+require "securerandom"
+
+class TestComputeAddressRequests < FogIntegrationTest
+  DEFAULT_REGION = "us-central1".freeze
+  ADDRESS_RESOURCE_PREFIX = "fog-test-address".freeze
+
+  include ClientHelper
+
+  # Ensure we clean up any created resources
+  Minitest.after_run do
+    client = Fog::Compute::Google.new
+    addresses = client.list_addresses(DEFAULT_REGION)[:body]["items"]
+    unless addresses.nil?
+      addresses.
+        map { |a| a["name"] }.
+        select { |a| a.start_with?(ADDRESS_RESOURCE_PREFIX) }.
+        each { |a| client.delete_address(a, DEFAULT_REGION) }
+    end
+  end
+
+  attr_reader :client
+
+  def setup
+    @client = Fog::Compute::Google.new
+  end
+
+  def new_address_name
+    "#{ADDRESS_RESOURCE_PREFIX}-#{SecureRandom.uuid}"
+  end
+
+  def some_address_name
+    # created lazily to speed tests up
+    @some_address ||= new_address_name.tap do |a|
+      result = @client.insert_address(a, DEFAULT_REGION)
+      Fog.wait_for { operation_finished?(result) }
+    end
+  end
+
+  def test_insert_address
+    result = wait_until_complete { @client.insert_address(new_address_name, DEFAULT_REGION) }
+
+    assert_equal(200, result.status, "request should be successful")
+    assert_equal(nil, result[:body]["error"], "result should contain no errors")
+  end
+
+  def test_get_address
+    result = @client.get_address(some_address_name, DEFAULT_REGION)
+
+    assert_equal(200, result.status, "request should be successful")
+    assert_includes(result[:body].keys, "name", "resulting body should contain expected keys")
+  end
+
+  def test_list_address
+    # Let's create at least one address so there's something to view
+    wait_until_complete { @client.insert_address(new_address_name, DEFAULT_REGION) }
+
+    result = @client.list_addresses(DEFAULT_REGION)
+
+    assert_equal(200, result.status, "request should be successful")
+    assert_includes(result[:body].keys, "items", "resulting body should contain expected keys")
+    assert_operator(result[:body]["items"].size, :>, 0, "address count should be positive")
+  end
+
+  def test_delete_address
+    # Create something to delete
+    address_to_delete = new_address_name
+    wait_until_complete { @client.insert_address(address_to_delete, DEFAULT_REGION) }
+
+    result = wait_until_complete { @client.delete_address(address_to_delete, DEFAULT_REGION) }
+
+    assert_equal(200, result.status, "request should be successful")
+    assert_equal(nil, result[:body]["error"], "result should contain no errors")
+  end
+
+  def test_list_aggregated_addresses
+    result = @client.list_aggregated_addresses
+
+    assert_equal(200, result.status, "request should be successful")
+    assert_includes(result[:body].keys, "items", "resulting body should contain expected keys")
+    assert_includes(result[:body]["items"].keys, "global", "resulting body 'items' subset should contain global keyword")
+  end
+end

data/test/integration/compute/test_compute_addresses_collection.rb

@@ -0,0 +1,74 @@
+require "helpers/integration_test_helper"
+require "securerandom"
+
+class TestComputeAddressesCollection < FogIntegrationTest
+  DEFAULT_REGION = "us-central1".freeze
+  DEFAULT_ZONE = "us-central1-b".freeze
+  RESOURCE_PREFIX = "fog-test-addresscol".freeze
+
+  # Ensure we clean up any created resources
+  Minitest.after_run do
+    client = Fog::Compute::Google.new
+    client.addresses.each { |a| a.destroy if a.name.start_with?(RESOURCE_PREFIX) }
+    client.servers.each { |s| s.destroy if s.name.start_with?(RESOURCE_PREFIX) }
+  end
+
+  def test_address_workflow
+    client = Fog::Compute::Google.new
+
+    my_address_name = new_resource_name
+    # An address can be created by specifying a name and a region
+    my_address = client.addresses.create(
+      :name => my_address_name,
+      :region => DEFAULT_REGION
+    )
+    # TODO: Shouldn't this be returning an operation object that we have to explicitly wait for?
+    assert_equal(my_address_name, my_address.name, "My address should have the provided name")
+    assert_equal("RESERVED", my_address.status, "My address should not be in use")
+
+    # It should also be visible when listing addresses
+    assert_includes(client.addresses.all.map(&:name), my_address_name)
+
+    # Be aware that although the address resource is created, it might not yet
+    # have an ip address. You can poll until the address has been assigned.
+    my_address.wait_for { !my_address.address.nil? }
+    assert_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/,
+                 my_address.address,
+                 "My address's address should have a valid ipv4 address")
+
+    # Now that we have an address, we can create a server using the static ip
+    my_server = client.servers.create(
+      :name => new_resource_name,
+      :machine_type => "f1-micro",
+      :zone_name => DEFAULT_ZONE,
+      :disks => [
+        :boot => true,
+        :autoDelete => true,
+        :initializeParams => {
+          :sourceImage => "projects/debian-cloud/global/images/family/debian-8"
+        }
+      ],
+      :external_ip => my_address.address
+    )
+    my_server.wait_for { my_server.state != "PROVISIONING" }
+
+    # And verify that it's correctly assigned
+    assert_equal(
+      my_address.address,
+      my_server.network_interfaces[0]["accessConfigs"][0]["natIP"],
+      "My created server should have the same ip as my address"
+    )
+
+    # If we look up the address again by name, we should see that it is now
+    # in use
+    assert_equal(
+      "IN_USE",
+      client.addresses.get(my_address_name, DEFAULT_REGION).status,
+      "Address should now be in use"
+    )
+  end
+
+  def new_resource_name
+    "#{RESOURCE_PREFIX}-#{SecureRandom.uuid}"
+  end
+end

data/tests/helper.rb

@@ -34,7 +34,7 @@ def create_test_disk(connection, zone)
                                    :name => "fog-test-disk-#{random_string}",
                                    :size_gb => "10",
                                    :zone => zone,
-                                   :source_image => "debian-7-wheezy-v20140408"
+                                   :source_image => "debian-8-jessie-v20161215"
                                  })
   disk.wait_for { ready? }
   disk

data/tests/requests/compute/disk_tests.rb

@@ -50,7 +50,7 @@ Shindo.tests("Fog::Compute[:google] | disk requests", ["google"]) do
     disk_name = "new-disk-test"
     disk_size = "2"
     zone_name = "us-central1-a"
-    image_name = "debian-7-wheezy-v20140408"
+    image_name = "debian-8-jessie-v20161215"
 
     # These will all fail if errors happen on insert
     tests("#insert_disk").formats(@insert_disk_format) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Nat Welch
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -600,10 +600,13 @@ files:
 - tasks/lint.rake
 - tasks/smoke.rake
 - tasks/test.rake
+- test/helpers/client_helper.rb
 - test/helpers/integration_test_helper.rb
 - test/helpers/test_collection.rb
 - test/helpers/test_helper.rb
+- test/integration/compute/requests/test_compute_address_requests.rb
 - test/integration/compute/test_backend_services.rb
+- test/integration/compute/test_compute_addresses_collection.rb
 - test/integration/compute/test_disk_types.rb
 - test/integration/compute/test_disks.rb
 - test/integration/compute/test_forwarding_rules.rb
@@ -727,10 +730,13 @@ signing_key:
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
 test_files:
+- test/helpers/client_helper.rb
 - test/helpers/integration_test_helper.rb
 - test/helpers/test_collection.rb
 - test/helpers/test_helper.rb
+- test/integration/compute/requests/test_compute_address_requests.rb
 - test/integration/compute/test_backend_services.rb
+- test/integration/compute/test_compute_addresses_collection.rb
 - test/integration/compute/test_disk_types.rb
 - test/integration/compute/test_disks.rb
 - test/integration/compute/test_forwarding_rules.rb