fog-google 1.9.1 → 1.10.0

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
 

data/test/integration/factories/{sql_v1_instances_factory.rb → sql_instances_factory.rb}

@@ -1,6 +1,6 @@
 require "integration/factories/collection_factory"
 
-class SqlV1InstancesFactory < CollectionFactory
+class SqlInstancesFactory < CollectionFactory
   def initialize(example)
     super(Fog::Google[:sql].instances, example)
   end
@@ -13,7 +13,7 @@ class SqlV1InstancesFactory < CollectionFactory
     # Name has a time suffix due to SQL resources API objects having
     # a _very_ long life on the backend (n(days)) after deletion.
     { :name => "#{resource_name}-#{Time.now.to_i}",
-      :region => TEST_SQL_REGION_FIRST,
-      :tier => TEST_SQL_TIER_FIRST }
+      :region => TEST_SQL_REGION,
+      :tier => TEST_SQL_TIER }
   end
 end

data/test/integration/factories/{sql_v1_users_factory.rb → sql_users_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 SqlV1UsersFactory < CollectionFactory
+class SqlUsersFactory < CollectionFactory
   def initialize(example)
-    @instances = SqlV1InstancesFactory.new(example)
+    @instances = SqlInstancesFactory.new(example)
     super(Fog::Google[:sql].users, example)
   end
 
@@ -15,6 +15,9 @@ class SqlV1UsersFactory < CollectionFactory
   def params
     # Username should not be longer than 16 characters
     { :name => resource_name[0..15],
+      # TODO: Consider removing host when Users.list API issue is resolved
+      # See https://github.com/fog/fog-google/issues/462
+      :host => "%",
       :instance => @instances.create.name }
   end
 end

data/test/integration/monitoring/test_metric_descriptors.rb

@@ -104,7 +104,9 @@ class TestMetricDescriptors < FogIntegrationTest
     descriptors = @client.metric_descriptors.all
     assert_operator(descriptors.size, :>, 0,
                     "metric descriptor count should be positive")
+  end
 
+  def test_metric_descriptors_all_page_size
     descriptors = @client.metric_descriptors.all(
       :filter => 'metric.type = starts_with("compute.googleapis.com")',
       :page_size => 5

data/test/integration/monitoring/test_timeseries.rb

@@ -151,6 +151,8 @@ class TestMetricDescriptors < FogIntegrationTest
         :page_size => 1
       )
     end
+
+    refute_nil(resp.time_series, "expected timeseries to not be nil")
     assert_equal(resp.time_series.size, 1,
                  "expected timeseries count to be equal to page size 1")
 
@@ -164,7 +166,7 @@ class TestMetricDescriptors < FogIntegrationTest
                  "expected timeseries count to be equal to page size 1")
     labels = resp.time_series.first.metric.labels
     labels_next = next_resp.time_series.first.metric.labels
-    assert(labels != labels_next,
+    refute_equal(labels, labels_next,
            "expected different timeseries when using page_token")
 
     # Test filter

data/test/integration/sql/{sqlv1/test_v1_certs.rb → test_certs.rb}

@@ -1,12 +1,13 @@
 require "helpers/integration_test_helper"
-require "integration/factories/sql_v1_certs_factory"
+require "integration/factories/sql_certs_factory"
+require "pry"
 
-class TestSQLV1Certs < FogIntegrationTest
+class TestSQLCerts < FogIntegrationTest
   # This test doesn't include TestCollection as certs are not an independent resource.
 
   def setup
     @subject = Fog::Google[:sql].ssl_certs
-    @factory = SqlV1CertsFactory.new(namespaced_name)
+    @factory = SqlCertsFactory.new(namespaced_name)
     @client  = Fog::Google::SQL.new
   end
 

data/test/integration/sql/{sqlv1/test_coverage.rb → test_coverage.rb}

@@ -3,4 +3,4 @@ require "helpers/integration_test_helper"
 # This is a simple coverage helper that helps differentiate
 # the tests when run in parallel so the final coverage report
 # can be properly combined together from multiple runners
-SimpleCov.command_name "test:sqlv1" if ENV["COVERAGE"]
+SimpleCov.command_name "test:sql" if ENV["COVERAGE"]

data/test/integration/sql/{sqlv2/test_v2_instances.rb → test_instances.rb}

@@ -1,5 +1,5 @@
 require "helpers/integration_test_helper"
-require "integration/factories/sql_v2_instances_factory"
+require "integration/factories/sql_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"
@@ -12,13 +12,33 @@ class TestSQLV2Instances < FogIntegrationTest
 
   def setup
     @subject = Fog::Google[:sql].instances
-    @factory = SqlV2InstancesFactory.new(namespaced_name)
+    @factory = SqlInstancesFactory.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_update
+    instance = @factory.create
+
+    settings_version = instance.settings_version
+    labels = {
+      :foo => "bar"
+    }
+    instance.settings[:user_labels] = labels
+    instance.save
+
+    updated = @subject.get(instance.name)
+    assert_equal(labels, updated.settings[:user_labels])
+    assert_operator(updated.settings_version, :>, settings_version)
+  end
+
+  def test_default_settings
+    instance = @factory.create
+    assert_equal([], instance.ssl_certs, "new instance should have 0 initial ssl certs")
+  end
+
   def test_restore_backup_run
     instance = @factory.create
 

data/test/integration/sql/{sqlv1/test_v1_users.rb → test_users.rb}

@@ -1,8 +1,8 @@
 require "helpers/integration_test_helper"
-require "integration/factories/sql_v1_instances_factory"
-require "integration/factories/sql_v1_users_factory"
+require "integration/factories/sql_instances_factory"
+require "integration/factories/sql_users_factory"
 
-class TestSQLV1Users < FogIntegrationTest
+class TestSQLUsers < 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.:
@@ -12,7 +12,7 @@ class TestSQLV1Users < FogIntegrationTest
 
   def setup
     @subject = Fog::Google[:sql].users
-    @factory = SqlV1UsersFactory.new(namespaced_name)
+    @factory = SqlUsersFactory.new(namespaced_name)
   end
 
   def teardown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2020-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -57,16 +57,22 @@ dependencies:
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.32'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: '0.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.32'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -204,11 +210,14 @@ files:
 - MIGRATING.md
 - README.md
 - Rakefile
+- SECURITY.md
 - ci/.gitignore
 - ci/README.md
+- ci/build-head-pipeline.yml
 - ci/credentials.yml.template
 - ci/docker-image/Dockerfile
-- ci/pipeline.yml
+- ci/integration-pipeline.yml
+- ci/pipeline-dev.yml
 - ci/tasks/run-int.sh
 - ci/tasks/run-int.yml
 - ci/tasks/utils.sh
@@ -447,11 +456,13 @@ files:
 - lib/fog/compute/google/requests/remove_target_pool_instance.rb
 - lib/fog/compute/google/requests/remove_target_pool_instances.rb
 - lib/fog/compute/google/requests/reset_server.rb
+- lib/fog/compute/google/requests/reset_windows_password.rb
 - lib/fog/compute/google/requests/set_common_instance_metadata.rb
 - lib/fog/compute/google/requests/set_forwarding_rule_target.rb
 - lib/fog/compute/google/requests/set_global_forwarding_rule_target.rb
 - lib/fog/compute/google/requests/set_instance_template.rb
 - lib/fog/compute/google/requests/set_server_disk_auto_delete.rb
+- lib/fog/compute/google/requests/set_server_machine_type.rb
 - lib/fog/compute/google/requests/set_server_metadata.rb
 - lib/fog/compute/google/requests/set_server_scheduling.rb
 - lib/fog/compute/google/requests/set_server_tags.rb
@@ -694,10 +705,9 @@ files:
 - test/integration/factories/instance_template_factory.rb
 - test/integration/factories/networks_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/sql_certs_factory.rb
+- test/integration/factories/sql_instances_factory.rb
+- test/integration/factories/sql_users_factory.rb
 - test/integration/factories/ssl_certificates_factory.rb
 - test/integration/factories/subnetworks_factory.rb
 - test/integration/factories/target_http_proxies_factory.rb
@@ -713,14 +723,12 @@ files:
 - test/integration/pubsub/test_coverage.rb
 - test/integration/pubsub/test_pubsub_models.rb
 - test/integration/pubsub/test_pubsub_requests.rb
-- test/integration/sql/sqlv1/test_common_flags.rb
-- test/integration/sql/sqlv1/test_common_tiers.rb
-- test/integration/sql/sqlv1/test_coverage.rb
-- test/integration/sql/sqlv1/test_v1_certs.rb
-- test/integration/sql/sqlv1/test_v1_instances.rb
-- test/integration/sql/sqlv1/test_v1_users.rb
-- test/integration/sql/sqlv2/test_coverage.rb
-- test/integration/sql/sqlv2/test_v2_instances.rb
+- test/integration/sql/test_certs.rb
+- test/integration/sql/test_common_flags.rb
+- test/integration/sql/test_common_tiers.rb
+- test/integration/sql/test_coverage.rb
+- test/integration/sql/test_instances.rb
+- test/integration/sql/test_users.rb
 - test/integration/storage/storage_shared.rb
 - test/integration/storage/test_buckets.rb
 - test/integration/storage/test_coverage.rb
@@ -759,7 +767,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.
@@ -817,10 +825,9 @@ test_files:
 - test/integration/factories/instance_template_factory.rb
 - test/integration/factories/networks_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/sql_certs_factory.rb
+- test/integration/factories/sql_instances_factory.rb
+- test/integration/factories/sql_users_factory.rb
 - test/integration/factories/ssl_certificates_factory.rb
 - test/integration/factories/subnetworks_factory.rb
 - test/integration/factories/target_http_proxies_factory.rb
@@ -836,14 +843,12 @@ test_files:
 - test/integration/pubsub/test_coverage.rb
 - test/integration/pubsub/test_pubsub_models.rb
 - test/integration/pubsub/test_pubsub_requests.rb
-- test/integration/sql/sqlv1/test_common_flags.rb
-- test/integration/sql/sqlv1/test_common_tiers.rb
-- test/integration/sql/sqlv1/test_coverage.rb
-- test/integration/sql/sqlv1/test_v1_certs.rb
-- test/integration/sql/sqlv1/test_v1_instances.rb
-- test/integration/sql/sqlv1/test_v1_users.rb
-- test/integration/sql/sqlv2/test_coverage.rb
-- test/integration/sql/sqlv2/test_v2_instances.rb
+- test/integration/sql/test_certs.rb
+- test/integration/sql/test_common_flags.rb
+- test/integration/sql/test_common_tiers.rb
+- test/integration/sql/test_coverage.rb
+- test/integration/sql/test_instances.rb
+- test/integration/sql/test_users.rb
 - test/integration/storage/storage_shared.rb
 - test/integration/storage/test_buckets.rb
 - test/integration/storage/test_coverage.rb

data/test/integration/factories/sql_v2_instances_factory.rb

@@ -1,19 +0,0 @@
-require "integration/factories/collection_factory"
-
-class SqlV2InstancesFactory < CollectionFactory
-  def initialize(example)
-    super(Fog::Google[:sql].instances, example)
-  end
-
-  def cleanup
-    super
-  end
-
-  def params
-    # Name has a time suffix due to SQL resources API objects having
-    # a _very_ long life on the backend (n(days)) after deletion.
-    { :name => "#{resource_name}-#{Time.now.to_i}",
-      :region => TEST_SQL_REGION_SECOND,
-      :tier => TEST_SQL_TIER_SECOND }
-  end
-end

data/test/integration/sql/sqlv1/test_v1_instances.rb

@@ -1,31 +0,0 @@
-require "helpers/integration_test_helper"
-require "integration/factories/sql_v1_instances_factory"
-
-class TestSQLV1Instances < FogIntegrationTest
-  include TestCollection
-
-  def setup
-    @subject = Fog::Google[:sql].instances
-    @factory = SqlV1InstancesFactory.new(namespaced_name)
-  end
-
-  def test_update
-    instance = @factory.create
-
-    settings_version = instance.settings_version
-    labels = {
-      :foo => "bar"
-    }
-    instance.settings[:user_labels] = labels
-    instance.save
-
-    updated = @subject.get(instance.name)
-    assert_equal(labels, updated.settings[:user_labels])
-    assert_operator(updated.settings_version, :>, settings_version)
-  end
-
-  def test_default_settings
-    instance = @factory.create
-    assert_equal([], instance.ssl_certs, "new instance should have 0 initial ssl certs")
-  end
-end

data/test/integration/sql/sqlv2/test_coverage.rb

@@ -1,6 +0,0 @@
-require "helpers/integration_test_helper"
-
-# This is a simple coverage helper that helps differentiate
-# the tests when run in parallel so the final coverage report
-# can be properly combined together from multiple runners
-SimpleCov.command_name "test:sqlv2" if ENV["COVERAGE"]