aws-cfn-compiler 0.2.6 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjZmMGQxYmRjYTRhOWE0YTg4OTg2MmFmODA4ZDllYTg4ZTgwMmJmMg==
-  data.tar.gz: !binary |-
-    NDFhNGY3ZDE0MTU0NzBjMDgyZTk4ZDIxYTYyODZiZGE5NGRkYjc4OQ==
+SHA1:
+  metadata.gz: 92b9e67123205941b72a91a16c5c42998c4cb449
+  data.tar.gz: f14ce4e2eccfce862cc596547a5d01ec99a94f9f
 SHA512:
-  metadata.gz: !binary |-
-    OTJjZTFiNDc2NDkwOGYzMTdmODcwZDQ0NDQ1ZjNiZmE5M2I3OTRiMzQ4MmFm
-    MjQ2YTFhYjdjNmRiYzc2MTkyMmU3ZDQxNDYwY2EyMzM1ODg1NmMyZWNkNWM4
-    NTU3YWE1MzI2MzVkNTU1MWFlMjg3ZDA1NTM4ZGVlY2M4NmNlYTU=
-  data.tar.gz: !binary |-
-    M2Y5NzhhOTBiOGJiMGY5ODRmZTRkOTVmM2EwMDgyNGY1M2ExYzEzNzRjNDEz
-    MTVkMDI3ZDcwMTk1YzhmYjBmNzEwMDA1MWVjOGM4Njg2OGRkYWFhMTNjOWMz
-    YzdiNjc3NTY4NjUyZjRmNDZlMDJjYWJjMzA1YzhjMDZlYjgyMWU=
+  metadata.gz: 69ef6ab2cb372b9f77377cda9746f8f6adfbb3595d225d044497d90ba9f317b772a84af100cb6132c9fc66a3da38e87b61cd8e04f39421005b3f5fdbf2ddbf55
+  data.tar.gz: 785e9f58bf67b9125096e606d0420d0024b4197730eb4f54f6449e784bf03b733ed65738c6139498c7c3e7207e1ca7fea003abe2f8c31c04fdaca79227d81005

data/aws-cfn-compiler.iml

@@ -18,7 +18,10 @@
     <orderEntry type="jdk" jdkName="RVM: ruby-1.9.3-p547 [aws-cfn-compile]" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="awesome_print (v1.2.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="aws-cfn-dsl (v0.0.4, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.6.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="cloudformation-ruby-dsl (v0.4.3, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="detabulator (v0.1.0, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="psych (v2.0.5, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.3.2, RVM: ruby-1.9.3-p547 [aws-cfn-compile]) [gem]" level="application" />

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

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Compiler
-      VERSION = "0.2.6"
+      VERSION = "0.3.0"
     end
   end
 end

data/lib/aws/cfn/compiler.rb

@@ -68,20 +68,12 @@ module Aws
 
         def validate(compiled)
           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?
-            puts '!!! Unknown references !!!'
-            (refs-names).each do |name|
-              puts "  #{name}"
-            end
-            abort!
-          end
-          puts '  References validated'
-          names = compiled['Resources'].keys + (compiled['Mappings'].nil? ? [] : compiled['Mappings'].keys)
+          # Mappings => Resources
           maps  = find_maps(compiled) #.select { |a| !(a =~ /^AWS::/) }
+          rscs  = compiled['Resources'].keys
+          mpgs  = compiled['Mappings'].nil? ? [] : compiled['Mappings'].keys
+          names = rscs+mpgs
 
           unless (maps-names).empty?
             puts '!!! Unknown mappings !!!'
@@ -90,6 +82,21 @@ module Aws
             end
             abort!
           end
+          puts '  Mappings validated'
+
+          # Parameters => Resources => Outputs
+          refs  = find_refs(compiled).select { |a,_| !(a =~ /^AWS::/) }
+          prms  = compiled['Parameters'].keys rescue []
+          # outs  = compiled['Outputs'].keys rescue []
+          names = rscs+prms
+
+          unless (refs.keys-names).empty?
+            puts '!!! Unknown references !!!'
+            (refs.keys-names).each do |name|
+              puts "  #{name} from #{refs[name][0]}:#{refs[name][1]}"
+            end
+            abort!
+          end
           puts '  References validated'
         end
 
@@ -155,21 +162,51 @@ module Aws
           exit
         end
 
-        def find_refs(hash)
+        def find_refs(hash, type='Reference', parent='')
+          h = {}
+          newparent = parent
           if hash.is_a? Hash
-            tr = []
             hash.keys.collect do |key|
+              if %w{Mappings Parameters Resources Outputs}.include? key
+                type = key#.gsub(/s$/, '')
+                newparent = key
+              elsif %w{Mappings Parameters Resources Outputs}.include? parent
+                newparent = key
+              end
               if %w{Ref SourceSecurityGroupName CacheSecurityGroupNames SecurityGroupNames}.include? key
-                hash[key]
+                h = { hash[key] => [type,newparent] }
               elsif 'Fn::GetAtt' == key
-                hash[key].first
+                h = { hash[key].first => [type,newparent] }
               else
-                find_refs(hash[key])
+                a = find_refs(hash[key],type,newparent)
+                h = merge(h, a, *[type,newparent])
               end
             end.flatten.compact.uniq
           elsif hash.is_a? Array
-            hash.collect{|a| find_refs(a)}.flatten.compact.uniq
+            a = hash.map{|i| find_refs(i,type,newparent) }
+            h = merge(h, a, type, *[type,newparent])
+          end
+          h
+        end
+
+        def merge(h, a, *type)
+          if a.is_a? Hash
+            if a.size > 0
+              h.merge! a
+            end
+          else
+            a.flatten.compact.uniq.map { |i|
+              if i.is_a? Hash
+                if i.size > 0
+                  h.merge! i
+                  h
+                end
+              else
+                h[i] = type
+              end
+            }
           end
+          h
         end
 
         def find_maps(hash)

metadata

@@ -1,117 +1,117 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-compiler
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - PKinney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
   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: psych
   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: json
   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
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: slop
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: The idea is to create a folder structure to better manage pieces of a
@@ -124,9 +124,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -160,12 +160,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []