fog-google 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3563c5d9fb6cd9c28bd38b0b6c1ae1d619c33c81
-  data.tar.gz: 41ecb920dbcb66a2f6aa13f6557ef2a044d26d80
+  metadata.gz: e41bc807cc19b9984780ffcc9c253bac3ec3d13d
+  data.tar.gz: 69df7076d8eda3dfb5e22b1afcdb2ef97ee16e43
 SHA512:
-  metadata.gz: f4a9c9650d0824ad4dcd5389e63eb5c7e583d256c6c469481709cee80bd53f5fe168556e9e563a704878721ea733282c0af87fd24680c59513a6203d5026743c
-  data.tar.gz: 2cc78e1c0731a87179ffb6179698e5fa5bd90635d141aec05d9c5faa1e7b18fe8e1123c5ded5f925f7065f5b3ae4893f8876f72c23b164ad1172953f5b74f829
+  metadata.gz: af8cff6ac06cab566a31db97eb6b2065c53a74be8a77e133b4816f132a9b8079d7ff01e0031a393120bc3c98e8d680371ebfb07c72c5ddabded8f96d6f4d8b54
+  data.tar.gz: f81555df397158c969d85dd2b3215842e46f2e2217371e54fae1125fef349b76ea8d02c8218ebe3dc9ba04c6965e9c93ba96db2f501d070dfaf060a772badc07

data/.rubocop.yml

@@ -1,5 +1,5 @@
 # Fog custom enforced styles
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Style/ConditionalAssignment:
@@ -94,7 +94,7 @@ Naming/PredicateName:
   - is_
   - has_
   - have_
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
   - is_
   Exclude:
   - spec/**/*
@@ -246,7 +246,7 @@ Style/WhenThen:
 Lint/EachWithObjectArgument:
   Description: Check for immutable argument given to each_with_object.
   Enabled: true
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Description: Don't suppress exception.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
   Enabled: false

data/CHANGELOG.md

@@ -6,6 +6,26 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
 
 ## Next
 
+## 1.11.0
+
+### User-facing
+
+#### Added
+
+- \#503 - Add fallback URL signing mechanism via IAM SignBlob API [temikus]
+
+#### Fixed
+
+- \#498 Add `:idempotent` flag to Fog::Storage::GoogleXML::Real#head_object, fixing
+          `Excon::Error::Socket: end of file reached (EOFError)` in certain scenarios, see \#416 [temikus]
+- \#500 Set default options automatically if missing in `Pubsub#pull_subscription`
+
+### Development changes
+
+#### Fixed
+
+- \#501 DRY'ed up the retry methods in monitoring tests [temikus]
+- \#500 Cleanup unneeded constants in Server model, fix flaky PubSub tests [temikus]
 
 ## 1.10.0
 

data/README.md

@@ -108,6 +108,43 @@ defined:
 => [  <Fog::Compute::Google::Server ...  ]
 ```
 
+#### CarrierWave integration
+
+It is common to integrate Fog with Carrierwave. Here's a minimal config that's commonly put in `config/initializers/carrierwave.rb`:
+
+```
+CarrierWave.configure do |config|
+    config.fog_provider = 'fog/google'
+    config.fog_credentials = {
+        provider: 'Google',
+        google_project: Rails.application.secrets.google_cloud_storage_project_name,
+        google_json_key_string: Rails.application.secrets.google_cloud_storage_credential_content
+        # can optionally use google_json_key_location if using an actual file;
+    }
+    config.fog_directory = Rails.application.secrets.google_cloud_storage_bucket_name
+end
+```
+
+This needs a corresponding secret in `config/secrets.yml`, e.g.:
+
+```
+development:
+    google_cloud_storage_project_name: your-project-name
+    google_cloud_storage_credential_content: '{
+        "type": "service_account",
+        "project_id": "your-project-name",
+        "private_key_id": "REDACTED",
+        "private_key": "-----BEGIN PRIVATE KEY-----REDACTED-----END PRIVATE KEY-----\n",
+        "client_email": "REDACTED@your-project-name.iam.gserviceaccount.com",
+        "client_id": "REDACTED",
+        "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+        "token_uri": "https://accounts.google.com/o/oauth2/token",
+        "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+        "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/REDACTED%40your-project-name.iam.gserviceaccount.com"
+    }'
+    google_cloud_storage_bucket_name: your-bucket-name
+```
+
 #### SSH-ing into instances
 
 If you want to be able to bootstrap SSH-able instances, (using `servers.bootstrap`,) be sure you have a key in `~/.ssh/id_rsa` and `~/.ssh/id_rsa.pub`

data/fog-google.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fog-json", "~> 1.2"
   spec.add_dependency "fog-xml", "~> 0.1.0"
 
-  # Hard Requirement as of 1.0
   spec.add_dependency "google-api-client", ">= 0.32", "< 0.34"
-  
+  spec.add_dependency "google-cloud-env", "~> 1.2"
+
   # Debugger
   spec.add_development_dependency "pry"
 

data/lib/fog/compute/google.rb

@@ -27,10 +27,6 @@ module Fog
                                           https://www.googleapis.com/auth/ndev.cloudman
                                           https://www.googleapis.com/auth/cloud-platform).freeze
       GOOGLE_COMPUTE_DEFAULT_NETWORK = "default".freeze
-      # TODO: Do we need those constants?
-      RUNNING = "RUNNING".freeze
-      PROVISIONING = "PROVISIONING".freeze
-      STAGING = "STAGING".freeze
 
       request_path "fog/compute/google/requests"
       request :add_backend_service_backends

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

@@ -447,7 +447,7 @@ module Fog
         #
         # @return [TrueClass or FalseClass]
         def provisioning?
-          status == PROVISIONING
+          status == "PROVISIONING"
         end
 
         # Check if instance is staging. On staging vs. provisioning difference:
@@ -455,7 +455,7 @@ module Fog
         #
         # @return [TrueClass or FalseClass]
         def staging?
-          status == STAGING
+          status == "STAGING"
         end
 
         # Check if instance is stopped.
@@ -469,7 +469,7 @@ module Fog
         #
         # @return [TrueClass or FalseClass]
         def ready?
-          status == RUNNING
+          status == "RUNNING"
         end
 
         def zone_name

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

@@ -21,7 +21,7 @@ module Fog
         #     fingerprint = instance.metadata['fingerprint']
         # @param [Hash] metadata A new metadata object
         #   Should have the following structure:
-        #   {:items=>[{:key=>"foo", :value=>"bar"}, {:key=>"baz", :value=>"foo"}]}
+        #   {'foo' => 'bar', 'baz'=>'foo'}
         #
         # @returns [::Google::Apis::ComputeV1::Operation] set operation
         def set_server_metadata(instance, zone, fingerprint, metadata_items = [])

data/lib/fog/google/requests/pubsub/pull_subscription.rb

@@ -16,7 +16,11 @@ module Fog
         # @option options [Number] :max_messages maximum number of messages to
         #   retrieve (defaults to 10)
         # @see https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/pull
-        def pull_subscription(subscription, options = { :return_immediately => true, :max_messages => 10 })
+        def pull_subscription(subscription, options = {})
+          defaults = { :return_immediately => true,
+                       :max_messages => 10 }
+          options = defaults.merge(options)
+
           pull_request = ::Google::Apis::PubsubV1::PullRequest.new(
             :return_immediately => options[:return_immediately],
             :max_messages => options[:max_messages]

data/lib/fog/google/shared.rb

@@ -1,3 +1,5 @@
+require "google-cloud-env"
+
 module Fog
   module Google
     module Shared
@@ -14,6 +16,9 @@ module Fog
         @project = project
         @api_version = api_version
         @api_url = base_url + api_version + "/projects/"
+        # google-cloud-env allows us to figure out which GCP runtime we're running in and query metadata
+        # e.g. whether we're running in GCE/GKE/AppEngine or what region the instance is running in
+        @google_cloud_env = ::Google::Cloud::Env.get
       end
 
       ##
@@ -33,14 +38,14 @@ module Fog
       def initialize_google_client(options)
         # NOTE: loaded here to avoid requiring this as a core Fog dependency
         begin
-          # Because of how Google API gem was rewritten, we get to do all sorts
-          # of funky things, like this nonsense.
+          # TODO: google-api-client is in gemspec now, re-assess if this initialization logic is still needed
           require "google/apis/monitoring_#{Fog::Google::Monitoring::GOOGLE_MONITORING_API_VERSION}"
           require "google/apis/compute_#{Fog::Compute::Google::GOOGLE_COMPUTE_API_VERSION}"
           require "google/apis/dns_#{Fog::DNS::Google::GOOGLE_DNS_API_VERSION}"
           require "google/apis/pubsub_#{Fog::Google::Pubsub::GOOGLE_PUBSUB_API_VERSION}"
           require "google/apis/sqladmin_#{Fog::Google::SQL::GOOGLE_SQL_API_VERSION}"
           require "google/apis/storage_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_API_VERSION}"
+          require "google/apis/iamcredentials_#{Fog::Storage::GoogleJSON::GOOGLE_STORAGE_JSON_IAM_API_VERSION}"
           require "googleauth"
         rescue LoadError => error
           Fog::Errors::Error.new("Please install the google-api-client (>= 0.9) gem before using this provider")

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.10.0".freeze
+    VERSION = "1.11.0".freeze
   end
 end

data/lib/fog/storage/google_json.rb

@@ -27,6 +27,10 @@ module Fog
       GOOGLE_STORAGE_JSON_BASE_URL = "https://www.googleapis.com/storage/".freeze
       GOOGLE_STORAGE_BUCKET_BASE_URL = "https://storage.googleapis.com/".freeze
 
+      # Version of IAM API used for blob signing, see Fog::Storage::GoogleJSON::Real#iam_signer
+      GOOGLE_STORAGE_JSON_IAM_API_VERSION = "v1".freeze
+      GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/devstorage.full_control).freeze
+
       # TODO: Come up with a way to only request a subset of permissions.
       # https://cloud.google.com/storage/docs/json_api/v1/how-tos/authorizing
       GOOGLE_STORAGE_JSON_API_SCOPE_URLS = %w(https://www.googleapis.com/auth/devstorage.full_control).freeze

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

@@ -10,11 +10,17 @@ module Fog
         def initialize(options = {})
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
           @client = MockClient.new('test')
+          @storage_json = MockClient.new('test')
+          @iam_service = MockClient.new('test')
         end
 
         def signature(_params)
           "foo"
         end
+
+        def google_access_id
+          "my-account@project.iam.gserviceaccount"
+        end
       end
     end
   end

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

@@ -13,7 +13,14 @@ module Fog
           options[:google_api_scope_url] = GOOGLE_STORAGE_JSON_API_SCOPE_URLS.join(" ")
           @host = options[:host] || "storage.googleapis.com"
 
+          # TODO(temikus): Do we even need this client?
           @client = initialize_google_client(options)
+          # IAM client used for SignBlob API
+          @iam_service = ::Google::Apis::IamcredentialsV1::IAMCredentialsService.new
+          apply_client_options(@iam_service, {
+                                 google_api_scope_url: GOOGLE_STORAGE_JSON_IAM_API_SCOPE_URLS.join(" ")
+                               })
+
           @storage_json = ::Google::Apis::StorageV1::StorageService.new
           apply_client_options(@storage_json, options)
 
@@ -56,12 +63,108 @@ DATA
           canonical_resource.chop!
           string_to_sign << canonical_resource.to_s
 
-          key = OpenSSL::PKey::RSA.new(@client.signing_key)
-          digest = OpenSSL::Digest::SHA256.new
-          signed_string = key.sign(digest, string_to_sign)
+          # TODO(temikus): make signer configurable or add ability to supply your own via lambda
+          if !@storage_json.authorization.signing_key.nil?
+            signed_string = default_signer(string_to_sign)
+          else
+            # If client doesn't contain signing key attempt to auth via IAM SignBlob API
+            signed_string = iam_signer(string_to_sign)
+          end
 
           Base64.encode64(signed_string).chomp!
         end
+
+        private
+
+        def google_access_id
+          @google_access_id ||= get_google_access_id
+        end
+
+        ##
+        # Fetches the google service account name
+        #
+        # @return [String] Service account name, typically needed for GoogleAccessId, e.g.
+        #   my-account@project.iam.gserviceaccount
+        # @raises [Fog::Errors::Error] If authorisation is incorrect or inapplicable for current action
+        def get_google_access_id
+          if @storage_json.authorization.is_a?(::Google::Auth::UserRefreshCredentials)
+            raise Fog::Errors::Error.new("User / Application Default Credentials are not supported for storage"\
+                                         "url signing, please use a service account or metadata authentication.")
+          end
+
+          if !@storage_json.authorization.issuer.nil?
+            return @storage_json.authorization.issuer
+          else
+            get_access_id_from_metadata
+          end
+        end
+
+        ##
+        # Attempts to fetch the google service account name from metadata using Google::Cloud::Env
+        #
+        # @return [String] Service account name, typically needed for GoogleAccessId, e.g.
+        #   my-account@project.iam.gserviceaccount
+        # @raises [Fog::Errors::Error] If Metadata service is not available or returns an invalid response
+        def get_access_id_from_metadata
+          if @google_cloud_env.metadata?
+            access_id = @google_cloud_env.lookup_metadata("instance", "service-accounts/default/email")
+          else
+            raise Fog::Errors::Error.new("Metadata service not available, unable to retrieve service account info.")
+          end
+
+          if access_id.nil?
+            raise Fog::Errors::Error.new("Metadata service found but didn't return data." \
+               "Please file a bug: https://github.com/fog/fog-google")
+          end
+
+          return access_id
+        end
+
+        ##
+        # Default url signer using service account keys
+        #
+        # @param [String] string_to_sign Special collection of headers and options for V2 storage signing, e.g.:
+        #
+        #   StringToSign = HTTP_Verb + "\n" +
+        #                  Content_MD5 + "\n" +
+        #                  Content_Type + "\n" +
+        #                  Expires + "\n" +
+        #                  Canonicalized_Extension_Headers +
+        #                  Canonicalized_Resource
+        #
+        #   See https://cloud.google.com/storage/docs/access-control/signed-urls-v2
+        # @return [String] Signature binary blob
+        def default_signer(string_to_sign)
+          key = OpenSSL::PKey::RSA.new(@storage_json.authorization.signing_key)
+          digest = OpenSSL::Digest::SHA256.new
+          return key.sign(digest, string_to_sign)
+        end
+
+        ##
+        # Fallback URL signer using the IAM SignServiceAccountBlob API, see
+        #   Google::Apis::IamcredentialsV1::IAMCredentialsService#sign_service_account_blob
+        #
+        # @param [String] string_to_sign Special collection of headers and options for V2 storage signing, e.g.:
+        #
+        #   StringToSign = HTTP_Verb + "\n" +
+        #                  Content_MD5 + "\n" +
+        #                  Content_Type + "\n" +
+        #                  Expires + "\n" +
+        #                  Canonicalized_Extension_Headers +
+        #                  Canonicalized_Resource
+        #
+        #   See https://cloud.google.com/storage/docs/access-control/signed-urls-v2
+        # @return [String] Signature binary blob
+        def iam_signer(string_to_sign)
+          request = {
+            "payload": string_to_sign
+          }
+
+          resource = "projects/-/serviceAccounts/#{google_access_id}"
+          response = @iam_service.sign_service_account_blob resource, request, {}
+
+          return response.signed_blob
+        end
       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/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/tasks/changelog.rake

@@ -20,11 +20,18 @@ 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 --oneline`
+  `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/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,7 +23,7 @@ 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 = "db-n1-standard-1".freeze
 TEST_SQL_REGION = TEST_REGION
@@ -87,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/integration/monitoring/test_timeseries.rb

@@ -1,12 +1,11 @@
 require "helpers/integration_test_helper"
-require "retriable"
 
 class TestMetricDescriptors < FogIntegrationTest
-  # Retriable is used to wrap each request in this test due to Stackdriver API being slow with
-  # metric propagation (sometimes 80+ seconds) and client returning
-  # Google::Apis::ClientError: badRequest if the metric hasn't yet been created instead of a 404.
-  RETRIABLE_TRIES = 3
-  RETRIABLE_BASE_INTERVAL = 50
+  # This module has a decent amount of retry wrappers as the Stackdriver API
+  # can be quite slow with metric propagation (sometimes 80+ seconds) and client
+  # returning errors, e.g. Google::Apis::ClientError: badRequest if the metric
+  # hasn't yet been created instead of a 404.
+
   TEST_METRIC_PREFIX = "custom.googleapis.com/fog-google-test/timeseries".freeze
   LABEL_DESCRIPTORS = [
     {
@@ -51,10 +50,7 @@ class TestMetricDescriptors < FogIntegrationTest
     assert_empty(resp.to_h)
 
     # Wait for metric to be created
-    # TODO: Dedup retries into a helper method
-    Retriable.retriable(on: Google::Apis::ClientError,
-                        tries: RETRIABLE_TRIES,
-                        base_interval: RETRIABLE_BASE_INTERVAL) do
+    retry_on(Google::Apis::ClientError) do
       @client.list_timeseries(
           :filter => "metric.type = \"#{metric_type}\"",
           :interval => {
@@ -67,9 +63,7 @@ class TestMetricDescriptors < FogIntegrationTest
       ).time_series
     end
 
-    series = Retriable.retriable(on: Google::Apis::ClientError,
-                                 tries: RETRIABLE_TRIES,
-                                 base_interval: RETRIABLE_BASE_INTERVAL) do
+    series = retry_on(Google::Apis::ClientError) do
       @client.timeseries_collection.all(
         :filter => "metric.type = \"#{metric_type}\"",
         :interval => {
@@ -115,9 +109,7 @@ class TestMetricDescriptors < FogIntegrationTest
       _some_timeseries(start_time, metric_type, labels)
     end
 
-    Retriable.retriable(on: Google::Apis::ServerError,
-                        tries: RETRIABLE_TRIES,
-                        base_interval: RETRIABLE_BASE_INTERVAL) do
+    retry_on(Google::Apis::ServerError) do
       @client.create_timeseries(:timeseries => timeseries)
     end
     interval = {
@@ -132,9 +124,7 @@ class TestMetricDescriptors < FogIntegrationTest
     # Wait for metric to be created
     # Retriable is used instead of wait_for due to API client returning Google::Apis::ClientError: badRequest if the
     # metric hasn't yet been created
-    Retriable.retriable(on: Google::Apis::ClientError,
-                        tries: RETRIABLE_TRIES,
-                        base_interval: RETRIABLE_BASE_INTERVAL) do
+    retry_on(Google::Apis::ClientError) do
       @client.list_timeseries(
         :filter => "metric.type = \"#{metric_type}\"",
         :interval => interval
@@ -142,9 +132,7 @@ class TestMetricDescriptors < FogIntegrationTest
     end
 
     # Test page size
-    resp = Retriable.retriable(on: Google::Apis::ClientError,
-                               tries: RETRIABLE_TRIES,
-                               base_interval: RETRIABLE_BASE_INTERVAL) do
+    resp = retry_on(Google::Apis::ClientError) do
       @client.list_timeseries(
         :filter => "metric.type = \"#{metric_type}\"",
         :interval => interval,
@@ -170,9 +158,7 @@ class TestMetricDescriptors < FogIntegrationTest
            "expected different timeseries when using page_token")
 
     # Test filter
-    series = Retriable.retriable(on: Google::Apis::ClientError,
-                                 tries: RETRIABLE_TRIES,
-                                 base_interval: RETRIABLE_BASE_INTERVAL) do
+    series = retry_on(Google::Apis::ClientError) do
       @client.timeseries_collection.all(
         :filter => %[
           metric.type = "#{metric_type}" AND

data/test/integration/pubsub/test_pubsub_models.rb

@@ -102,7 +102,7 @@ class TestPubsubModels < PubSubShared
                                                 :topic => some_topic_name)
     @client.topics.get(some_topic_name).publish(["data" => message_bytes])
 
-    result = subscription.pull
+    result = subscription.pull(:return_immediately => false)
     assert_operator(result.length, :>, 0)
 
     contained = result.any? { |received| received.message[:data] == message_bytes }
@@ -115,7 +115,7 @@ class TestPubsubModels < PubSubShared
                                                 :topic => some_topic_name)
     @client.topics.get(some_topic_name).publish(["data" => Base64.strict_encode64("some message")])
 
-    result = subscription.pull
+    result = subscription.pull(:return_immediately => false)
     assert_operator(result.length, :>, 0)
 
     subscription.acknowledge([result[0].ack_id])
@@ -127,7 +127,7 @@ class TestPubsubModels < PubSubShared
                                                 :topic => some_topic_name)
     @client.topics.get(some_topic_name).publish(["data" => Base64.strict_encode64("some message")])
 
-    result = subscription.pull
+    result = subscription.pull(:return_immediately => false)
     assert_operator(result.length, :>, 0)
 
     result[0].acknowledge

data/test/integration/pubsub/test_pubsub_requests.rb

@@ -86,7 +86,7 @@ class TestPubsubRequests < PubSubShared
     @client.create_subscription(subscription_name, some_topic_name)
     @client.publish_topic(some_topic_name, [:data => message_bytes])
 
-    result = @client.pull_subscription(subscription_name)
+    result = @client.pull_subscription(subscription_name, {:return_immediately => false})
 
     contained = result.received_messages.any? { |received| received.message.data == message_bytes }
     assert_equal(true, contained, "sent messsage not contained within pulled responses")
@@ -96,7 +96,7 @@ class TestPubsubRequests < PubSubShared
     subscription_name = new_subscription_name
     @client.create_subscription(subscription_name, some_topic_name)
     @client.publish_topic(some_topic_name, [:data => Base64.strict_encode64("some message")])
-    pull_result = @client.pull_subscription(subscription_name)
+    pull_result = @client.pull_subscription(subscription_name, {:return_immediately => false})
     assert_operator(pull_result.received_messages.length, :>, 0)
 
     @client.acknowledge_subscription(subscription_name,

data/test/integration/sql/test_certs.rb

@@ -1,6 +1,5 @@
 require "helpers/integration_test_helper"
 require "integration/factories/sql_certs_factory"
-require "pry"
 
 class TestSQLCerts < FogIntegrationTest
   # This test doesn't include TestCollection as certs are not an independent resource.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -73,6 +73,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.34'
+- !ruby/object:Gem::Dependency
+  name: google-cloud-env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement