fog-google 1.26.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f068b5166ef1e1c12d9bef6ae6da15c489df03929d86047709ef19c3dd70e9
-  data.tar.gz: 4e94f5cfb3be3fec06535efd74368720b42c37537ea8ffcf2c42888b68bcf283
+  metadata.gz: 95b0e848747f0ed4dd7665ba1523d660f267c7ede2810bfbe30190b53114c3ad
+  data.tar.gz: 90dfb38e1c8aea6c4b1de0d1aa51d1c99d1f6e815fdf09dd5a1b038ff03285aa
 SHA512:
-  metadata.gz: 7fed398133b6232a92ada212c143d65228dbb3a0d6c49b1842256ef79b1fea2a2bf9add46947459d2afb4b3df4f69fb74b49bfe14f0a6459cceab7adb4518ae1
-  data.tar.gz: 53397624bfcdb357853bba55725c9c60336c734fe0ecb81f812cabed0945cb9009b93b2d3b6ff04e3673082ebee82d1fdda647f55631dced3f27673a8f6f1430
+  metadata.gz: 70382c3cace88299b0680f2af237772be7f52b2635ef2393af6bff26efe2c1bf5fe70d9b47a1e090e497982115908acf8de83ff517ced7e008993f305461dbb9
+  data.tar.gz: cdb4dfda4e275c2b693a5b370cdb2b4d1171ee0217c90832e243111a56106ff7300856eee404aba46c2047c278600e2a3cc5f6c5b2f80f0a4f0fce5ae5960de6

data/.github/workflows/integration-compute-core.yml

@@ -36,13 +36,13 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       # TODO(fog-google#626): remove this once cleanup is fixed
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-instance_groups.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-loadbalancing.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-compute-networking.yml

@@ -36,12 +36,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-monitoring.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-pubsub.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-sql.yml

@@ -37,12 +37,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/integration-storage.yml

@@ -38,12 +38,12 @@ jobs:
     runs-on: fog-arc-runner
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4' ]
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0' ]
       # Integration tests from the same task cannot run in parallel yet due to cleanup
       max-parallel: 1
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/unit.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4', 'head', 'truffleruby-head']
+        ruby-version: [ '3.1', '3.2', '3.3', '3.4', '4.0', 'head', 'truffleruby-head']
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -4,6 +4,29 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 1.27.0
+
+### User-facing
+
+- #650 add support for custom storage endpoints
+
+### Fixed
+
+### Development changes
+
+## 1.27.0
+
+### User-facing
+
+### Fixed
+
+- #648 raise exception if disk quota exceeded [rchekaluk]
+
+### Development changes
+
+- #647 bump actions/checkout from 5 to 6 [dependabot]
+- #649 bump pry from = 0.15.2 to = 0.16.0 [dependabot]
+
 ## 1.26.0
 
 ### User-facing

data/fog-google.gemspec

@@ -38,12 +38,13 @@ Gem::Specification.new do |spec|
   # Debugger
   # Locked because pry-byebug is broken with 13+
   # see: https://github.com/deivid-rodriguez/pry-byebug/issues/343
-  spec.add_development_dependency "pry", "= 0.15.2"
+  spec.add_development_dependency "pry", "= 0.16.0"
 
   # Testing gems
   spec.add_development_dependency "retriable"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "minitest-mock"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "shindo"
   spec.add_development_dependency "vcr"

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

@@ -55,6 +55,17 @@ module Fog
           operation = Fog::Google::Compute::Operations.new(service: service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? }
+
+          # Handle errors
+          if operation.error?
+            msg = "Error creating disk #{name} size #{size_gb}."
+
+            err = operation.primary_error
+            msg = "#{msg} #{err.message_pretty}" unless err.nil?
+
+            raise Fog::Errors::Error.new(msg)
+          end
+
           reload
         end
 

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

@@ -26,6 +26,82 @@ module Fog
         attribute :warnings
         attribute :zone
 
+
+        # {:errors=>
+        #   [{:code=>"QUOTA_EXCEEDED",
+        #     :error_details=>
+        #      [{:quota_info=>
+        #         {:dimensions=>{:region=>"us-east4"},
+        #          :limit=>500,
+        #          :limit_name=>"SSD-TOTAL-GB-per-project-region",
+        #          :metric_name=>"compute.googleapis.com/ssd_total_storage"}}],
+        #     :message=>"Quota 'SSD_TOTAL_GB' exceeded.  Limit: 500.0 in region us-east4."}
+        #   ]
+        # }
+        class ErrorInfo
+          attr_accessor :code
+          attr_accessor :error_details
+          attr_accessor :location
+          attr_accessor :message
+
+          def initialize(attributes = {})
+            @code          = attributes[:code]
+            @error_details = attributes[:error_details]
+            @location      = attributes[:location]
+            @message       = attributes[:message]
+          end
+
+          def message_pretty
+            message
+          end
+        end  # ErrorInfo
+
+        class QuotaInfo < ErrorInfo
+          def initialize(attributes = {})
+            code = attributes[:code]
+            raise Fog::Errors::Error.new("Invalid error code: #{code}") if code != "QUOTA_EXCEEDED"
+
+            super(attributes)
+          end
+
+          def quota_infos
+            return [] unless error_details.is_a?(Array)
+
+            error_details_quota_infos = error_details.select{|ed| ed.is_a?(Hash) && ed.has_key?(:quota_info)}
+            error_details_quota_infos.map{|ed| ed[:quota_info]}
+          end
+
+          def message_pretty
+            msg = super.gsub(/\s*Limit.*region.*[^.]+./, "")
+
+            quota_infos.each do |qi|
+              dimensions = qi[:dimensions]  if qi.is_a?(Hash)
+              limit      = qi[:limit]       if qi.is_a?(Hash)
+              metric     = qi[:metric_name] if qi.is_a?(Hash)
+
+              region = dimensions[:region] if dimensions.is_a?(Hash)
+
+              limit_msg = "  Limit: #{limit.to_f}"           if limit.is_a?(Numeric)
+              limit_msg = "#{limit_msg} #{metric}"           if limit_msg && metric
+              limit_msg = "#{limit_msg} in region #{region}" if limit_msg && region.is_a?(String)
+              limit_msg = "#{limit_msg}."                    if limit_msg
+
+              msg = "#{msg}#{limit_msg}"
+            end
+
+            msg
+          end
+        end  # QuotaInfo
+
+
+        def error?
+          ! error.nil?
+        end
+
+        def errors
+          error? ? error[:errors] : nil
+        end
+
         def ready?
           status == DONE_STATE
         end
@@ -42,6 +118,35 @@ module Fog
           zone.nil? ? nil : zone.split("/")[-1]
         end
 
+        def error_info_class(code)
+          case code
+            when "QUOTA_EXCEEDED" then QuotaInfo
+            else
+              ErrorInfo
+          end
+        end
+
+        # Returns an array of ErrorInfo objects derived from the raw error hash.
+        def error_infos
+          return [] unless error.is_a?(Hash)
+          return [] unless errors.is_a?(Array)
+
+          errors.map do |err|
+            klass = error_info_class(err[:code])
+            klass.new(
+              code:          err[:code],
+              message:       err[:message],
+              location:      err[:location],
+              error_details: err[:error_details]
+            )
+          end
+        end
+
+        # Convenience helper: return the first error (most Google APIs provide only one).
+        def primary_error
+          error_infos.first
+        end
+
         def destroy
           requires :identity
 

data/lib/fog/google/storage/storage_json/mock.rb

@@ -9,6 +9,7 @@ module Fog
 
         def initialize(options = {})
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          @options = options.dup
           @client = MockClient.new('test')
           @storage_json = MockClient.new('test')
           @iam_service = MockClient.new('test')
@@ -18,6 +19,14 @@ module Fog
           "foo"
         end
 
+        def bucket_base_url
+          if @options[:google_json_root_url]
+            @options[:google_json_root_url]
+          else
+            GOOGLE_STORAGE_BUCKET_BASE_URL
+          end
+        end
+
         def google_access_id
           "my-account@project.iam.gserviceaccount"
         end

data/lib/fog/google/storage/storage_json/models/directory.rb

@@ -47,7 +47,7 @@ module Fog
 
         def public_url
           requires :key
-          "#{GOOGLE_STORAGE_BUCKET_BASE_URL}#{key}"
+          "#{service.bucket_base_url}#{key}"
         end
 
         def save

data/lib/fog/google/storage/storage_json/models/file.rb

@@ -97,7 +97,7 @@ module Fog
 
         def public_url
           requires :directory, :key
-          "https://storage.googleapis.com/#{directory.key}/#{key}"
+          "#{service.bucket_base_url}#{directory.key}/#{key}"
         end
 
         FILE_INSERTABLE_FIELDS = %i(

data/lib/fog/google/storage/storage_json/real.rb

@@ -11,15 +11,16 @@ module Fog
         attr_reader :storage_json
 
         def initialize(options = {})
-          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, GOOGLE_STORAGE_JSON_BASE_URL)
+          base_url = options[:google_json_root_url] || GOOGLE_STORAGE_JSON_BASE_URL
+          shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, base_url)
           @options = options.dup
           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)
 
           @storage_json = ::Google::Apis::StorageV1::StorageService.new
+          @storage_json.root_url = base_url if options[:google_json_root_url]
           apply_client_options(@storage_json, options)
 
           @storage_json.client_options.open_timeout_sec = options[:open_timeout_sec] if options[:open_timeout_sec]
@@ -27,6 +28,14 @@ module Fog
           @storage_json.client_options.send_timeout_sec = options[:send_timeout_sec] if options[:send_timeout_sec]
         end
 
+        def bucket_base_url
+          if @options[:google_json_root_url]
+            @options[:google_json_root_url]
+          else
+            GOOGLE_STORAGE_BUCKET_BASE_URL
+          end
+        end
+
         def signature(params)
           string_to_sign = <<-DATA
 #{params[:method]}

data/lib/fog/google/storage/storage_json.rb

@@ -17,6 +17,7 @@ module Fog
         :google_key_string,
         :google_json_key_location,
         :google_json_key_string,
+        :google_json_root_url,
         :open_timeout_sec,
         :read_timeout_sec,
         :send_timeout_sec

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.26.0".freeze
+    VERSION = "1.28.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.28.0
 platform: ruby
 authors:
 - Nat Welch
@@ -196,14 +196,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement