aws-cfn-compiler 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjUzMDEzY2Q4MDYwNjZkYzZmZWYyOTZmNTYxNTQxOTAyNzdiOTU3Yw==
+    YmUyYWQyMDc2MTdlNWJmZDlhYmNkNWI1ZGVkNWJjNjU3NzY0MDIxOA==
   data.tar.gz: !binary |-
-    MmE3YmQ0MmFkZTI2ZmZjOTJhNjM0ZGZlMjI0YzUyZTAyMmRhMTdiMw==
+    ZmFhMWQzOWUxNzI1ZmM1NWNkNTA2YmNhOTI2OTk3MWUyYzU2YzE5Mw==
 SHA512:
   metadata.gz: !binary |-
-    MmNiMDAyMDBmNzIzNWRiNGExODZhMzY5NjQ4NzRhMjBiYmFkNTlkOWJhNTc0
-    ODc2YTk3NzA5ZWI2MmUzNDg0M2I3ODVlNmE3ZTljZWZlMDgxMGY5YzU0ZTE3
-    MTdhZjFlMjJjMGNlNTljZjFiYTRhOGE1MTY4ODhhMDRlYzg4MTI=
+    M2VmMTk5MzJhZjA5ZTdjYzk2ZWY2NTJhMjdjNWNhMzcxYzdhODdiNDJmMWZh
+    MDU4ODA5YzEwZjVlOTA1NTYxMDE1ZWNlNjBlYTYwYTg3ZmUyNjJhZjE5M2E0
+    M2MwMTIwZjFmOTA0YTg5OWFjMjg0NTFhOGZiYjQyMWQ5ZWQ4OGQ=
   data.tar.gz: !binary |-
-    MmRkNDU0Zjk5ODYwMjE1YTcwZjllYThmMWYwNDRlYmUyODNjZGE4NzEzYTgy
-    ZTA2OWEyMzI3YjAwNzQxZWRjYjRjMzVhMzk3NjM3MzgxNjVhMGVjZjc2NjNk
-    MThjYTliMDk3NmNjMjc3ZjdkOTQzMDFlMDk5MDM5MTIxZGUwZmM=
+    NjExNjAxNmQ0MWJiMDRhZGRlMjFkY2Y1NmZhNjFlMTY3MDE3YWFjZjk1MmRm
+    ODc4M2RmZGVjZjkxMzYxODIzOGUzNjNlZTU2NGRlYmYyOTExYjhiZWRmNzA2
+    ZmQ0NGIxMzgxNjdlNGRhN2I5MzViNzU4ZThkMThmMGM1ZDRjZWY=

data/aws-cfn-compiler.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
   spec.add_dependency 'slop'
   spec.add_dependency 'inifile'
-  spec.add_dependency 'aws-cfn-dsl', '>= 0.9.0'
+  spec.add_dependency 'aws-cfn-dsl', '>= 0.9.2'
   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

@@ -25,9 +25,8 @@ module Aws
 
           # Mappings => Resources
           maps  = find_maps(compiled) #.select { |a| !(a =~ /^AWS::/) }
-          rscs  = compiled['Resources'].keys
           mpgs  = compiled['Mappings'].nil? ? [] : compiled['Mappings'].keys
-          names = rscs+mpgs
+          names = mpgs # rscs+
 
           unless (maps-names).empty?
             @logger.error '!!! Unknown mappings !!!'
@@ -36,21 +35,44 @@ module Aws
             end
             abort!
           end
+          net = (names-maps)
+          unless net.empty?
+            @logger.warn '!!! Unused mappings !!!'
+            net.each do |name|
+              @logger.warn "  #{name}"
+            end
+          end
           @logger.info '  Mappings validated'
 
           # Parameters => Resources => Outputs
           refs  = find_refs(compiled).select { |a,_| !(a =~ /^AWS::/) }
           prms  = compiled['Parameters'].keys rescue []
+          rscs  = compiled['Resources'].keys
           # outs  = compiled['Outputs'].keys rescue []
           names = rscs+prms
 
-          unless (refs.keys-names).empty?
+          net = (refs.keys-names)
+          unless net.empty?
             @logger.error '!!! Unknown references !!!'
-            (refs.keys-names).each do |name|
+            net.each do |name|
               @logger.error "  #{name} from #{refs[name][0]}:#{refs[name][1]}"
             end
             abort!
           end
+          net = (prms-refs.keys)
+          unless net.empty?
+            @logger.warn '!!! Unused Parameters !!!'
+            net.each do |name|
+              @logger.warn "  #{name}"
+            end
+          end
+          net = (rscs-refs.keys)
+          unless net.empty?
+            @logger.info '!!! Unreported Resources !!!'
+            net.each do |name|
+              @logger.info "  #{name}"
+            end
+          end
           @logger.info '  References validated'
         end
 

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

@@ -3,6 +3,50 @@ module Aws
     module Compiler
       module Compile
 
+        def get_meta(spec,args)
+
+          if spec.is_a?(Hash)
+            if args.is_a?(Array)
+              args.flatten!
+              if args.size > 0
+                a = args.shift
+                get_meta(get_meta(spec, a), args)
+              else
+                spec
+              end
+            elsif args.is_a?(Hash)
+              h = {}
+              args.map { |e, v| h[e] = get_meta(spec, v) }
+              h
+            elsif args.is_a?(Symbol)
+              # noinspection RubyStringKeysInHashInspection
+              case args
+                when :Compiler
+                  {
+                      'Name'    => ::Aws::Cfn::Compiler.name,
+                      'Version' => ::Aws::Cfn::Compiler::VERSION,
+                  }
+                else
+                  get_meta(spec, args.to_s)
+              end
+            elsif args.is_a?(String)
+              if spec[args]
+                spec[args]
+              end
+            else
+              nil
+            end
+          else
+            spec
+          end
+        end
+
+        def meta(*args)
+          if @spec['Meta']
+            get_meta(@spec['Meta'],args)
+          end
+        end
+
         def compile_spec
           desc =  if @config[:description]
                     @config[:description]
@@ -13,6 +57,18 @@ module Aws
                   else
                     'compiled template'
                   end
+
+          begin
+            if desc.match(%r'#\{.+?\}')
+              eval %(desc = "#{desc}")
+            end
+          rescue
+            # noop
+          end
+          # ap meta(:Version)
+          # ap meta(:Compiler,:Name)
+          # ap meta(:Compiler,:Version)
+
           vers =  if @config[:formatversion]
                     @config[:formatversion]
                   else

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

@@ -20,7 +20,7 @@ module Aws
             get  = {}
             item = {}
             spec[section].each do |rsrc|
-              @logger.info "\tUsing #{section}::#{rsrc}"
+              @logger.debug "\tUsing #{section}::#{rsrc}"
               refp,sub,base,rel = map_resource_reference(rsrc)
               if refp.nil?
                 path = vet_path(section)

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = '0.9.1'
+      VERSION = '0.9.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - PKinney
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: dldinternet-mixlib-cli
   requirement: !ruby/object:Gem::Requirement