cfn-model 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0cbaafa5aae88b900b524e178ee2e5bec99731b
-  data.tar.gz: a1164ab6d3ae88048d64947cbb93525ca91428b2
+  metadata.gz: cdec50eea8f3b51b3fc47b7f368d9d7e565c24e0
+  data.tar.gz: 13b9c905e65a89ecbc42e25045405aef019d2da1
 SHA512:
-  metadata.gz: 2ba1540435edacfb4fbce29732dba05a906f54748cb34b4ee447869555039435218dcab4c90358104c0570343796d4b0769b8893888885b91c8a1a2f79dcb209
-  data.tar.gz: 6a74580eea614d32f70c43c17a0dbcf0a1595185540da305bf91622ec29990c2d1050f06f1996d081b9373cae8d9efac874c22ef12d94d9b351fd3a8519c290b
+  metadata.gz: 9915d60450bf8b009d175be74e042a3f221bff28d8cf8666cde8b22996cd5249d39f7c453ff2c7acd2ebdb835c087b1969c37418c669307e9d5c6b0b40590bb2
+  data.tar.gz: 842de4725ae80c7f49c3d463fd2d37e6f52ebcc6c5b8e5db7c121fcffe63c0fd0c017125ac39c4be59c8ab843424a8f295a6b6be820158af0cfaed6b8a02b23f

data/lib/cfn-model/parser/iam_group_parser.rb

@@ -7,11 +7,13 @@ class IamGroupParser
     iam_group = resource
 
     iam_group.policy_objects = iam_group.policies.map do |policy|
+      next unless policy.has_key? 'PolicyName'
+
       new_policy = Policy.new
       new_policy.policy_name = policy['PolicyName']
       new_policy.policy_document = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
       new_policy
-    end
+    end.reject { |policy| policy.nil? }
     iam_group
   end
 end

data/lib/cfn-model/parser/iam_role_parser.rb

@@ -9,11 +9,13 @@ class IamRoleParser
     iam_role.assume_role_policy_document = PolicyDocumentParser.new.parse(iam_role.assumeRolePolicyDocument)
 
     iam_role.policy_objects = iam_role.policies.map do |policy|
+      next unless policy.has_key? 'PolicyName'
+
       new_policy = Policy.new
       new_policy.policy_name = policy['PolicyName']
       new_policy.policy_document = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
       new_policy
-    end
+    end.reject { |policy| policy.nil? }
 
     iam_role
   end

data/lib/cfn-model/parser/iam_user_parser.rb

@@ -7,11 +7,13 @@ class IamUserParser
     iam_user = resource
 
     iam_user.policy_objects = iam_user.policies.map do |policy|
+      next unless policy.has_key? 'PolicyName'
+
       new_policy = Policy.new
       new_policy.policy_name = policy['PolicyName']
       new_policy.policy_document = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
       new_policy
-    end
+    end.reject { |policy| policy.nil? }
 
     iam_user.groups.each { |group_name| iam_user.group_names << group_name }
 

data/lib/cfn-model/parser/security_group_parser.rb

@@ -19,19 +19,30 @@ class SecurityGroupParser
 
   private
 
+  def silently_fail
+    begin
+      yield
+    rescue
+    end
+  end
+
   def objectify_ingress(security_group)
     if security_group.securityGroupIngress.is_a? Hash
       security_group.securityGroupIngress = [security_group.securityGroupIngress]
     end
 
     security_group.ingresses = security_group.securityGroupIngress.map do |ingress|
+      mapped_at_least_one_attribute = false
       ingress_object = AWS::EC2::SecurityGroupIngress.new
       ingress.each do |k,v|
-        ingress_object.send("#{initialLower(k)}=", v)
+        silently_fail do
+          ingress_object.send("#{initialLower(k)}=", v)
+          mapped_at_least_one_attribute = true
+        end
       end
       #ingress_object.valid?
-      ingress_object
-    end
+      mapped_at_least_one_attribute ? ingress_object : nil
+    end.reject { |ingress| ingress.nil? }
   end
 
   def objectify_egress(security_group)
@@ -40,12 +51,20 @@ class SecurityGroupParser
     end
 
     security_group.egresses = security_group.securityGroupEgress.map do |egress|
+      mapped_at_least_one_attribute = false
+
       egress_object = AWS::EC2::SecurityGroupEgress.new
       egress.each do |k,v|
-        egress_object.send("#{initialLower(k)}=", v)
-      end
+        next if k.match /::/
+        silently_fail do
+          egress_object.send("#{initialLower(k)}=", v)
+          mapped_at_least_one_attribute = true
+        end
+
+      end.reject { |ingress| ingress.nil? }
       #egress_object.valid?
       egress_object
+      mapped_at_least_one_attribute ? egress_object : nil
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2017-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kwalify