aws-cfn-compiler 0.9.9 → 0.9.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGYzYzY2Mzg1NTIwZDUxOTQ4YmJmZjA0YjI1MDhmOTg1NjQ2OTY0NQ==
+    OGMwOGEzN2JlYTE1NjY3MzI1YzIwNTljMTYwZDM1NDBiMzdmOTU2MQ==
   data.tar.gz: !binary |-
-    NWMzYjczYjA3ZGZhYmQyODJhMmQyNDY1YjA0NGI0NDVhMThjNjQ4MQ==
+    ODJlNzFmNjhmZjY3YzFkOGE0OTQwNWFkNjM2ZmNmMjU2OWVlNjBjNA==
 SHA512:
   metadata.gz: !binary |-
-    OTE5MTRhZjM2NTQzMWRhZjM4ODRmOGM5Y2Q5MjYyMDM4Y2FmYWE4N2YwZmIw
-    ODc0MDMxMmQ3YTBiMDA0ZTI1ODJkZDJhYWNlNWMzNWFmYmZhODJmOGZjNTQ5
-    YTE5NjZhNzU3OWI4NTY1Nzk2MjgyZTFiMGRmZjlhOTNjZWRkZmY=
+    NGQwZWRmZjYyMzFkZDY0YWVlZWExYmMzZGYyNTc4MDYzZWI3YTc0ZmQ1NzQx
+    MjE1NTY3Nzk0YTAwOTJjODRjZWUwOWY1YWQ4ZmJlYWMwZmZjYWYyYjM0NDFm
+    MWQxMGY2MWNiOGZhNDg2OTk5NzUwMzU5MGI2NzYxZDA0MTg3ZjI=
   data.tar.gz: !binary |-
-    OWM3MGQwYjQ5YTMwYmRiMGViMGYxMTFjMTAwY2ExZjU4N2NjNjBkZGY3NTM4
-    NTg0MGFlZTdkOTYxZjQwMWI0YjExMTI4YjExYzQ0NGJjZmIzOTA4MTc4OTYy
-    NWFjODBiMzBlNzVhOTVjMGMyMDg2NDZmMDA3NTg3OWVjZmMzMjQ=
+    ZmY0NjhlNTdlN2MyOGM3MTljZTE1OWUxZTZjZDE1MjJmZDk2NmQ3M2ZhYzY4
+    ODZhODc0ODgyYjYxZTQ4MTgyNzc3Mzg3NWY5YTUxNzdlOGI3ZWQ2NWMwZjM2
+    NTYxYWQ0ZjgyZDFkMDliNjA4YzMxYjU0YzRmYTQxZjc4ZDc0Mzk=

data/aws-cfn-compiler.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'slop'
   spec.add_dependency 'inifile'
   spec.add_dependency 'semverse', '>= 1.1.0'
-  spec.add_dependency 'aws-cfn-dsl', '>= 0.9.5'
+  spec.add_dependency 'aws-cfn-dsl', '>= 0.9.6'
   spec.add_dependency 'mixlib-cli', '> 0'
   spec.add_dependency 'dldinternet-mixlib-cli', '>= 0.2.0'
   spec.add_dependency 'dldinternet-mixlib-logging', '>= 0.4.0'

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

@@ -17,29 +17,37 @@ module Aws
         def initialize
           super
           @items = {}
+          @dynamic_items = {}
+        end
+
+        def dynamic_item(section,resource,hash)
+          @dynamic_items[section][resource] = hash
         end
 
         def validate(compiled)
           abort! 'No Resources!?' unless compiled['Resources']
           logStep 'Validating template'
 
+         # --- Parameters ----------------------------------------------------------------------------------------------
           prms  = compiled['Parameters'].keys rescue []
-          compiled['Parameters'].each do |name,hash|
-            abort! "Parameter #{name} has an invalid compiled block!\n#{hash.ai}" unless hash.is_a?(Hash)
-            if hash['Type']
-              unless %w(String Number CommaDelimitedList).include?(hash['Type'])
-                abort! "Parameter #{name} has an invalid type: #{hash['Type']}"
+          if compiled['Parameters']
+            compiled['Parameters'].each do |name,hash|
+              abort! "Parameter #{name} has an invalid compiled block!\n#{hash.ai}" unless hash.is_a?(Hash)
+              if hash['Type']
+                unless %w(String Number CommaDelimitedList).include?(hash['Type'])
+                  abort! "Parameter #{name} has an invalid type: #{hash['Type']}"
+                end
               end
-            end
-            if hash['Default']
-              unless hash['Default'].is_a?(String)
-                abort! "Parameter #{name} has an invalid default (Must be string): #{hash['Default']}"
+              if hash['Default']
+                unless hash['Default'].is_a?(String)
+                  abort! "Parameter #{name} has an invalid default (Must be string): #{hash['Default']}"
+                end
               end
             end
+            @logger.info '  Parameters validated'
           end
-          @logger.info '  Parameters validated'
 
-          # Mappings => Resources
+          # --- functions ----------------------------------------------------------------------------------------------
           funs  = find_fns(compiled) #.select { |a| !(a =~ /^AWS::/) }
 
           bad = []
@@ -53,19 +61,23 @@ module Aws
           end
           @logger.info '  Functions validated'
 
-          # Mappings => Resources
-          maps  = find_maps(compiled) #.select { |a| !(a =~ /^AWS::/) }
+          # --- Mappings ----------------------------------------------------------------------------------------------
+          mappings  = find_maps(compiled)
           mpgs  = compiled['Mappings'].nil? ? [] : compiled['Mappings'].keys
           names = mpgs # rscs+
 
-          unless (maps-names).empty?
+          maps = {}
+          mappings.each{|m| maps[m[:mapping]] = m[:source] }
+          mapnames = maps.keys
+          net = (mapnames-names)
+          unless net.empty?
             @logger.error '!!! Unknown mappings !!!'
-            (maps-names).each do |name|
-              @logger.error "  #{name}"
+            net.each do |name|
+              @logger.error "  #{name} (Location in template: #{maps[name].join('/')})"
             end
             abort!
           end
-          net = (names-maps)
+          net = (names-mapnames)
           unless net.empty?
             @logger.warn '!!! Unused mappings !!!'
             net.each do |name|
@@ -74,11 +86,32 @@ module Aws
           end
           @logger.info '  Mappings validated'
 
+          # --- Conditions ----------------------------------------------------------------------------------------------
+          cond  = find_conditions(compiled)
+          cnds  = compiled['Conditions'].keys rescue []
+          names = cnds
+
+          net = (cond-names)
+          unless net.empty?
+            @logger.error '!!! Unknown conditions !!!'
+            net.each do |name|
+              @logger.error "  #{name}"
+            end
+            abort!
+          end
+          net = (names-cond)
+          unless net.empty?
+            @logger.warn '!!! Unused conditions !!!'
+            net.each do |name|
+              @logger.warn "  #{name}"
+            end
+          end
+          @logger.info '  Conditions validated'
+
+          # --- References ----------------------------------------------------------------------------------------------
           # Parameters => Resources => Outputs
           refs  = find_refs(compiled).select { |a,_| !(a =~ /^AWS::/) }
           rscs  = compiled['Resources'].keys
-          cnds  = compiled['Conditions'].keys rescue []
-          # outs  = compiled['Outputs'].keys rescue []
           names = rscs+prms+cnds
 
           net = (refs.keys-names)
@@ -96,9 +129,9 @@ module Aws
               @logger.warn "  #{name}"
             end
           end
-          net = (rscs-refs.keys)
+          net = (rscs.sort-refs.keys.sort)
           unless net.empty?
-            @logger.info '!!! Unreported Resources !!!'
+            @logger.info '!!! Unreferenced Resources !!!'
             net.each do |name|
               @logger.info "  #{name}"
             end
@@ -190,7 +223,12 @@ module Aws
                 when /json|jts/
                   @spec = JSON.parse(spec)
                 when /yaml|yts/
-                  @spec = YAML.load(spec)
+                  begin
+                    @spec = YAML.load(spec)
+                  rescue Psych::SyntaxError => e
+                    i = 0
+                    abort! "Error in the template specification: #{e.message}\n#{spec.split(/\n/).map{|l| "#{i+=1}: #{l}"}.join("\n")}"
+                  end
                 else
                   abort! "Unsupported file type for specification: #{spec}"
               end

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

@@ -245,17 +245,36 @@ module Aws
           r
         end
 
-        def find_maps(hash)
+        def find_maps(hash,source=[])
           if hash.is_a? Hash
             hash.keys.collect do |key|
               if 'Fn::FindInMap' == key
-                hash[key].first
+                { mapping: hash[key].first, source: source }
               else
-                find_maps(hash[key])
+                find_maps(hash[key], [ source, key ].flatten!)
               end
             end.flatten.compact.uniq
           elsif hash.is_a? Array
-            hash.collect{|a| find_maps(a)}.flatten.compact.uniq
+            hash.collect{|a|
+              find_maps(a,source)}.flatten.compact.uniq
+          end
+        end
+
+        def find_conditions(hash)
+          if hash.is_a? Hash
+            hash.keys.collect do |key|
+              if 'Condition' == key
+                if hash[key].is_a?(Array)
+                  hash[key].first
+                else
+                  hash[key]
+                end
+              else
+                find_conditions(hash[key])
+              end
+            end.flatten.compact.uniq
+          elsif hash.is_a? Array
+            hash.collect{|a| find_conditions(a)}.flatten.compact.uniq
           end
         end
 

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

@@ -101,7 +101,7 @@ module Aws
           end
 
           unless File.directory?(path)
-            @logger.error "  !! error: Cannot load bricks from #{patn} with brick path: \n\t#{@config[:brick_path_list].join("\n\t")} \n(started with #{File.join(base, dir)}')"
+            @logger.error "  !! error: Cannot load #{dir}/#{rsrc} with brick path: \n\t#{@config[:brick_path_list].join("\n\t")} \n(started with #{File.join(base, dir)}')"
             abort!
           end
           path

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

@@ -79,6 +79,7 @@ module Aws
           if spec and spec[section]
             @items          ||= {}
             @items[section] ||= {}
+            @dynamic_items[section] ||= {}
             get  = {}
             item = {}
             spec[section].each do |rsrc|
@@ -125,7 +126,12 @@ module Aws
                   abort! "  !! error: #{$!}"
                 end
               else
-                abort! "  !! error: #{section}/#{base} not found!"
+                pm = []
+                set.map { |r,f|
+                  b = File.basename(f).gsub( %r(\..*?$), '' )
+                  pm << b if b.downcase == rsrc.downcase
+                }
+                abort! "  !! error: #{section}/#{base} not found! Possible matches: #{pm}"
               end
             end
             item.keys.each { |key|
@@ -135,7 +141,7 @@ module Aws
             }
             @items[section].merge! item
 
-            unless @items[section].keys.count == spec[section].count
+            unless @items[section].keys.count == (spec[section].count + @dynamic_items[section].keys.count)
               abort! "  !! error: Suspect that a #{section} item was missed or not properly named (Brick name and file name mismatch?)! \nRequested: #{spec[section]}\n    Found: #{@items[section].keys}"
             end
           end

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.9.9'
+      VERSION = '0.9.12'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.12
 platform: ruby
 authors:
 - PKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement