aws-cfn-compiler 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTljZDM3YzBkMWZhYzVhM2RhMDBkMjA4MjQ3MTljZjdlNjczZDUyYg==
+    YWY3NDI0YjQzMzJlNDM4MzI3ZmU3ZmRjYzQ1NDA3ZGFlYjZlYmJjZQ==
   data.tar.gz: !binary |-
-    YWIzN2E1YTE3YTk3OWVlNDVlYTYyZGQzNWZiYjc5N2QzNDY1NjU5YQ==
+    OTE0NmMzOGU1MTY1MWE3MTcwOGRiMGI3ODI2MTdkMzYwOGM0OTZhZA==
 SHA512:
   metadata.gz: !binary |-
-    Y2RhZTI5ODI1Y2MzODU2OTQzYjI3ODFlOGEzMDU4MjM2ZTJiMDU5MWIyODg3
-    YWJmOGQwYTFlNDNiMWQ5Y2FjMmJhN2JiMzBlMTg1YTE3ZGQ5NDk3N2FiZTU5
-    YTYyMjU0ZjU2YWY5MWUxYTMxOThmYzc5NjU3MDlhNjI0ZTQ2MjQ=
+    ZjRkNmYxY2E0ODliN2EwM2I2NjgyMjQwNjRiOGNjNjY4ZWU2MjI4MjBjMTEx
+    NDU5ZDgyMWQ0N2U0YTVkOGFkYWM3YTBhOTA0OWEzN2QzMTY4ODgzNjZiMzVk
+    YzNjNmQ3M2VjNTlkOWU5MTdlN2IyOGU4MDg1ZjJjMjIzNWFmYzM=
   data.tar.gz: !binary |-
-    NDdkYjUyOTA4Y2U1MDM0YjZlZmM5YmZhN2E2NzIyMWZiZjQ1ODQwNWRmOGM2
-    MTZjMzExOWVhNWE0MjM5YjQyZTc3ZGFmZDk1OTY5MTFmN2RlYmVmZjljMThj
-    M2Q4YzIyNzJkNGFlZDFiMDFmYWRkOTdlZjYwNzcxNDhiN2ZhOWI=
+    ZGEwMzM1MDZjY2E1NmE4M2M0Mjc2NGFmZDdhMDBiNzI2MGY4YTViOGM4MzQ3
+    NmQxZGJjZmJkYjA0ZTg4YWNlYWE4NmM2NGY0YTFhNDgyMGYwYzcxMmQ5YTBj
+    NjAyMDYzMDRlZGU3MDU4YmJlNjY1OGNlNGY4ZGRjMjNlNDZmNjI=

data/aws-cfn-compiler.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'psych'
   spec.add_dependency 'json'
   spec.add_dependency 'slop'
+  spec.add_dependency 'inifile'
   spec.add_dependency 'aws-cfn-dsl', '>= 0.7.0', '~> 0.7'
   spec.add_dependency 'dldinternet-mixlib-cli', ">= 0.1.0", '~> 0.1'
   spec.add_dependency 'dldinternet-mixlib-logging', '>= 0.1.6', '~> 0.1'

data/lib/aws/cfn/compiler/base.rb

@@ -77,6 +77,35 @@ module Aws
             sect = File.basename(sect) unless @config[:expandedpaths]
             save_section(dir, file, @config[:format], sect, hash, '', 'template')
 
+            parameters = []
+            if (@config[:parametersfile] or @config[:stackinifile]) and hash.has_key?('Parameters')
+              hash['Parameters'].each do |par,hsh|
+                # noinspection RubyStringKeysInHashInspection
+                parameters <<   {
+                    'ParameterKey' => par,
+                    'ParameterValue' => hsh.has_key?('Default') ? hsh['Default'] : '',
+                    'UsePreviousValue' => false,
+                }
+              end
+            end
+
+            if @config[:parametersfile] and parameters.size > 0
+              dir  = File.dirname(@config[:parametersfile])
+              file = File.basename(@config[:parametersfile])
+              sect = dir == '.' ? Dir.pwd : dir
+              sect = File.basename(sect) unless @config[:expandedpaths]
+
+              save_section(dir, file, @config[:format], sect, parameters, '', 'parameters')
+            end
+
+            if @config[:stackinifile] and parameters.size > 0
+              dir  = File.dirname(@config[:stackinifile])
+              file = File.basename(@config[:stackinifile])
+              sect = dir == '.' ? Dir.pwd : dir
+              sect = File.basename(sect) unless @config[:expandedpaths]
+
+              save_inifile(dir, file, sect, parameters, 'parameters')
+            end
             @logger.info '  Compiled file written.'
           rescue
             abort! "!!! Could not write compiled file: #{$!}"

data/lib/aws/cfn/compiler/mixins/options.rb

@@ -14,15 +14,18 @@ module Aws
           @opts.on :f, :formatversion=, 'The AWS Template format version. ', {as: String,
                                                                               default: '2010-09-09'
           }
-          @opts.on :D, :description=, "The AWS Template description. Default: template name", { as: String }
-          @opts.on :p, :precedence=, 'The precedence of template component types. Default: rb,ruby,yaml,yml,json,js', { as: String,
+          @opts.on :D, :description=,    'The AWS Template description. Default: template name', { as: String }
+          @opts.on :p, :parametersfile=, 'The parameters file for the template', { as: String }
+          @opts.on :i, :stackinifile=,   'The INI file for the stack builder == build.py', { as: String }
+          @opts.on :P, :precedence=,     'The precedence of template component types. Default: rb,ruby,yaml,yml,json,js', { as: String,
                                                                                                                         default: 'rb,ruby,yaml,yml,json,js', }
 
           @opts.parse!
 
           if ARGV.size > 0
             puts @opts
-            abort! "Extra arguments! #{ARGV}"
+            puts "Extra arguments! #{ARGV}"
+            exit 1
           end
         end
 

data/lib/aws/cfn/compiler/mixins/save.rb

@@ -1,8 +1,39 @@
+require 'inifile'
 module Aws
   module Cfn
     module Compiler
       module Save
 
+        def save_inifile(dir, file, section, parameters, brick=nil)
+          brick ||= "INI #{section}"
+          path = File.join(File.expand_path(dir), file)
+          filn = if @config[:expandedpaths]
+                   path
+                 else
+                   File.join(dir, file)
+                 end
+          logStep "Saving #{brick} to #{filn} "
+
+          if i_am_maintainer(path) or @config[:force]
+            begin
+              ini = IniFile.new
+
+              # noinspection RubyStringKeysInHashInspection
+              parms = {
+                  'region' => 'us-east-1'
+              }
+              parameters.map{ |p| parms[p['ParameterKey']] = p['ParameterValue'] }
+              ini['<StackName>'] = parms
+              ini.write( filename: path )
+              @logger.info "  saved #{filn}."
+            rescue
+              abort! "!!! Could not write file #{path}: #{$!}"
+            end
+          else
+            @logger.warn "  Did not overwrite #{filn}."
+          end
+        end
+
         def save_section(dir, file, format, section, hash, join='/', brick=nil)
           brick ||= "brick #{hash.keys[0]}"
           path = File.join(File.expand_path(dir), file)
@@ -39,9 +70,9 @@ module Aws
                 end
                 f.close
               end
-              @logger.info "  decompiled #{filn}."
+              @logger.info "  saved #{filn}."
             rescue
-              abort! "!!! Could not write compiled file #{path}: #{$!}"
+              abort! "!!! Could not write file #{path}: #{$!}"
             end
           else
             @logger.warn "  Did not overwrite #{filn}."

data/lib/aws/cfn/compiler/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.7.0'
+      VERSION = '0.8.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - PKinney
@@ -72,6 +72,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-cfn-dsl
   requirement: !ruby/object:Gem::Requirement