From 07f5c7c2ae1ae81d536738bb2d37d8139215e08c Mon Sep 17 00:00:00 2001 From: Colton Jenkins Date: Mon, 7 Aug 2023 09:56:52 -0400 Subject: [PATCH] Add uniform attr to inserting file --- lib/fog/storage/google_json/models/file.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/fog/storage/google_json/models/file.rb b/lib/fog/storage/google_json/models/file.rb index 870b2e4de..c40e84dd2 100644 --- a/lib/fog/storage/google_json/models/file.rb +++ b/lib/fog/storage/google_json/models/file.rb @@ -5,6 +5,7 @@ class File < Fog::Model identity :key, :aliases => ["Key", :name] attribute :acl + attribute :uniform attribute :predefined_acl, :aliases => ["predefinedAcl", :predefined_acl] attribute :cache_control, :aliases => ["cacheControl", :cache_control] attribute :content_disposition, :aliases => ["contentDisposition", :content_disposition] @@ -37,6 +38,10 @@ class File < Fog::Model "publicReadWrite" ].freeze + def uniform=(enable) + @uniform=enable + end + def predefined_acl=(new_predefined_acl) unless VALID_PREDEFINED_ACLS.include?(new_predefined_acl) raise ArgumentError.new("acl must be one of [#{VALID_PREDEFINED_ACLS.join(', ')}]") @@ -111,8 +116,8 @@ def save FILE_INSERTABLE_FIELDS.map { |k| [k, attributes[k]] } .reject { |pair| pair[1].nil? } ] - - options[:predefined_acl] ||= @predefined_acl + + options[:predefined_acl] ||= @predefined_acl unless @uniform service.put_object(directory.key, key, body, **options) self.content_length = Fog::Storage.get_body_size(body)