fog-google 1.29.1 → 1.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b906fc99a99a411080813fa3b393740485e4e9f135be7770dc2ae9d561999755
-  data.tar.gz: 631201184861b22cc6d80c89328747df129b3f4a8ee5b9b02887ed0bc7879868
+  metadata.gz: 12c7082ca48590c6f6e1cf40defabfd59cc125e675dc5ca7dbb95f0ccec0fcfd
+  data.tar.gz: d97c7139e7c73e801d549062072dc6b87641de2090080f3a053a7a9aeb8cd0dd
 SHA512:
-  metadata.gz: a5e4728aa283c129d71622823ec3314110be7879a2d29a420fbc0d2f9ec998ab8005a663bf8cbbcc9949ff09e7613c538612aaa3f2f226de5e4e370bdb44116e
-  data.tar.gz: 0feb92378a91ac6d133e042537b3084a376af760a8cdcb655273eb3326a2a28b9d584b66414a5f0227a3563d0b581957fb0603952ff2ae7dccec636e96217100
+  metadata.gz: ed382c3164e2d4310fd349c8273a82b0cef46248eac34a30055ff6c81c5089d7b5ef33a95da4e91d3580ae0830ab7558b94e949f41487bfe3ee4b060777d813d
+  data.tar.gz: ce7e5bb93b47e6edda9c21e51a872de0fca7a91c165cb64b27e9065838e13efdebe6553f1f1fb311bb104e248b5217aef43114311be000eff82625eff55c2361

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.29.2
+
+- #654 Fix missing host attribute and update storage XML driver to support universe domains
+
 ## 1.29.1
 
 ### User-facing

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

@@ -7,10 +7,16 @@ module Fog
 
         MockClient = Struct.new(:issuer)
 
+        attr_reader :host
+
         def initialize(options = {})
           @options = options.dup
           api_base_url = storage_api_base_url_for_universe(universe_domain)
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, api_base_url)
+
+          # Set @host for compatibility with request methods (e.g., get_object_https_url)
+          @host = storage_host_for_universe(universe_domain)
+
           @client = MockClient.new('test')
           @storage_json = MockClient.new('test')
           @iam_service = MockClient.new('test')

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

@@ -7,7 +7,7 @@ module Fog
         include Utils
         include Fog::Google::Shared
 
-        attr_accessor :client
+        attr_accessor :client, :host
         attr_reader :storage_json
 
         def initialize(options = {})
@@ -16,6 +16,9 @@ module Fog
           shared_initialize(options[:google_project], GOOGLE_STORAGE_JSON_API_VERSION, api_base_url)
           options[:google_api_scope_url] = GOOGLE_STORAGE_JSON_API_SCOPE_URLS.join(" ")
 
+          # Set @host for compatibility with request methods (e.g., get_object_https_url)
+          @host = storage_host_for_universe(universe_domain)
+
           # TODO(temikus): Do we even need this client?
           @client = initialize_google_client(options)
 

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

@@ -28,13 +28,12 @@ module Fog
           end
         end
 
+        def storage_host_for_universe(universe_domain)
+          Fog::Google::Storage::Utils.storage_host_for_universe(universe_domain)
+        end
+
         def storage_base_url_for_universe(universe_domain)
-          domain = universe_domain.to_s.strip
-          if !domain.empty?
-            "https://storage.#{universe_domain}/"
-          else
-            Fog::Google::StorageJSON::GOOGLE_STORAGE_BUCKET_BASE_URL
-          end
+          "https://#{storage_host_for_universe(universe_domain)}/"
         end
 
         private

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

@@ -83,6 +83,7 @@ module Fog
 
         def initialize(options = {})
           @google_storage_access_key_id = options[:google_storage_access_key_id]
+          @host = storage_host_for_universe(options[:universe_domain])
         end
 
         def data
@@ -96,6 +97,8 @@ module Fog
         def signature(_params)
           "foo"
         end
+
+        attr_reader :host
       end
     end
   end

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

@@ -28,7 +28,7 @@ module Fog
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]
           @connection_options = options[:connection_options] || {}
           @hmac = Fog::HMAC.new("sha1", @google_storage_secret_access_key)
-          @host = options[:host] || "storage.googleapis.com"
+          @host = storage_host_for_universe(options[:universe_domain])
           @persistent = options.fetch(:persistent, true)
           @port       = options[:port] || 443
           @scheme     = options[:scheme] || "https"

data/lib/fog/google/storage/storage_xml/utils.rb

@@ -28,6 +28,10 @@ module Fog
           https_url(params, expires)
         end
 
+        def storage_host_for_universe(universe_domain)
+          Fog::Google::Storage::Utils.storage_host_for_universe(universe_domain)
+        end
+
         private
 
         def host_path_query(params, expires)

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

@@ -6,7 +6,7 @@ module Fog
       autoload :Utils, "fog/google/storage/storage_xml/utils"
 
       requires :google_storage_access_key_id, :google_storage_secret_access_key
-      recognizes :host, :port, :scheme, :persistent, :path_style
+      recognizes :port, :scheme, :persistent, :path_style, :universe_domain
 
       model_path "fog/google/storage/storage_xml/models"
       collection :directories

data/lib/fog/google/storage.rb

@@ -1,6 +1,20 @@
 module Fog
   module Google
     class Storage < Fog::Service
+      GOOGLE_STORAGE_HOST = "storage.googleapis.com".freeze
+
+      # Shared utilities for both JSON and XML storage implementations
+      module Utils
+        def self.storage_host_for_universe(universe_domain)
+          domain = universe_domain.to_s.strip
+          if !domain.empty? && domain != "googleapis.com"
+            "storage.#{domain}"
+          else
+            GOOGLE_STORAGE_HOST
+          end
+        end
+      end
+
       def self.new(options = {})
         begin
           fog_creds = Fog.credentials

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.29.1".freeze
+    VERSION = "1.29.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.29.1
+  version: 1.29.2
 platform: ruby
 authors:
 - Nat Welch