cloudformation-tool 1.5.14 → 1.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9db3672b97a22828e57d6c906a78831153a620bca1632f9f9748f72e27c9db7
-  data.tar.gz: ad0eca7cc6ae46eaf3b0a55c57fd8e85695a27b8c97f71e55492e0a95bd208d2
+  metadata.gz: 3e8d4a5cbf8e7c4507df05dc594406e66b3cb4ee6b0879dbec0b5773a0b560da
+  data.tar.gz: 4ecf077524e906ccf844b83afe9e19d98ba1a41d223987c0cc3fdb3a96fea3ac
 SHA512:
-  metadata.gz: 0452d98f9e5426f6924cc8caf53430b8936fc9ac38187abda7ff9d780cf921330f0f85b592cab7be9b26918e3f54585892e61548e747721dfc46973ec64e04aa
-  data.tar.gz: 6d50f5dd121f968799fd5754a6f54726cd0c64925ce9bd79a27f4360ee710c65a914fc36f3d740536664c4ffc1c1a03b5f055c21848deb2e976900c3f2060dc1
+  metadata.gz: 1a10a4d380dbab3d0e3c152fae9877d66872fa1cda68c493826342a59a629b4bc325dfd6abc6cd24e0c64b5064d10d60edba683152e6c0517c5587a6fe1e8010
+  data.tar.gz: ea96dc4874e8a2e8564927ec5c335a3077c2e3ea9417f170aa8f20f17f91b6c2e0bbee69091783a7a6b81a13a76be1e467d6718a247f33f6ff12926ac3c6479a

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -102,50 +102,36 @@ module CloudFormationTool
           # some categories are meta-data that we can ignore from includes
           next if %w(AWSTemplateFormatVersion Description).include? category
           
-          case category
-          when "Parameters"
-            (@data[category]||={}).each do |name, param|
-              if catdata.has_key? name
-                next if param['Default'] == catdata[name]['Default']
-                 
-                if catdata[name].has_key?('Override') and catdata[name]['Override'] == false
-                  catdata.delete(name)
-                else
-                  newname = "#{cfile_key}z#{name}"
-                  log "Rewriting conflicting parameter #{name} (='#{catdata[name]['Default']}') to #{newname}"
-                  catdata[newname] = catdata.delete name
-                  rewrites[name] = newname
-                end
-              else
-                @data[category][name] = param
-              end
+          if category == "Parameters"
+            rewriteParameters catdata, cfile_key, rewrites
+            @data["Parameters"].merge! catdata
+            next
+          end
+          
+          case catdata
+          when Hash
+            # warn against duplicate entities, resources or outputs
+            (@data[category] ||= {}).keys.each do |key|
+              if catdata.has_key? key
+                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - duplicate '#{category}' item: #{key}"
+              end 
+            end
+            catdata = fixrefs(catdata, rewrites)
+            # add included properties
+            @data[category].merge! catdata
+          when Array
+            if @data[category].nil?
+              @data[category] = catdata
+            elsif @data[category].is_a? Array
+              @data[category] += catdata
+            else
+              raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - conflicting types for '#{category}'"
             end
           else
-            case catdata
-            when Hash
-              # warn against duplicate entities, resources or outputs
-              (@data[category] ||= {}).keys.each do |key|
-                if catdata.has_key? key
-                  raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - duplicate '#{category}' item: #{key}"
-                end 
-              end
-              catdata = fixrefs(catdata, rewrites)
-              # add included properties
-              @data[category].merge! catdata
-            when Array
-              if @data[category].nil?
-                @data[category] = catdata
-              elsif @data[category].is_a? Array
-                @data[category] += catdata
-              else
-                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - conflicting types for '#{category}'"
-              end
+            if @data[category].nil?
+              @data[category] = catdata
             else
-              if @data[category].nil?
-                @data[category] = catdata
-              else
-                raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - I do not know how to merge non-list non-dictionary '#{category}'!"
-              end
+              raise CloudFormationTool::Errors::AppError, "Error compiling #{path} - I do not know how to merge non-list non-dictionary '#{category}'!"
             end
           end
           
@@ -153,6 +139,27 @@ module CloudFormationTool
       end
     end
     
+    def rewriteParameters data, key, rewrites
+      (@data["Parameters"]||={}).each do |name, param|
+        unless data.has_key? name
+          @data["Parameters"][name] = param
+          next
+        end
+        
+        next if param['Default'] == data[name]['Default']
+        
+        if data[name].has_key?('Override') and data[name]['Override'] == false
+          data.delete(name)
+          next
+        end
+        
+        newname = "#{key}z#{name}"
+        log "Rewriting conflicting parameter #{name} (='#{data[name]['Default']}') to #{newname}"
+        data[newname] = data.delete name
+        rewrites[name] = newname
+      end
+    end
+    
     def resolveVal(value)
       case value
       when Hash

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.14'
+  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.14
+  version: 1.5.16
 platform: ruby
 authors:
 - Oded Arbel
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-10 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: []