cloudformation-tool 1.5.15 → 1.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f485059a283b0a34a74ac687c52fe01b6d9522616cc00beb572b46e9a13e1d
-  data.tar.gz: 9533caf5496a471432cadfbf007dd20a6789829d353642538052bde818ed6bfe
+  metadata.gz: cda5830569bb0452c460ca5751f58071594e3a8752662676364a8c7360035dff
+  data.tar.gz: 1677f34f4acdc68bf0e7b7870e39f56d8efa351e2d734364ca69ff5c9c74780c
 SHA512:
-  metadata.gz: cdd70a1186411fa08ddca90d687c53ad4d5113d503fd02068e6b84e63a3080a11d4dfc9e58f6a8231a90d05ef4ddb5212ece90cae208562a4caef2d54d1eb42c
-  data.tar.gz: f1d758e208b657d5f8e829e4e1dd079850ec4eaa8c1a9593ed09036da9cfe91fc5447edb305d6ed68005a3eda5f2e43df37c7ed4678b03ec8cac745e321af5eb
+  metadata.gz: bd0fc20ae3e89881114581d638b304b137fc9064d362cf6746143df6931db2a91e95898a20ece7061c07ca78d963f279186c1f17012bcef7672612e1b14700bb
+  data.tar.gz: f22e1e4ffb42bfbfb043625c291ab997b0e8fae5adbffa327160dd4400390837b65e57d57859f6b7c0b849ae3c3a5b9f1873bf99343ae4b90bb66b13d6c6adcd

data/lib/cloud_formation_tool/storable.rb

@@ -15,12 +15,15 @@ module CloudFormationTool
     end
     
     def cached_object(md5)
-      Aws::S3::Bucket.new(s3_bucket_name(region), client: awss3(region)).objects(prefix: "cf-compiled/#{md5[0]}/#{md5[1..2]}/#{md5}/").first
+      Aws::S3::Bucket.new(s3_bucket_name(region), client: awss3(region)).objects(prefix: prefix(md5)).first
+    end
+    
+    def prefix(md5)
+      "cf-compiled/#{md5[0]}/#{md5[1..2]}/#{md5}/"
     end
     
     def upload(path, content, mime_type: 'text/yaml', gzip: true)
       md5 = Digest::MD5.hexdigest content
-      prefix = "#{md5[0]}/#{md5[1..2]}/#{md5}"
       b = Aws::S3::Bucket.new(s3_bucket_name(region), client: awss3(region))
       # return early if we already have a copy of this object stored.
       # if this object was previously uploaded, we use its URLs (and not, for example,
@@ -30,7 +33,7 @@ module CloudFormationTool
       o = cached_object(md5)
       if o.nil?
         # no such luck, we need to actually upload the file
-        o = b.object("cf-compiled/#{prefix}/#{path}")
+        o = b.object(prefix(md5) + path)
         file_opts = {
           acl: 'public-read',
           body: content,
@@ -38,6 +41,11 @@ module CloudFormationTool
           content_type: mime_type,
           storage_class: 'REDUCED_REDUNDANCY'
         }
+        ownctl = b.client.get_bucket_ownership_controls(bucket: b.name).ownership_controls
+        if ownctl.rules.first.object_ownership == 'BucketOwnerEnforced' then
+          # no point in setting ACL
+          file_opts.delete :acl
+        end
         file_opts.merge!({content_encoding: 'gzip'}) if gzip
         debug "Uploading S3 object s3://#{b.name}/#{o.key}"
         o.put(file_opts)

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.5.15'
+  VERSION = '1.5.17'
 end

data/lib/cloud_formation_tool.rb

@@ -15,7 +15,7 @@ def log(message = nil, &block)
   end)
 end
 
-def debug(message = nul, &block)
+def debug(message = nil, &block)
   logger.debug(if message.nil?
     yield
   else
@@ -23,7 +23,7 @@ def debug(message = nul, &block)
   end)
 end
 
-def warn(message = nul, &block)
+def warn(message = nil, &block)
   logger.warn(if message.nil?
     yield
   else
@@ -31,7 +31,7 @@ def warn(message = nul, &block)
   end)
 end
 
-def error(message = nul, &block)
+def error(message = nil, &block)
   logger.error(if message.nil?
     yield
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.17
 platform: ruby
 authors:
 - Oded Arbel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates