aws-cfn-compiler 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 592aa0b88be9d7d1ad4cf61f894ea8b4cdbe66a1
-  data.tar.gz: a13ea148dd882a2cf11352cd0ceabc4d309afe6e
+  metadata.gz: 0341ec58a6fdcaa0aa8db05578913d55d08b9183
+  data.tar.gz: fda2436952d6ac8c9ace1dc971128fc11a622bd9
 SHA512:
-  metadata.gz: 1a707d5598d57e097bba7ed293058f459e3e3108255a0da1a542bde2446cf4ba4cd5c5e8dccbf27740a074e57885c814fb30625ce77ebaa3344a10c37c188098
-  data.tar.gz: 0e9fe3a2e7a54d848c57dc9029a7abe569865755beb299db9e4e16f99dae0f93ec224ad5323ae068cee9c3b6a5d5334299184a1a7f0cf0c67c981ae89a532da2
+  metadata.gz: bda6cd298f8f9309360fe238835b30276c26dcb53dc2a804d9a1d6971047aab545aa8ba3166b186e09358a961524531d14801d3e3d1d57ac14c108f614f299d4
+  data.tar.gz: 65c1ede2af535e67c39fb2cc50bb7ed517fdbb972132a47231478b22cef4b9d651b935929bf41cb87e0a1dedbac41bca34f537e7f7ab55435d4a9ebdbf527cc4

data/lib/aws/cfn/compiler.rb

@@ -42,13 +42,14 @@ module Aws
           if @spec and @spec['AWSTemplateFormatVersion']
             vers = @spec['AWSTemplateFormatVersion']
           end
+          # noinspection RubyStringKeysInHashInspection
           compiled = {
-              AWSTemplateFormatVersion: (@opts[:formatversion].nil? ? vers : @opts[:formatversion]),
-              Description:              (@opts[:description].nil?   ? desc : @opts[:description]),
-              Parameters:               @items['params'],
-              Mappings:                 @items['mappings'],
-              Resources:                @items['resources'],
-              Outputs:                  @items['outputs'],
+              'AWSTemplateFormatVersion' => (@opts[:formatversion].nil? ? vers : @opts[:formatversion]),
+              'Description'              => (@opts[:description].nil? ? desc : @opts[:description]),
+              'Parameters'               => @items['Parameters'],
+              'Mappings'                 => @items['Mappings'],
+              'Resources'                => @items['Resources'],
+              'Outputs'                  => @items['Outputs'],
           }
 
           puts
@@ -66,9 +67,9 @@ module Aws
         end
 
         def validate(compiled)
-          raise 'No resources!?' unless compiled[:Resources]
-          raise 'No parameters!?' unless compiled[:Parameters]
-          names = compiled[:Resources].keys + compiled[:Parameters].keys
+          raise 'No Resources!?' unless compiled['Resources']
+          #raise 'No Parameters!?' unless compiled['Parameters']
+          names = compiled['Resources'].keys + (compiled['Parameters'].nil? ? [] : compiled['Parameters'].keys)
           refs = find_refs(compiled).select { |a| !(a =~ /^AWS::/) }
 
           unless (refs-names).empty?
@@ -79,12 +80,32 @@ module Aws
             abort!
           end
           puts '  References validated'
+          names = compiled['Resources'].keys + (compiled['Mappings'].nil? ? [] : compiled['Mappings'].keys)
+          maps  = find_maps(compiled) #.select { |a| !(a =~ /^AWS::/) }
+
+          unless (maps-names).empty?
+            puts '!!! Unknown mappings !!!'
+            (maps-names).each do |name|
+              puts "  #{name}"
+            end
+            abort!
+          end
+          puts '  References validated'
         end
 
         def save(compiled, output_file)
           begin
+            hash = {}
+            compiled.each do |item,value|
+              unless value.nil?
+                if (not value.is_a?(Hash)) or (value.count > 0)
+                  hash[item] = value
+                end
+              end
+            end
+
             File.open output_file, 'w' do |f|
-              f.write JSON.pretty_generate(compiled)
+              f.write JSON.pretty_generate(hash)
             end
             puts '  Compiled file written.'
           rescue
@@ -111,19 +132,19 @@ module Aws
 
               case File.extname(File.basename(abs)).downcase
                 when /json/
-                  spec = JSON.parse(spec)
+                  @spec = JSON.parse(spec)
                 when /yaml/
-                  spec = YAML.load(spec)
+                  @spec = YAML.load(spec)
                 else
                   raise "Unsupported file type for specification: #{spec}"
               end
-              @spec = spec
+              # @spec = spec
             else
               raise "Unable to open specification: #{abs}"
             end
           end
-          %w{Params Mappings Resources Outputs}.each do |dir|
-            load_dir(dir,spec)
+          %w( Mappings Parameters Resources Outputs ).each do |dir|
+            load_dir(dir,@spec)
           end
         end
 
@@ -151,6 +172,21 @@ module Aws
           end
         end
 
+        def find_maps(hash)
+          if hash.is_a? Hash
+            tr = []
+            hash.keys.collect do |key|
+              if 'Fn::FindInMap' == key
+                hash[key].first
+              else
+                find_maps(hash[key])
+              end
+            end.flatten.compact.uniq
+          elsif hash.is_a? Array
+            hash.collect{|a| find_maps(a)}.flatten.compact.uniq
+          end
+        end
+
         def load_dir(dir,spec=nil)
           puts "Loading #{dir}..."
           raise "No such directory: #{@opts[:directory]}" unless File.directory?(@opts[:directory])
@@ -166,8 +202,9 @@ module Aws
           end
           set.collect do |filename|
             next unless filename =~ /\.(json|ya?ml)\z/i
-            if spec and spec[dir]
+            if spec and spec.has_key?(dir)
               base = File.basename(filename).gsub(%r/\.(rb|yaml)/, '')
+              next     if spec[dir].nil? # Edge case ... explicitly want NONE of these!
               next unless spec[dir].include?(base)
               puts "\tUsing #{dir}/#{base}"
             end
@@ -190,10 +227,13 @@ module Aws
               abort!
             end
           end
+          if spec and spec[dir]
+            raise "Suspect that a #{dir} item was missed! \nRequested: #{spec[dir]}\n    Found: #{@items[dir].keys}" unless (@items[dir].keys.count == spec[dir].count)
+          end
         end
 
         def get_file_set(dir)
-          Dir[File.join(@opts[:directory], "#{dir}.*")] | Dir[File.join(@opts[:directory], dir, "**", "*")]
+          Dir[File.join(@opts[:directory], "#{dir}.*")] | Dir[File.join(@opts[:directory], dir.to_s, "**", "*")]
         end
 
       end

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = "0.1.0"
+      VERSION = "0.2.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - PKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print