fog-google 1.5.0 → 1.6.0

data/test/integration/sql/test_v1_users.rb

@@ -0,0 +1,37 @@
+require "helpers/integration_test_helper"
+require "integration/factories/sql_v1_instances_factory"
+require "integration/factories/sql_v1_users_factory"
+
+class TestSQLV1Users < FogIntegrationTest
+  # This test doesn't include TestCollection as Users is not a
+  # classical Fog model, as it's tied to a particular instance
+  # I.e.:
+  # - Fog::Google::SQL.users.all() requires an instance
+  # - API doesn't provide a GET request for Users model
+  # See: https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/users
+
+  def setup
+    @subject = Fog::Google[:sql].users
+    @factory = SqlV1UsersFactory.new(namespaced_name)
+  end
+
+  def teardown
+    @factory.cleanup
+  end
+
+  def test_users
+    # Create user
+    user = @factory.create
+
+    # Check user was created
+    users = @subject.all(user.instance).select { |u| u.name == user.name }
+    assert_equal(1, users.size, "expected user to have been created")
+
+    # Delete user
+    users.first.destroy(:async => false)
+    assert_empty(
+      @subject.all(user.instance).select { |u| u.name == user.name },
+      "expected no user #{user.name}"
+    )
+  end
+end

data/test/integration/sql/test_v2_instances.rb

@@ -0,0 +1,81 @@
+require "helpers/integration_test_helper"
+require "integration/factories/sql_v2_instances_factory"
+# Client helper is imported for `wait_until_complete`
+# TODO: Remove when fog-google#339 or fog-google#340 is resolved
+require "helpers/client_helper"
+
+class TestSQLV2Instances < FogIntegrationTest
+  include TestCollection
+  # TODO: Remove when fog-google#339 or fog-google#340 is resolved
+  include ClientHelper
+  attr_reader :client
+
+  def setup
+    @subject = Fog::Google[:sql].instances
+    @factory = SqlV2InstancesFactory.new(namespaced_name)
+    @backup_runs = Fog::Google[:sql].backup_runs
+    # TODO: Remove after BackupRuns get save/reload - fog-google#339
+    # See https://github.com/fog/fog-google/issues/339
+    @client = Fog::Google::SQL.new
+  end
+
+  def test_restore_backup_run
+    instance = @factory.create
+
+    data = { :description => "test", :instance => instance.name }
+    wait_until_complete { @client.insert_backup_run(instance.name, data) }
+
+    backup_run = @backup_runs.all(instance.name).first
+
+    # Wait for backup operation to be finished
+    # or fail if it never finishes.
+    instance.restore_backup(backup_run.id, :async => false)
+  end
+
+  def test_backup_runs
+    # TODO: This probably can get pulled into the test above as those tests
+    # very expensive time-wize (5 minutes or so each)
+    instance = @factory.create
+
+    description = "test backup run"
+    operation = wait_until_complete do
+      @client.insert_backup_run(
+        instance.name,
+        :description => description
+      )
+    end
+
+    assert_equal(operation.operation_type, "BACKUP_VOLUME")
+    runs = @backup_runs.all(instance.name)
+    assert_operator(runs.size, :>, 0, "expected at least one backup run")
+    assert_equal(description, runs.first.description)
+
+    created_run = @backup_runs.get(instance.name, runs.first.id)
+    assert_equal(created_run, runs.first)
+
+    wait_until_complete do
+      @client.delete_backup_run(instance.name, runs.first.id)
+    end
+
+    deleted_run = @backup_runs.get(instance.name, runs.first.id)
+    assert_equal("DELETED", deleted_run.status)
+  end
+
+  def test_clone
+    instance = @factory.create
+    instance.clone("#{instance.name}-clone", :async => false)
+    cloned = @client.instances.get("#{instance.name}-clone")
+
+    # Sanity check some attributes
+    compare = %i(current_disk_size project region ip_configuration_require_ssl activation_policy)
+    compare.each do |k|
+      v = instance.attributes[k]
+      cloned_v = cloned.attributes[k]
+      if v.nil?
+        assert_nil(cloned_v)
+      else
+        assert_equal(v, cloned_v, "attribute #{k} in original instance is #{v}, cloned = #{cloned_v}")
+      end
+    end
+  end
+end

data/test/unit/compute/test_server.rb

@@ -0,0 +1,28 @@
+require "helpers/test_helper"
+
+class UnitTestServer < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Compute.new(:provider => "Google", :google_project => "foo")
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  def test_if_server_accepts_ssh_keys
+    key = "ssh-rsa IAMNOTAREALSSHKEYAMA== user@host.subdomain.example.com"
+
+    File.stub :read, key do
+      server = Fog::Compute::Google::Server.new(
+        :name => "foo",
+        :machine_type => "bar",
+        :disks => ["baz"],
+        :zone => "foo",
+        :public_key_path => key
+      )
+      assert_equal(server.public_key, key,
+                   "Fog::Compute::Google::Server loads public_key properly")
+    end
+  end
+end

data/test/unit/storage/test_xml_requests.rb

@@ -0,0 +1,24 @@
+require "helpers/test_helper"
+
+class UnitTestXMLRequests < MiniTest::Test
+  def setup
+    Fog.mock!
+    @client = Fog::Storage.new(provider: "google",
+                               google_storage_access_key_id: "",
+                               google_storage_secret_access_key: "")
+  end
+
+  def teardown
+    Fog.unmock!
+  end
+
+  def test_put_url_path_is_properly_escaped
+    url = @client.put_object_url("bucket",
+                                 "just some file.json",
+                                 Time.now + 2 * 60,
+                                 "Content-Type" => "application/json")
+
+    assert_match(/just%20some%20file\.json/, url,
+                 "space should be escaped with '%20'")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -256,6 +256,7 @@ files:
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE.md
+- MIGRATING.md
 - README.md
 - Rakefile
 - ci/.gitignore
@@ -729,6 +730,10 @@ files:
 - test/integration/factories/instance_group_manager_factory.rb
 - test/integration/factories/instance_template_factory.rb
 - test/integration/factories/servers_factory.rb
+- test/integration/factories/sql_v1_certs_factory.rb
+- test/integration/factories/sql_v1_instances_factory.rb
+- test/integration/factories/sql_v1_users_factory.rb
+- test/integration/factories/sql_v2_instances_factory.rb
 - test/integration/factories/target_http_proxies_factory.rb
 - test/integration/factories/target_instances_factory.rb
 - test/integration/factories/target_pools_factory.rb
@@ -739,11 +744,12 @@ files:
 - test/integration/pubsub/pubsub_shared.rb
 - test/integration/pubsub/test_pubsub_models.rb
 - test/integration/pubsub/test_pubsub_requests.rb
-- test/integration/sql/sql_instances_shared.rb
-- test/integration/sql/test_flags.rb
-- test/integration/sql/test_instances.rb
-- test/integration/sql/test_instances_second_gen.rb
-- test/integration/sql/test_tiers.rb
+- test/integration/sql/test_common_flags.rb
+- test/integration/sql/test_common_tiers.rb
+- test/integration/sql/test_v1_certs.rb
+- test/integration/sql/test_v1_instances.rb
+- test/integration/sql/test_v1_users.rb
+- test/integration/sql/test_v2_instances.rb
 - test/integration/storage/storage_shared.rb
 - test/integration/storage/test_buckets.rb
 - test/integration/storage/test_directories.rb
@@ -752,6 +758,8 @@ files:
 - test/integration/test_authentication.rb
 - test/unit/compute/test_common_collections.rb
 - test/unit/compute/test_common_models.rb
+- test/unit/compute/test_server.rb
+- test/unit/storage/test_xml_requests.rb
 homepage: https://github.com/fog/fog-google
 licenses:
 - MIT
@@ -813,6 +821,10 @@ test_files:
 - test/integration/factories/instance_group_manager_factory.rb
 - test/integration/factories/instance_template_factory.rb
 - test/integration/factories/servers_factory.rb
+- test/integration/factories/sql_v1_certs_factory.rb
+- test/integration/factories/sql_v1_instances_factory.rb
+- test/integration/factories/sql_v1_users_factory.rb
+- test/integration/factories/sql_v2_instances_factory.rb
 - test/integration/factories/target_http_proxies_factory.rb
 - test/integration/factories/target_instances_factory.rb
 - test/integration/factories/target_pools_factory.rb
@@ -823,11 +835,12 @@ test_files:
 - test/integration/pubsub/pubsub_shared.rb
 - test/integration/pubsub/test_pubsub_models.rb
 - test/integration/pubsub/test_pubsub_requests.rb
-- test/integration/sql/sql_instances_shared.rb
-- test/integration/sql/test_flags.rb
-- test/integration/sql/test_instances.rb
-- test/integration/sql/test_instances_second_gen.rb
-- test/integration/sql/test_tiers.rb
+- test/integration/sql/test_common_flags.rb
+- test/integration/sql/test_common_tiers.rb
+- test/integration/sql/test_v1_certs.rb
+- test/integration/sql/test_v1_instances.rb
+- test/integration/sql/test_v1_users.rb
+- test/integration/sql/test_v2_instances.rb
 - test/integration/storage/storage_shared.rb
 - test/integration/storage/test_buckets.rb
 - test/integration/storage/test_directories.rb
@@ -836,3 +849,5 @@ test_files:
 - test/integration/test_authentication.rb
 - test/unit/compute/test_common_collections.rb
 - test/unit/compute/test_common_models.rb
+- test/unit/compute/test_server.rb
+- test/unit/storage/test_xml_requests.rb

data/test/integration/sql/sql_instances_shared.rb

@@ -1,57 +0,0 @@
-require "helpers/integration_test_helper"
-require "helpers/client_helper"
-
-class TestSqlInstancesShared < FogIntegrationTest
-  include ClientHelper
-  attr_reader :client
-
-  INSTANCE_NAME = "fogtest-#{Fog::Mock.random_letters(8)}".freeze
-
-  def setup
-    @client = Fog::Google::SQL.new
-    Minitest.after_run do
-      delete_test_resources
-    end
-  end
-
-  def delete_test_resources
-    try_delete_instance(INSTANCE_NAME)
-  end
-
-  def some_instance_name
-    # Create one test instance per generation per test suite.
-    INSTANCE_NAME.tap do |name|
-      begin
-        @client.get_instance(name)
-      rescue ::Google::Apis::ClientError
-        create_test_instance(INSTANCE_NAME,
-                             TEST_SQL_TIER_FIRST,
-                             TEST_SQL_REGION_FIRST)
-      end
-    end
-  end
-
-  def some_clone_name
-    "#{INSTANCE_NAME}-clone"
-  end
-
-  def create_test_instance(instance_name, tier, region)
-    # Create one test instance per generation per test suite.
-    Fog::Logger.debug("creating test SQL instance...")
-    # Create test instance if it hasn't been created yet
-    @client = Fog::Google::SQL.new
-    wait_until_complete do
-      @client.insert_instance(instance_name, tier, :region => region)
-    end
-  end
-
-  def try_delete_instance(instance)
-    @client = Fog::Google::SQL.new
-    wait_until_complete { @client.delete_instance(instance) }
-  rescue ::Google::Apis::ClientError => e
-    # 409: Invalid state
-    # 404: Not found
-    raise e unless e.status_code == 404 || e.status_code == 409
-    Fog::Logger.warning("ignoring error in try_delete_instance")
-  end
-end

data/test/integration/sql/test_instances.rb

@@ -1,97 +0,0 @@
-require "helpers/integration_test_helper"
-require "helpers/client_helper"
-require "integration/sql/sql_instances_shared"
-
-class TestFirstGenInstances < TestSqlInstancesShared
-  def test_all
-    test_name = some_instance_name
-    instances = @client.instances.all
-    assert_operator(instances.size, :>=, 1,
-                    "expected at least one instance")
-
-    filtered = instances.select { |i| i.name == test_name }
-    assert_equal(1, filtered.size, "expected instance with name #{test_name}")
-  end
-
-  def test_update
-    instance = @client.instances.get(some_instance_name)
-    settings_version = instance.settings_version
-    labels = {
-      :foo => "bar"
-    }
-    instance.settings[:user_labels] = labels
-    instance.save
-
-    updated = @client.instances.get(some_instance_name)
-    assert_equal(labels, updated.settings[:user_labels])
-    assert_operator(updated.settings_version, :>, settings_version)
-  end
-
-  def test_users
-    # Create user
-    username = "test_user"
-
-    wait_until_complete do
-      @client.insert_user(some_instance_name, :name => username)
-    end
-
-    # Check user was created
-    users = @client.users.all(some_instance_name)
-                   .select { |u| u.name == username }
-    assert_equal(1, users.size, "expected user to have been created")
-
-    # Delete user
-    users.first.destroy(:async => false)
-    assert_empty(
-      @client.users.all(some_instance_name).select { |u| u.name == username },
-      "expected no user #{username}"
-    )
-  end
-
-  def test_operations
-    operations = @client.operations.all(some_instance_name)
-    operations.select do |op|
-      op.operation_type == "CREATE"
-    end
-
-    create_op = @client.operations.get(operations.first.name)
-    assert(create_op.ready?)
-  end
-
-  def test_ssl_certs
-    list_result = @client.ssl_certs.all(some_instance_name)
-    # initial Count
-    cert_cnt = list_result.size
-    assert_equal(0, cert_cnt, "new instance should have 0 initial ssl certs")
-
-    # create new certs
-    ssl_certs = (0..1).map do
-      name = Fog::Mock.random_letters(16)
-      create_resp = @client.insert_ssl_cert(some_instance_name, name)
-      wait_until_complete { create_resp.operation }
-      fingerprint = create_resp.client_cert.cert_info.sha1_fingerprint
-      # verify it was created
-      @client.ssl_certs.get(some_instance_name, fingerprint).tap do |result|
-        assert_equal(name, result.common_name)
-        assert_equal("sql#sslCert", result.kind)
-      end
-    end
-
-    # check i1 was created
-    list_result = @client.ssl_certs.all(some_instance_name)
-    assert_equal(ssl_certs.size, list_result.size,
-                 "expected #{ssl_certs.size} SSL certs")
-
-    # delete one cert
-    ssl_certs.first.destroy(:async => false)
-    list_result = @client.ssl_certs.all(some_instance_name)
-    assert_equal(ssl_certs.size - 1, list_result.size,
-                 "expected one less SSL cert after deletion")
-
-    # Reset SSL config
-    instance = @client.instances.get(some_instance_name)
-    instance.reset_ssl_config(:async => false)
-    assert_equal(0, @client.ssl_certs.all(some_instance_name).size,
-                 "expected no SSL certs after reset")
-  end
-end

data/test/integration/sql/test_instances_second_gen.rb

@@ -1,88 +0,0 @@
-require "helpers/integration_test_helper"
-require "helpers/client_helper"
-require "integration/sql/sql_instances_shared"
-
-##
-# Tests requests and resources specific to 2nd generation instances.
-
-class TestSecondGenInstances < TestSqlInstancesShared
-  # Test
-  INSTANCE_NAME = "fogtest2ndgen-#{Fog::Mock.random_letters(8)}".freeze
-
-  def some_clone_name
-    "#{INSTANCE_NAME}-clone"
-  end
-
-  def some_instance_name
-    # Create one test instance per generation per test suite.
-    INSTANCE_NAME.tap do |name|
-      begin
-        @client.get_instance(name)
-      rescue ::Google::Apis::ClientError
-        create_test_instance(INSTANCE_NAME,
-                             TEST_SQL_TIER_SECOND,
-                             TEST_SQL_REGION_SECOND)
-      end
-    end
-  end
-
-  def delete_test_resources
-    super
-    try_delete_instance(some_clone_name)
-  end
-
-  def test_restore_backup_run
-    data = { :description => "test", :instance => some_instance_name }
-    wait_until_complete { @client.insert_backup_run(some_instance_name, data) }
-
-    backup_run = @client.backup_runs.all(some_instance_name).first
-    instance = @client.instances.get(some_instance_name)
-
-    # Wait for backup operation to be finished
-    # or fail if it never finishes.
-    instance.restore_backup(backup_run.id, :async => false)
-  end
-
-  def test_backup_runs
-    description = "test backup run"
-    op = wait_until_complete do
-      @client.insert_backup_run(
-        some_instance_name,
-        :description => description
-      )
-    end
-
-    assert_equal(op.operation_type, "BACKUP_VOLUME")
-    runs = @client.backup_runs.all(some_instance_name)
-    assert_operator(runs.size, :>, 0, "expected at least one backup run")
-    assert_equal(description, runs.first.description)
-
-    created_run = @client.backup_runs.get(some_instance_name, runs.first.id)
-    assert_equal(created_run, runs.first)
-
-    wait_until_complete do
-      @client.delete_backup_run(some_instance_name, runs.first.id)
-    end
-
-    deleted_run = @client.backup_runs.get(some_instance_name, runs.first.id)
-    assert_equal("DELETED", deleted_run.status)
-  end
-
-  def test_clone
-    instance = @client.instances.get(some_instance_name)
-    instance.clone(some_clone_name, :async => false)
-    cloned = @client.instances.get(some_clone_name)
-
-    # Sanity check some attributes
-    compare = %i(current_disk_size tier project region ip_configuration_require_ssl activation_policy)
-    compare.each do |k|
-      v = instance.attributes[k]
-      cloned_v = cloned.attributes[k]
-      if v.nil?
-        assert_nil(cloned_v)
-      else
-        assert_equal(v, cloned_v, "attribute #{k} in original instance is #{v}, cloned = #{cloned_v}")
-      end
-    end
-  end
-end