cloudformation-tool 1.5.15 → 1.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32f485059a283b0a34a74ac687c52fe01b6d9522616cc00beb572b46e9a13e1d
-  data.tar.gz: 9533caf5496a471432cadfbf007dd20a6789829d353642538052bde818ed6bfe
+  metadata.gz: 3e8d4a5cbf8e7c4507df05dc594406e66b3cb4ee6b0879dbec0b5773a0b560da
+  data.tar.gz: 4ecf077524e906ccf844b83afe9e19d98ba1a41d223987c0cc3fdb3a96fea3ac
 SHA512:
-  metadata.gz: cdd70a1186411fa08ddca90d687c53ad4d5113d503fd02068e6b84e63a3080a11d4dfc9e58f6a8231a90d05ef4ddb5212ece90cae208562a4caef2d54d1eb42c
-  data.tar.gz: f1d758e208b657d5f8e829e4e1dd079850ec4eaa8c1a9593ed09036da9cfe91fc5447edb305d6ed68005a3eda5f2e43df37c7ed4678b03ec8cac745e321af5eb
+  metadata.gz: 1a10a4d380dbab3d0e3c152fae9877d66872fa1cda68c493826342a59a629b4bc325dfd6abc6cd24e0c64b5064d10d60edba683152e6c0517c5587a6fe1e8010
+  data.tar.gz: ea96dc4874e8a2e8564927ec5c335a3077c2e3ea9417f170aa8f20f17f91b6c2e0bbee69091783a7a6b81a13a76be1e467d6718a247f33f6ff12926ac3c6479a

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.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.16
 platform: ruby
 authors:
 - Oded Arbel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-11 00:00:00.000000000 Z
+date: 2024-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,7 +164,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: oded.arbel@greenfieldtech.net
 executables:
 - cftool
@@ -207,7 +207,7 @@ homepage: http://github.com/GreenfieldTech/cloudformation-tool
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +222,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates
 test_files: []