fog-google 1.26.0 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5f068b5166ef1e1c12d9bef6ae6da15c489df03929d86047709ef19c3dd70e9
-  data.tar.gz: 4e94f5cfb3be3fec06535efd74368720b42c37537ea8ffcf2c42888b68bcf283
+  metadata.gz: 324898488d484b7d2bf5e875ebe152c545607044090f4786941f8106754b4433
+  data.tar.gz: ae49e89d5e42127efde49e52340e751e1c075f100fe19b03e5bc3c88399a2e99
 SHA512:
-  metadata.gz: 7fed398133b6232a92ada212c143d65228dbb3a0d6c49b1842256ef79b1fea2a2bf9add46947459d2afb4b3df4f69fb74b49bfe14f0a6459cceab7adb4518ae1
-  data.tar.gz: 53397624bfcdb357853bba55725c9c60336c734fe0ecb81f812cabed0945cb9009b93b2d3b6ff04e3673082ebee82d1fdda647f55631dced3f27673a8f6f1430
+  metadata.gz: 56f151cbc7b3b170b90537b26410517f29c769ca6168fbc16bdd9937e89bfc44c315da223cf7dfae916775626c985b67db07c9e15aacfcb8e6a69d8f082a23b3
+  data.tar.gz: 3a44a91f409c99d4caa368bc6d8f30e131f6cb566e66926b9bec27a9a25aa4b453b2bb27a5526f1420553a06caa569520712962fd8011d842f82bc2ab1926201

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

@@ -42,7 +42,7 @@ jobs:
       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

@@ -42,7 +42,7 @@ jobs:
       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

@@ -42,7 +42,7 @@ jobs:
       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

@@ -41,7 +41,7 @@ jobs:
       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

@@ -42,7 +42,7 @@ jobs:
       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

@@ -42,7 +42,7 @@ jobs:
       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

@@ -42,7 +42,7 @@ jobs:
       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

@@ -43,7 +43,7 @@ jobs:
       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

@@ -19,7 +19,7 @@ jobs:
         ruby-version: [ '3.0', '3.1', '3.2', '3.3', '3.4', '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,19 @@ 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
+
+### 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,7 +38,7 @@ 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"

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/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.26.0".freeze
+    VERSION = "1.27.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.27.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