mkstack 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156c6f1b2ce583f7723c9943105e5a56b27959cad2dcd3cab914065806d5371b
-  data.tar.gz: d994eee79d71b74e2a635059ed1a4ba47cf93d518e3606421a567f6b92bd53ff
+  metadata.gz: 76379b662cf2153c5c04bccd63e19388a6b9bbf34f0ae124ad4c052d0b58e6ce
+  data.tar.gz: ed67ba1d7d95e334ce57b57565b4eee3e0b54b65d18e7dbd5ac9dfbe14dbd416
 SHA512:
-  metadata.gz: ab4040c5feb8d08e926c58c36ffc9c6f7f70f17c433992cfbb4b227cabf03802ad1f0139fde972847037bf466877f5d6a212f44136e4aa7709135345c7c34550
-  data.tar.gz: f09c970148652460c653672016f60f97feae0df146fa487be7d942ea7f98a8470ed4af47467b864b020bc19d0ef42df65295377cc0ee61bf0aa0563e6cb6f61b
+  metadata.gz: a595736d490a9d07e7b66188ed3a6e2932d7964665cb281759433558b3dade38e9d3c434c4c82253ecf661bb2fc2db0284a13ab9416154c28f7db7a447e56d4f
+  data.tar.gz: da21b87d8ef7d38102198951469ab7e7a1d98f20888677a12994efa785a5ec734f2f147861ad96a77a84cdaf8f599bb739945a06784ddb79111ec9fb5e3a7bc1

data/bin/mkstack

@@ -4,7 +4,7 @@ require "logger"
 require "optparse"
 require_relative "../lib/mkstack"
 
-version = "1.2.0"
+version = "1.3.1"
 
 
 ##################################################
@@ -14,7 +14,11 @@ version = "1.2.0"
 $logger = Logger.new(STDERR)
 $logger.level = Logger::WARN
 $logger.formatter = proc { |s, d, p, m|
-  "[%s] %5s [%5s] - %s\n" % [ d.strftime("%Y-%m-%d %H:%M:%S"), s, caller(4, 1).first.split(":")[1], m ]
+  x = caller(4, 1)[0]
+  line = x.split(':')[1]
+  file = x.split(':')[0].split('/')[-1]
+  func = x.split("'")[-1]
+  "[%s] %5s [%-12s] [%4d] %s: %s\n" % [ d.strftime("%Y-%m-%d %H:%M:%S"), s, file, line, func, m ]
 }
 
 # Default options
@@ -110,8 +114,14 @@ end
 
 # Save template
 if options[:save] then
+  $logger.debug { "saving #{options[:save]}" }
+
   begin
-    $stdout = File.new(options[:save], File::CREAT | File::WRONLY) unless options[:save] == "-"
+    unless options[:save] == '-'
+      f = File.new(options[:save], File::CREAT | File::WRONLY)
+      f.truncate(0)
+      $stdout = f
+    end
 
     $logger.info { "Saving #{template.format} to #{$stdout.path}" } unless $stdout == STDOUT
 

data/lib/mkstack/section.rb

@@ -17,9 +17,16 @@ module MkStack
 
     # Merge or override a section snippet
     def merge(contents)
-      raise TypeError.new("#{contents.class} != #{@contents.class}") if contents.class != @contents.class
-
+      # Hashes get merged
       return @contents.merge!(contents) if @contents.respond_to?(:merge!)
+
+      # Arrays get concatenated or pushed
+      if @contents.respond_to?(:push)
+        return @contents.concat(contents) if contents.respond_to?(:push)
+        return @contents.push(contents)
+      end
+
+      # Strings get copied
       @contents = contents
     end
 

data/lib/mkstack/template.rb

@@ -1,8 +1,8 @@
-require_relative "section"
+require_relative 'section'
 
-require "erb"
-require "json"
-require "yaml"
+require 'erb'
+require 'json'
+require 'yaml'
 
 module MkStack
   ##################################################
@@ -14,7 +14,6 @@ module MkStack
   # just the value.
   #
   # Loading a YAML file will force the output to be in YAML format.
-
   class IntrinsicShort
     def init_with(coder)
       @coder = coder
@@ -34,22 +33,23 @@ module MkStack
   class Template
     attr_reader :sections, :limit, :format
 
-    def initialize(format = "json", argv = nil)
+    def initialize(format = 'json', argv = nil)
       @format = format
 
       @sections = {
-        "AWSTemplateFormatVersion" => Section.new("AWSTemplateFormatVersion", String, nil),
-        "Description" => Section.new("Description", String, 1024),
-
-        "Conditions" => Section.new("Conditions", Hash, nil),
-        "Mappings"   => Section.new("Mappings",   Hash, 200),
-        "Metadata"   => Section.new("Metadata",   Hash, nil),
-        "Outputs"    => Section.new("Outputs",    Hash, 200),
-        "Parameters" => Section.new("Parameters", Hash, 200),
-        "Resources"  => Section.new("Resources",  Hash, 500),
-        "Transform"  => Section.new("Transform",  Hash, nil),
+        'AWSTemplateFormatVersion' => Section.new('AWSTemplateFormatVersion', String, nil),
+        'Description' => Section.new('Description', String, 1024),
+
+        'Conditions' => Section.new('Conditions', Hash,  nil),
+        'Mappings'   => Section.new('Mappings',   Hash,  200),
+        'Metadata'   => Section.new('Metadata',   Hash,  nil),
+        'Outputs'    => Section.new('Outputs',    Hash,  200),
+        'Parameters' => Section.new('Parameters', Hash,  200),
+        'Resources'  => Section.new('Resources',  Hash,  500),
+        'Transform'  => Section.new('Transform',  Array, nil),
+        'Rules'      => Section.new('Rules',      Hash,  nil),
       }
-      @limit = 51200
+      @limit = 51_200
 
       # Keep track of parsed files to avoid loops
       @parsed = {}
@@ -61,13 +61,19 @@ module MkStack
     end
 
     # Shorthand accessor for template sections
-    def [](section); @sections[section]; end
+    def [](section)
+      @sections[section]
+    end
 
     # Return the length of the entire template
-    def length; to_json.to_s.length; end
+    def length
+      to_json.to_s.length
+    end
 
     # Check if the template exceeds the AWS limit
-    def exceeds_limit?; limit && length > limit; end
+    def exceeds_limit?
+      limit && length > limit
+    end
 
 
     #########################
@@ -78,28 +84,36 @@ module MkStack
       begin
         # Try JSON
         cfn = JSON.load(contents)
-      rescue Exception => e
+      rescue Exception => _e
         # Try YAML
         add_tags
-        cfn = YAML.safe_load(contents, [IntrinsicShort])
-        @format = "yaml"
+        cfn = YAML.safe_load(contents, permitted_classes: [IntrinsicShort])
+        @format = 'yaml'
+      end
+
+      # Check if there were any sections
+      unless cfn
+        $logger.debug { "no content in #{file}" }
+        return
       end
 
       # Merge sections that are present in the file
-      @sections.each { |name, section| section.merge(cfn[name]) if cfn[name] }
+      @sections.each do |name, section|
+        section.merge(cfn[name]) if cfn[name]
+      end
 
       # Look for Includes and merge them
       # Files are Included relative to the file with the Include directive
-      cfn["Include"].each do |file|
+      cfn['Include'].each do |file|
         Dir.chdir(File.dirname(file)) { self.merge(File.basename(file), erb) }
-      end if cfn["Include"]
+      end if cfn['Include']
     end
 
 
     #########################
     # Call ValidateTemplate[https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_ValidateTemplate.html]
     def validate
-      require "aws-sdk-cloudformation"
+      require 'aws-sdk-cloudformation'
       Aws::CloudFormation::Client.new.validate_template({ template_body: pp })
     end
 
@@ -108,9 +122,9 @@ module MkStack
     # Format contents
     def pp
       case @format
-      when "json"
+      when 'json'
         to_hash.to_json
-      when "yaml"
+      when 'yaml'
         to_hash.to_yaml({ line_width: -1 }) # Keep Psych from splitting "long" lines
       else
         to_hash
@@ -149,23 +163,26 @@ module MkStack
     # List of intrinsic functions that look like undefined local tags
     def add_tags
       [
-        "Base64",
-        "Cidr",
-        "FindInMap",
-        "GetAtt",
-        "GetAZs",
-        "ImportValue",
-        "Join",
-        "Ref",
-        "Select",
-        "Split",
-        "Transform",
-        "And",
-        "Equals",
-        "If",
-        "Not",
-        "Or",
-        "Sub",
+        'Base64',
+        'Cidr',
+        'FindInMap',
+        'ForEach',
+        'GetAtt',
+        'GetAZs',
+        'ImportValue',
+        'Join',
+        'Length',
+        'Ref',
+        'Select',
+        'Split',
+        'ToJsonString',
+        'Transform',
+        'And',
+        'Equals',
+        'If',
+        'Not',
+        'Or',
+        'Sub',
       ].each do |function|
         YAML::add_tag("!#{function}", IntrinsicShort)
       end

data/mkstack.gemspec

@@ -1,18 +1,19 @@
 Gem::Specification.new do |s|
-  s.name	= "mkstack"
-  s.version	= "1.2.1"
-  s.summary	= "Merge multiple CloudFormation template files into a single template"
+  s.name	= 'mkstack'
+  s.version	= '1.3.1'
+  s.summary	= 'Merge multiple CloudFormation template files into a single template'
   s.description	= <<-EOF
 Merge multiple CloudFormation template files into a single template.  Each file may be in either JSON or YAML format.  By default all files are run through an ERB (Embedded RuBy) processor.
 EOF
 
-  s.authors	= [ "Andy Rosen" ]
-  s.email	= [ "ajr@corp.mlfs.org" ]
-  s.homepage	= "https://github.com/ajrosen/AWS/tree/master/mkstack"
-  s.licenses	= [ "GPL-3.0+" ]
+  s.authors	= [ 'Andy Rosen' ]
+  s.email	= [ 'ajr@corp.mlfs.org' ]
+  s.homepage	= 'https://github.com/ajrosen/AWS/tree/master/mkstack'
+  s.licenses	= [ 'GPL-3.0-or-later' ]
 
-  s.files	= Dir[ "mkstack.gemspec", "bin/*", "lib/**/*.rb" ]
-  s.executables	= [ "mkstack" ]
+  s.files	= Dir[ 'mkstack.gemspec', 'bin/*', 'lib/**/*.rb' ]
+  s.executables	= [ 'mkstack' ]
 
-  s.add_runtime_dependency "aws-sdk-cloudformation", "~> 1"
+  s.required_ruby_version = '>= 2.6.0'
+  s.add_runtime_dependency 'aws-sdk-cloudformation', '~> 1'
 end

metadata

@@ -1,39 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkstack
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Andy Rosen
-autorequire:
+autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIID/jCCAmagAwIBAgIBAjANBgkqhkiG9w0BAQsFADAlMSMwIQYDVQQDDBphanIv
-  REM9Y29ycC9EQz1tbGZzL0RDPW9yZzAeFw0yMDA2MjMyMjA0MDdaFw0yMTA2MjMy
-  MjA0MDdaMCUxIzAhBgNVBAMMGmFqci9EQz1jb3JwL0RDPW1sZnMvREM9b3JnMIIB
-  ojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAqQ2xCUJ4wY8WujSzYd3OGTbj
-  JDMeU44pXOTLc49Rs8ydukGfd0YBvYMzifmiVRj6depGx2+Ln28Y2mT6IB+zHq8X
-  s1lrMdFCReztJjQ7OYS16YcZ6pmLkYClnHN3VNqayk1lQEJGCr8aawMeroSB01om
-  d5wqDATnKEG3x4bnlxFJb3LHzUG1CgNuVCuNREi8zN/uYdm2MGe1fTJguy4/vzBQ
-  /FnAMt1mr3LtM6YZRGaitIlOKBV/08v7fjH31KRmSMMHPq6A+WyWKRNKnK3tHpSN
-  JbnFW7mFQGtBpfh8zY8OCQ76Aw8cb5bEIPTI+Hd4FoJLPKnexTI28endSLigOUCF
-  76kLOiVOVOjdqZ8vEdSgWVugEAzIC30xW5b8yD6N7GdT7n3ktgoZu7jZMUW3D6PQ
-  wS6BaABVsXbeVtFrzK2tQ65EwLfRluRLTfbnQ7qvMIYCwC3Ib9DTMLavCiOot1vc
-  RBWXIrDex0tt3EN0dDIxP9O+7ciDgM4zPe6BvaF/AgMBAAGjOTA3MAkGA1UdEwQC
-  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRDowzw+kmcX6FV7T9BkQsUgmzLZjAN
-  BgkqhkiG9w0BAQsFAAOCAYEAAmnuLwfJOuo9JlIMPCArwX0wIZcuKJ1Ms5S9RpTT
-  MYqNwa52//SCZ5VG0bZknXNgHGs1qm4kHekxOVjjjdawVHQFZvDJJxblSvj1OTe0
-  J4OF7hiWldeUE7ezeHDpzcVpGkHBGYCPkLBPyjMkRwlZpgth9DVO7FP3mV9SMHyP
-  x1/55FYk0A62NgXSzmLghePC+trYllv54YURP4/R8RYnZPZNf5MFMjF94BoWGFzQ
-  9BKJ+1DbdAVwCMSWEcGOkw5euwofwf6PpvLlmhB9pM+acsjLJkaS/OU7v5/X0F6+
-  MkYSejwDmyV9/u/cPgStxlOOu4x7Ur2qOzfb8OEKMmautB7ZEdCivdG/Qa634dDq
-  dnrb3iC4VliJf0o5SVrYjRxBYn9WQV1eJaygRunfhVo9AqRPg+rcbkQ/XIWUQDeY
-  kLyoFawGT9fF6+lXyIT9XiaUzOCjQUJo94on5U601Y2GXB4Sa1oxLSBlEtkSwuD3
-  gMHlHdBRvoJurkVzYNWkN+Cz
-  -----END CERTIFICATE-----
-date: 2020-10-23 00:00:00.000000000 Z
+cert_chain: []
+date: 2025-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation
@@ -53,7 +28,7 @@ description: 'Merge multiple CloudFormation template files into a single templat
   file may be in either JSON or YAML format.  By default all files are run through
   an ERB (Embedded RuBy) processor.
 
-  '
+'
 email:
 - ajr@corp.mlfs.org
 executables:
@@ -68,9 +43,9 @@ files:
 - mkstack.gemspec
 homepage: https://github.com/ajrosen/AWS/tree/master/mkstack
 licenses:
-- GPL-3.0+
+- GPL-3.0-or-later
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -78,15 +53,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.4.15
+signing_key: 
 specification_version: 4
 summary: Merge multiple CloudFormation template files into a single template
 test_files: []