fog-google 1.8.2 → 1.12.0

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

@@ -23,7 +23,9 @@ module Fog
       class Mock
         def copy_object(_source_bucket, _source_object,
                         _target_bucket, _target_object, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -13,7 +13,9 @@ module Fog
 
       class Mock
         def delete_bucket(_bucket_name)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -14,7 +14,9 @@ module Fog
 
       class Mock
         def delete_object(_bucket_name, _object_name)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -33,7 +33,9 @@ module Fog
 
       class Mock
         def get_bucket(_bucket_name, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -22,7 +22,9 @@ module Fog
 
       class Mock
         def get_bucket_acl(_bucket_name, _entity)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -75,7 +75,9 @@ module Fog
 
       class Mock
         def get_object(_bucket_name, _object_name, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -25,7 +25,9 @@ module Fog
 
       class Mock
         def get_object_acl(_bucket_name, _object_name)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -22,7 +22,9 @@ module Fog
 
       class Mock
         def get_object_metadata(_bucket_name, _object_name, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -16,7 +16,9 @@ module Fog
 
       class Mock
         def list_bucket_acl(_bucket_name)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -20,7 +20,9 @@ module Fog
       end
       class Mock
         def list_buckets
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -19,7 +19,9 @@ module Fog
 
       class Mock
         def list_object_acl(_bucket_name, _object_name)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -38,7 +38,9 @@ module Fog
 
       class Mock
         def list_objects(_bucket, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -32,7 +32,9 @@ module Fog
 
       class Mock
         def put_bucket(_bucket_name, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -19,7 +19,9 @@ module Fog
 
       class Mock
         def put_bucket_acl(_bucket_name, _acl)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -92,7 +92,9 @@ module Fog
 
       class Mock
         def put_object(_bucket_name, _object_name, _data, _options = {})
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -25,7 +25,9 @@ module Fog
 
       class Mock
         def put_object_acl(_bucket_name, _object_name, _acl)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
     end

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

@@ -27,7 +27,7 @@ module Fog
             query = filtered.map { |k, v| [k.to_s, Fog::Google.escape(v)].join("=") }
           end
 
-          query << "GoogleAccessId=#{@client.issuer}"
+          query << "GoogleAccessId=#{google_access_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
           "#{params[:host]}/#{params[:path]}?#{query.join('&')}"

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

@@ -51,7 +51,7 @@ module Fog
 
         remove_method :metadata
         def metadata
-          attributes.reject { |key, _value| key.to_s =~ /^x-goog-meta-/ }
+          attributes.select { |key, _value| key.to_s =~ /^x-goog-meta-/ }
         end
 
         remove_method :metadata=

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

@@ -1,4 +1,3 @@
-require "pp"
 module Fog
   module Storage
     class GoogleXML

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

@@ -33,12 +33,13 @@ module Fog
           headers["If-Modified-Since"] = Fog::Time.at(options["If-Modified-Since"].to_i).to_date_header if options["If-Modified-Since"]
           headers["If-Unmodified-Since"] = Fog::Time.at(options["If-Unmodified-Since"].to_i).to_date_header if options["If-Modified-Since"]
           headers.merge!(options)
-          request(:expects  => [200, 206],
-                  :headers  => headers,
-                  :host     => "#{bucket_name}.#{@host}",
-                  :method   => "HEAD",
-                  :path     => Fog::Google.escape(object_name),
-                  :query    => query)
+          request(:expects    => [200, 206],
+                  :headers    => headers,
+                  :host       => "#{bucket_name}.#{@host}",
+                  :idempotent => true,
+                  :method     => "HEAD",
+                  :path       => Fog::Google.escape(object_name),
+                  :query      => query)
         end
       end
 

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

@@ -3,7 +3,9 @@ module Fog
     class GoogleXML
       class Mock
         def put_bucket_acl(_bucket_name, _acl)
+          # :no-coverage:
           Fog::Mock.not_implemented
+          # :no-coverage:
         end
       end
 

data/tasks/changelog.rake

@@ -0,0 +1,37 @@
+require "fileutils"
+
+# Helper method to insert text after a line that matches the regex
+def insert_after_line(file, insert, regex = /^## Next/)
+  tempfile = File.open("#{file}.tmp", "w")
+  f = File.new(file)
+  f.each do |line|
+    tempfile << line
+    next unless line =~ regex
+
+    tempfile << "\n"
+    tempfile << insert
+    tempfile << "\n"
+  end
+  f.close
+  tempfile.close
+
+  FileUtils.mv("#{file}.tmp", file)
+end
+
+# Extracts all changes that have been made after the latest pushed tag
+def changes_since_last_tag
+  `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --grep="Merge" --pretty=format:"%t - %s%n%b%n"`
+end
+
+# Extracts all github users contributed since last tag
+def users_since_last_tag
+  `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --grep="Merge" --pretty=format:"%s" | cut -d' ' -f 6 | cut -d/ -f1 | uniq`
+end
+
+namespace :changelog do
+  task :generate do
+    insert_after_line("CHANGELOG.md", changes_since_last_tag, /^## Next/)
+    printf("Users contributed since last release:\n")
+    printf(users_since_last_tag)
+  end
+end

data/tasks/test.rake

@@ -86,10 +86,14 @@ namespace :test do
   end
 
   desc "Run SQL API tests"
-  task :compute => SQL_TEST_TASKS
+  task :sql => SQL_TEST_TASKS
 
   desc "Run SQL API tests in parallel"
-  multitask :compute_parallel => SQL_TEST_TASKS
+  multitask :sql_parallel => SQL_TEST_TASKS
+
+  # TODO(temikus): Remove after v1 is renamed in pipeline
+  desc "Run SQL API tests - v1 compat alias"
+  task :"sql-sqlv2" => :sql
 
   Rake::TestTask.new do |t|
     t.name = "sql"

data/test/helpers/integration_test_helper.rb

@@ -1,5 +1,6 @@
 require "helpers/test_helper"
 require "helpers/test_collection"
+require "retriable"
 
 # Use :test credentials in ~/.fog for live integration testing
 # XXX not sure if this will work on Travis CI or not
@@ -22,13 +23,10 @@ TEST_IMAGE_FAMILY = "debian-9".freeze
 
 # 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".freeze
+TEST_RAW_DISK_SOURCE = "https://storage.googleapis.com/fog-testing-bucket/fog-test-raw-disk-source.image.tar.gz".freeze
 
-TEST_SQL_TIER_FIRST = "D1".freeze
-TEST_SQL_REGION_FIRST = "us-central".freeze
-
-TEST_SQL_TIER_SECOND = "db-n1-standard-1".freeze
-TEST_SQL_REGION_SECOND = TEST_REGION
+TEST_SQL_TIER = "db-n1-standard-1".freeze
+TEST_SQL_REGION = TEST_REGION
 
 # Test certificate/key for SSL Proxy tests, generated via:
 # $ openssl genrsa -out example.key 2048
@@ -90,8 +88,21 @@ wLjafhPTSAIS0jijglJ7uzaSbFUW11fw1/EIqIFNe0R0Xf9lsyPxFA==
 -----END RSA PRIVATE KEY-----
 KEY
 
+# Retry module config - standard retriable gem settings
+# see: https://github.com/kamui/retriable
+RETRIABLE_TRIES = 3
+RETRIABLE_BASE_INTERVAL = 50
+
 class FogIntegrationTest < MiniTest::Test
   def namespaced_name
     "#{self.class}_#{name}"
   end
+
+  def retry_on(klass)
+    Retriable.retriable(on: klass,
+                        tries: RETRIABLE_TRIES,
+                        base_interval: RETRIABLE_BASE_INTERVAL) do
+      yield
+    end
+  end
 end

data/test/helpers/test_helper.rb

@@ -5,6 +5,7 @@ if ENV["COVERAGE"]
 
   require 'codecov'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  SimpleCov.skip_token('no-coverage')
 
   SimpleCov.start do
     add_filter "/test/"

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

@@ -20,6 +20,22 @@ class TestServers < FogIntegrationTest
     super
   end
 
+  def test_set_machine_type
+    server = @factory.create
+    server.stop
+    server.wait_for { stopped? }
+    server.set_machine_type("n1-standard-2", false)
+    assert_equal "n1-standard-2", server.machine_type.split("/")[-1]
+  end
+
+  def test_set_machine_type_fail
+    server = @factory.create
+    server.wait_for { ready? }
+    assert_raises Fog::Errors::Error do
+      server.set_machine_type("n1-standard-2", false)
+    end
+  end
+
   def test_set_metadata
     server = @factory.create
     server.wait_for { ready? }
@@ -28,6 +44,15 @@ class TestServers < FogIntegrationTest
                   { :key => "baz", :value => "foo" }], server.metadata[:items]
   end
 
+  def test_add_ssh_key
+    key = "ssh-rsa IAMNOTAREALSSHKEYAMA=="
+    username = "test_user"
+    server = @factory.create
+    server.add_ssh_key(username, key, false)
+    assert_equal [{ :key => "ssh-keys",
+                    :value => "test_user:ssh-rsa IAMNOTAREALSSHKEYAMA== test_user" }], server.metadata[:items]
+  end
+
   def test_bootstrap
     key = "ssh-rsa IAMNOTAREALSSHKEYAMA== user@host.subdomain.example.com"
     user = "username"
@@ -106,4 +131,19 @@ class TestServers < FogIntegrationTest
 
     assert server.ready?
   end
+
+  def test_reset_windows_password
+    win_disk = @disks.create(
+      :name => "fog-test-1-testservers-test-reset-windows-password-2",
+      :source_image => "windows-server-1909-dc-core-v20200310",
+      :size_gb => 32
+    )
+    server = @factory.create(:disks => [win_disk])
+    server.wait_for { ready? }
+    server.reset_windows_password("test_user")
+    serial_output = server.serial_port_output(:port => 4)
+
+    assert_includes(serial_output, "encryptedPassword")
+    assert_includes(serial_output, "\"userName\":\"test_user\"")
+  end
 end

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

@@ -20,7 +20,7 @@ class TestZones < FogIntegrationTest
     # This tests only in last zone since not all zones contain all machine types
     ZONES.each do |name|
       zone = @subject.get(name)
-      refute_nil(zone, "zones.get() should not return nil")
+      refute_nil(zone, "zones.get(#{name}) should not return nil")
       assert(zone.up?, "zones.up? should return up, unless there's an outage")
     end
   end

data/test/integration/compute/core_networking/test_addresses.rb

@@ -32,6 +32,29 @@ class TestAddresses < FogIntegrationTest
       @subject.get(address.name, TEST_REGION).status,
       "Address should now be in use"
     )
+
+    address.reload
+
+    assert_equal(
+      server,
+      address.server,
+      "Address.server should return an associated server object"
+    )
+
+    address.server = nil
+    address.reload
+    assert_nil(
+      address.server,
+      "Address should not be associated with a server after disassociation"
+    )
+
+    address.server = server
+    address.reload
+    assert_equal(
+        server,
+        address.server,
+        "Address should be associated with a server after association"
+    )
   end
 
   def test_bad_get

data/test/integration/factories/{sql_v1_certs_factory.rb → sql_certs_factory.rb}

@@ -1,9 +1,9 @@
 require "integration/factories/collection_factory"
-require "integration/factories/sql_v1_instances_factory"
+require "integration/factories/sql_instances_factory"
 
-class SqlV1CertsFactory < CollectionFactory
+class SqlCertsFactory < CollectionFactory
   def initialize(example)
-    @instances = SqlV1InstancesFactory.new(example)
+    @instances = SqlInstancesFactory.new(example)
     super(Fog::Google[:sql].ssl_certs, example)
   end