cfn-model 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9464ccb5aeb4d72a6ee7934e5f703e1740615c5a
-  data.tar.gz: a9656a1d245d91fe13b4a173b59a70dd35d9fb18
+  metadata.gz: b40be56bb9e42ec1fba35ad4529c386233317a61
+  data.tar.gz: f4c348c41667a8331a283773acc0e3eceece5d70
 SHA512:
-  metadata.gz: eafd2f325ccfc4a7a310c1ec19b50e4f63ccea271d5bbc00cfcea9685a6d0e0be0bfccce3ff7cac87072e0ed7b2f73077809b0eb25322d98d96390105e4d2bdd
-  data.tar.gz: 18b64e07a3dae4e93f1ab9819ca920432d95687703838faea59e3b2a82254e7ecf637b0bca7afcb3a66b1ae4fff77e3ded722edda4cf79454aaf61a50293fe24
+  metadata.gz: 5aae1c11924963643a52f60f94926412ae25142c37b46c80d29447562a48e89b4678d57a1363044e3778c875be6502f7535f46098686354e03475e871a8d5694
+  data.tar.gz: b05b8a0cef40e5ee4252586104a71b54221f4b232c787dad86c360b9d49b60531f725c2219235fd91a88a6b56d462e6c48c36abde1f90682a9a92fa4a0d25bf7

data/lib/cfn-model/model/bucket_policy.rb

@@ -1,8 +1,12 @@
 require_relative 'model_element'
 
 class AWS::S3::BucketPolicy  < ModelElement
+  # mapped from document
   attr_accessor :bucket, :policyDocument
 
+  # PolicyDocument - objectified policyDocument
+  attr_accessor :policy_document
+
   def initialize
     @resource_type = 'AWS::S3::BucketPolicy'
   end

data/lib/cfn-model/model/cfn_model.rb

@@ -40,6 +40,24 @@ class CfnModel
     @resources.values.select { |resource| resource.resource_type == resource_type }
   end
 
+  def find_security_group_by_group_id(security_group_reference)
+    security_group_id = References.resolve_security_group_id(security_group_reference)
+    if security_group_id.nil?
+      # leave it alone since external ref or something we don't grok
+      security_group_reference
+    else
+      matched_security_group = security_groups.find do |security_group|
+        security_group.logical_resource_id == security_group_id
+      end
+      if matched_security_group.nil?
+        # leave it alone since external ref or something we don't grok
+        security_group_reference
+      else
+        matched_security_group
+      end
+    end
+  end
+
   def to_s
     @resources.to_s
   end

data/lib/cfn-model/model/ec2_instance.rb

@@ -0,0 +1,15 @@
+require_relative 'model_element'
+
+class AWS::EC2::Instance  < ModelElement
+  attr_accessor :securityGroupIds, :networkInterfaces
+
+  # SecurityGroup objects based upon securityGroupIds
+  attr_accessor :security_groups
+
+  def initialize
+    @securityGroupIds = []
+    @networkInterfaces = []
+    @security_groups = []
+    @resource_type = 'AWS::EC2::Instance'
+  end
+end

data/lib/cfn-model/model/ec2_network_interface.rb

@@ -0,0 +1,18 @@
+require_relative 'model_element'
+
+class AWS::EC2::NetworkInterface  < ModelElement
+  attr_accessor :groupSet, :ipv6Addresses, :privateIpAddresses, :tags
+  attr_accessor :description, :ipv6AddressCount, :privateIpAddress, :secondaryPrivateIpAddressCount, :sourceDestCheck, :subnetId
+
+  # SecurityGroup objects based upon groupSet
+  attr_accessor :security_groups
+
+  def initialize
+    @groupSet = []
+    @ipv6Addresses = []
+    @privateIpAddresses = []
+    @tags = []
+    @security_groups = []
+    @resource_type = 'AWS::EC2::NetworkInterface'
+  end
+end

data/lib/cfn-model/model/iam_group.rb

@@ -3,19 +3,13 @@ require_relative 'model_element'
 class AWS::IAM::Group  < ModelElement
   attr_accessor :groupName, :managedPolicyArns, :path, :policies
 
+  # synthesized version of policies
+  attr_accessor :policy_objects
+
   def initialize
     @managedPolicyArns = []
     @policies = []
+    @policy_objects = []
     @resource_type = 'AWS::IAM::Group'
   end
 end
-
-
-class AWS::IAM::UserToGroupAddition  < ModelElement
-  attr_accessor :groupName, :users
-
-  def initialize
-    @users = []
-    @resource_type = 'AWS::IAM::UserToGroupAddition'
-  end
-end

data/lib/cfn-model/model/iam_managed_policy.rb

@@ -3,6 +3,8 @@ require_relative 'model_element'
 class AWS::IAM::ManagedPolicy < ModelElement
   attr_accessor :description, :managedPolicyName, :policyDocument, :groups, :roles, :users, :path
 
+  attr_accessor :policy_document
+
   def initialize
     @groups = []
     @roles = []

data/lib/cfn-model/model/iam_policy.rb

@@ -3,6 +3,8 @@ require_relative 'model_element'
 class AWS::IAM::Policy < ModelElement
   attr_accessor :policyName, :policyDocument, :groups, :roles, :users
 
+  attr_accessor :policy_document
+
   def initialize
     @groups = []
     @roles = []

data/lib/cfn-model/model/iam_role.rb

@@ -1,20 +1,14 @@
 require_relative 'model_element'
 
-class AWS::IAM::Role  < ModelElement
+class AWS::IAM::Role < ModelElement
   attr_accessor :roleName, :assumeRolePolicyDocument, :policies, :path, :managedPolicyArns
 
+  attr_accessor :policy_objects, :assume_role_policy_document
+
   def initialize
     @policies = []
     @managedPolicyArns = []
+    @policy_objects = []
     @resource_type = 'AWS::IAM::Role'
   end
 end
-
-class Policy
-  attr_accessor :policyName, :policyDocument
-
-  def ==(another_policy)
-    policyName == another_policy.policyName &&
-      policyDocument == another_policy.policyDocument
-  end
-end

data/lib/cfn-model/model/iam_user.rb

@@ -3,9 +3,14 @@ require_relative 'model_element'
 class AWS::IAM::User  < ModelElement
   attr_accessor :groups, :loginProfile, :path, :policies, :userName
 
+  # synthesized version of policies
+  attr_accessor :policy_objects, :group_names
+
   def initialize
     @groups = []
     @policies = []
+    @policy_objects = []
+    @group_names = []
     @resource_type = 'AWS::IAM::User'
   end
 end

data/lib/cfn-model/model/iam_user_to_group_addition.rb

@@ -0,0 +1,10 @@
+require_relative 'model_element'
+
+class AWS::IAM::UserToGroupAddition  < ModelElement
+  attr_accessor :groupName, :users
+
+  def initialize
+    @users = []
+    @resource_type = 'AWS::IAM::UserToGroupAddition'
+  end
+end

data/lib/cfn-model/model/load_balancer.rb

@@ -0,0 +1,37 @@
+require_relative 'model_element'
+
+class AWS::ElasticLoadBalancing::LoadBalancer < ModelElement
+  attr_accessor :securityGroups, :subnets, :tags, :scheme, :loadBalancerName, :crossZone, :availabilityZones, :connectionDrainingPolicy
+  attr_accessor :connectionSettings, :accessLoggingPolicy, :instances, :appCookieStickinessPolicy, :lBCookieStickinessPolicy, :healthCheck, :policies, :listeners
+
+  attr_accessor :security_groups
+
+  def initialize
+    @securityGroups = []
+    @security_groups = []
+    @subnets = []
+    @tags = []
+    @availabilityZones = []
+    @instances = []
+    @appCookieStickinessPolicy = []
+    @lBCookieStickinessPolicy = []
+    @policies = []
+    @listeners = []
+    @resource_type = 'AWS::ElasticLoadBalancing::LoadBalancer'
+  end
+end
+
+class AWS::ElasticLoadBalancingV2::LoadBalancer < ModelElement
+  attr_accessor :securityGroups, :loadBalancerAttributes, :subnets, :tags, :scheme, :name, :ipAddressType
+
+  attr_accessor :security_groups
+
+  def initialize
+    @securityGroups = []
+    @security_groups = []
+    @loadBalancerAttributes = []
+    @subnets = []
+    @tags = []
+    @resource_type = 'AWS::ElasticLoadBalancingV2::LoadBalancer'
+  end
+end

data/lib/cfn-model/model/model_element.rb

@@ -12,6 +12,10 @@ module AWS
 
   end
 
+  module ElasticLoadBalancingV2
+
+  end
+
   module IAM
 
   end

data/lib/cfn-model/model/policy.rb

@@ -0,0 +1,10 @@
+require_relative 'model_element'
+
+class Policy
+  attr_accessor :policy_name, :policy_document
+
+  def ==(another_policy)
+    policy_name == another_policy.policy_name &&
+      policy_document == another_policy.policy_document
+  end
+end

data/lib/cfn-model/model/queue_policy.rb

@@ -3,6 +3,9 @@ require_relative 'model_element'
 class AWS::SQS::QueuePolicy  < ModelElement
   attr_accessor :queues, :policyDocument
 
+  # PolicyDocument - objectified policyDocument
+  attr_accessor :policy_document
+
   def initialize
     @queues = []
     @resource_type = 'AWS::SQS::QueuePolicy'

data/lib/cfn-model/model/security_group.rb

@@ -5,9 +5,13 @@ class AWS::EC2::SecurityGroup < ModelElement
   attr_accessor :tags
   attr_accessor :securityGroupIngress, :securityGroupEgress
 
+  attr_accessor :ingresses, :egresses
+
   def initialize
     @securityGroupIngress = []
     @securityGroupEgress = []
+    @ingresses = []
+    @egresses = []
     @tags = []
     @resource_type = 'AWS::EC2::SecurityGroup'
   end

data/lib/cfn-model/model/topic_policy.rb

@@ -3,6 +3,9 @@ require_relative 'model_element'
 class AWS::SNS::TopicPolicy < ModelElement
   attr_accessor :topics, :policyDocument
 
+  # PolicyDocument - objectified policyDocument
+  attr_accessor :policy_document
+
   def initialize
     @topics = []
     @resource_type = 'AWS::SNS::TopicPolicy'

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

@@ -0,0 +1,10 @@
+class Ec2InstanceParser
+  def parse(cfn_model:, resource:)
+    ec2_instance = resource
+
+    ec2_instance.security_groups = ec2_instance.securityGroupIds.map do |security_group_reference|
+      cfn_model.find_security_group_by_group_id(security_group_reference)
+    end
+    ec2_instance
+  end
+end

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

@@ -0,0 +1,10 @@
+class Ec2NetworkInterfaceParser
+  def parse(cfn_model:, resource:)
+    network_interface = resource
+
+    network_interface.security_groups = network_interface.groupSet.map do |security_group_reference|
+      cfn_model.find_security_group_by_group_id(security_group_reference)
+    end
+    network_interface
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'cfn-model/model/iam_role'
+require 'cfn-model/model/policy'
+require_relative 'policy_document_parser'
+
+class IamGroupParser
+  def parse(cfn_model:, resource:)
+    iam_group = resource
+
+    iam_group.policy_objects = iam_group.policies.map do |policy|
+      new_policy = Policy.new
+      new_policy.policyName = policy['PolicyName']
+      new_policy.policyDocument = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
+      new_policy
+    end
+    iam_group
+  end
+end

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

@@ -1,20 +1,20 @@
 require 'cfn-model/model/iam_role'
-require 'cfn-model/model/policy_document'
+require 'cfn-model/model/policy'
 require_relative 'policy_document_parser'
 
 class IamRoleParser
   def parse(cfn_model:, resource:)
     iam_role = resource
 
-    iam_role.assumeRolePolicyDocument = PolicyDocumentParser.new.parse(iam_role.assumeRolePolicyDocument)
-
-    iam_role.policies = iam_role.policies.map do |policy|
+    iam_role.assume_role_policy_document = PolicyDocumentParser.new.parse(iam_role.assumeRolePolicyDocument)
 
+    iam_role.policy_objects = iam_role.policies.map do |policy|
       new_policy = Policy.new
-      new_policy.policyName = policy['PolicyName']
-      new_policy.policyDocument = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
+      new_policy.policy_name = policy['PolicyName']
+      new_policy.policy_document = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
       new_policy
     end
+
     iam_role
   end
 end

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

@@ -1,13 +1,25 @@
+require 'cfn-model/model/policy_document'
+require 'cfn-model/model/policy'
+require_relative 'policy_document_parser'
 
 class IamUserParser
   def parse(cfn_model:, resource:)
     iam_user = resource
 
+    iam_user.policy_objects = iam_user.policies.map do |policy|
+      new_policy = Policy.new
+      new_policy.policy_name = policy['PolicyName']
+      new_policy.policy_document = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
+      new_policy
+    end
+
+    iam_user.groups.each { |group_name| iam_user.group_names << group_name }
+
     user_to_group_additions = cfn_model.resources_by_type 'AWS::IAM::UserToGroupAddition'
     user_to_group_additions.each do |user_to_group_addition|
 
       if user_to_group_addition_has_username(user_to_group_addition.users,iam_user)
-        iam_user.groups << user_to_group_addition.groupName
+        iam_user.group_names << user_to_group_addition.groupName
 
         # we need to figure out the story on resolving Refs i think for this to be real
       end

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

@@ -0,0 +1,10 @@
+class LoadBalancerParser
+  def parse(cfn_model:, resource:)
+    load_balancer = resource
+
+    load_balancer.security_groups = load_balancer.securityGroups.map do |security_group_reference|
+      cfn_model.find_security_group_by_group_id(security_group_reference)
+    end
+    load_balancer
+  end
+end

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

@@ -0,0 +1,15 @@
+class LoadBalancerV2Parser
+  def parse(cfn_model:, resource:)
+    load_balancer = resource
+
+    #could be a List<Subnet::Id>
+    # if load_balancer.subnets.size < 2
+    #   raise ParserError.new("Load Balancer must have at least two subnets: #{load_balancer.logical_resource_id}")
+    # end
+
+    load_balancer.security_groups = load_balancer.securityGroups.map do |security_group_reference|
+      cfn_model.find_security_group_by_group_id(security_group_reference)
+    end
+    load_balancer
+  end
+end

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

@@ -6,12 +6,17 @@ class ParserRegistry
   def initialize
     @registry = {
       'AWS::EC2::SecurityGroup' => SecurityGroupParser,
+      'AWS::EC2::NetworkInterface' => Ec2NetworkInterfaceParser,
+      'AWS::EC2::Instance' => Ec2InstanceParser,
+      'AWS::ElasticLoadBalancing::LoadBalancer' => LoadBalancerParser,
+      'AWS::ElasticLoadBalancingV2::LoadBalancer' => LoadBalancerV2Parser,
+      'AWS::IAM::Group' => IamGroupParser,
       'AWS::IAM::User' => IamUserParser,
       'AWS::IAM::Role' => IamRoleParser,
       'AWS::IAM::Policy' => WithPolicyDocumentParser,
       'AWS::IAM::ManagedPolicy' => WithPolicyDocumentParser,
-      'AWS::SNS::TopicPolicy' => WithPolicyDocumentParser,
       'AWS::S3::BucketPolicy' => WithPolicyDocumentParser,
+      'AWS::SNS::TopicPolicy' => WithPolicyDocumentParser,
       'AWS::SQS::QueuePolicy' => WithPolicyDocumentParser
     }
   end

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

@@ -24,7 +24,7 @@ class SecurityGroupParser
       security_group.securityGroupIngress = [security_group.securityGroupIngress]
     end
 
-    security_group.securityGroupIngress = security_group.securityGroupIngress.map do |ingress|
+    security_group.ingresses = security_group.securityGroupIngress.map do |ingress|
       ingress_object = AWS::EC2::SecurityGroupIngress.new
       ingress.each do |k,v|
         ingress_object.send("#{initialLower(k)}=", v)
@@ -39,7 +39,7 @@ class SecurityGroupParser
       security_group.securityGroupEgress = [security_group.securityGroupEgress]
     end
 
-    security_group.securityGroupEgress = security_group.securityGroupEgress.map do |egress|
+    security_group.egresses = security_group.securityGroupEgress.map do |egress|
       egress_object = AWS::EC2::SecurityGroupEgress.new
       egress.each do |k,v|
         egress_object.send("#{initialLower(k)}=", v)
@@ -62,7 +62,7 @@ class SecurityGroupParser
       next if group_id.nil?
 
       if security_group.logical_resource_id == group_id
-        security_group.securityGroupIngress << security_group_ingress
+        security_group.ingresses << security_group_ingress
       end
     end
   end
@@ -76,7 +76,7 @@ class SecurityGroupParser
       next if group_id.nil?
 
       if security_group.logical_resource_id == group_id
-        security_group.securityGroupEgress << security_group_egress
+        security_group.egresses << security_group_egress
       end
     end
   end

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

@@ -4,7 +4,7 @@ require_relative 'policy_document_parser'
 
 class WithPolicyDocumentParser
   def parse(cfn_model:, resource:)
-    resource.policyDocument = PolicyDocumentParser.new.parse(resource.policyDocument)
+    resource.policy_document = PolicyDocumentParser.new.parse(resource.policyDocument)
     resource
   end
 end

data/lib/cfn-model/schema/AWS_EC2_Instance.yml

@@ -0,0 +1,146 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::EC2::Instance/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      BlockDeviceMappings:
+        type: seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              DeviceName:
+                type: any
+                required: yes
+              =:
+                type: any
+      ImageId:
+        type: any
+        required: yes
+      Ipv6Addresses:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Ipv6Address:
+                type: any
+                required: yes
+              =:
+                type: any
+      NetworkInterfaces:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              DeviceIndex:
+                type: any
+                required: yes
+              GroupSet:
+                type:   seq
+                required: no
+                sequence:
+                  - type:   any
+              Ipv6Addresses:
+                type:   seq
+                required: no
+                sequence:
+                  - type: map
+                    mapping:
+                      Ipv6Address:
+                        type: any
+                        required: yes
+                      =:
+                        type: any
+              PrivateIpAddresses:
+                type: seq
+                required: no
+                sequence:
+                  - type: map
+                    mapping:
+                      PrivateIpAddress:
+                        type: any
+                        required: yes
+                      Primary:
+                        type: any
+                        required: yes
+                      =:
+                        type: any
+              =:
+                type: any
+
+      # sigh this could be List<AWS::EC2::SecurityGroup::Id> so can't enfore seq
+      SecurityGroupIds:
+        type:   any
+        required: no
+
+      # sigh this could be List<AWS::EC2::SecurityGroup::GroupName> so can't enfore seq
+      SecurityGroups:
+        type:   any
+        required: no
+
+      SsmAssociations:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              AssociationParameters:
+                type:   seq
+                required: no
+                sequence:
+                  - type: map
+                    mapping:
+                      Key:
+                        type: any
+                        required: yes
+                      Value:
+                        type: seq
+                        required: yes
+                        sequence:
+                          - type: any
+                      =:
+                        type: any
+              DocumentName:
+                required: yes
+                type: any
+
+      Tags:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Key:
+                type: any
+                required: yes
+              Value:
+                type: any
+                required: yes
+              =:
+                type: any
+      Volumes:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Device:
+                type: any
+                required: yes
+              VolumeId:
+                type: any
+                required: yes
+              =:
+                type: any
+      =:
+        type: any
+  =:
+    type: any

data/lib/cfn-model/schema/AWS_EC2_NetworkInterface.yml

@@ -0,0 +1,62 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::EC2::NetworkInterface/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      # sigh this could be List<AWS::EC2::SecurityGroup::Id> so can't enfore seq
+      GroupSet:
+        type:   any
+        required: no
+
+      Ipv6Addresses:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Ipv6Address:
+                type: any
+                required: yes
+              =:
+                type: any
+      PrivateIpAddresses:
+        type: seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              PrivateIpAddress:
+                type: any
+                required: yes
+              Primary:
+                type: any
+                required: yes
+              =:
+                type: any
+      SubnetId:
+        type: any
+        required: yes
+      Tags:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Key:
+                type: any
+                required: yes
+              Value:
+                type: any
+                required: yes
+              =:
+                type: any
+      =:
+        type: any
+  =:
+    type: any

data/lib/cfn-model/schema/AWS_EC2_NetworkInterfaceAttachment.yml

@@ -0,0 +1,24 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::EC2::NetworkInterfaceAttachment/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      DeviceIndex:
+        type: any
+        required: yes
+      InstanceId:
+        type: any
+        required: yes
+      NetworkInterfaceId:
+        type: any
+        required: yes
+      =:
+        type: any
+  =:
+    type: any

data/lib/cfn-model/schema/AWS_EC2_SecurityGroup.yml

@@ -15,6 +15,20 @@ mapping:
       VpcId:
         type: any
         required: yes
+      Tags:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Key:
+                type: any
+                required: yes
+              Value:
+                type: any
+                required: yes
+              =:
+                type: any
 # this can be a Hash or an Array... kwalify doesn't seem to have a union concept so defer any such
 # validation into the parser object
 #      SecurityGroupIngress:

data/lib/cfn-model/schema/AWS_ElasticLoadBalancingV2_LoadBalancer.yml

@@ -0,0 +1,56 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::ElasticLoadBalancingV2::LoadBalancer/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      LoadBalancerAttributes:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Key:
+                type: any
+                required: yes
+              Value:
+                type: any
+                required: yes
+              =:
+                type: any
+
+      # sigh this could be List<AWS::EC2::SecurityGroup::Id> so can't enfore seq
+      SecurityGroups:
+        type:   any
+        required: no
+
+      # sigh this could be List<AWS::EC2::Subnet::Id> so can't enfore seq
+      Subnets:
+        type: any
+        required: yes
+
+      Tags:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Key:
+                type: any
+                required: yes
+              Value:
+                type: any
+                required: yes
+              =:
+                type: any
+      =:
+        type: any
+  =:
+    type: any
+
+

data/lib/cfn-model/schema/AWS_ElasticLoadBalancing_LoadBalancer.yml

@@ -21,11 +21,167 @@ mapping:
             required: yes
           =:
             type: any
+      AppCookieStickinessPolicy:
+        type:   seq
+        required: no
+        sequence:
+          - type:   map
+            mapping:
+              CookieName:
+                type: any
+                required: yes
+              PolicyName:
+                type: any
+                required: yes
+              =:
+                type: any
+
+      # sigh this could be List<AWS::EC2::AvailabilityZone::Name> so can't enfore seq
+      AvailabilityZones:
+        type:   any
+        required: no
+
+      ConnectionDrainingPolicy:
+        type: map
+        required: no
+        mapping:
+          Enabled:
+            type: any
+            required: yes
+          Timeout:
+            type: any
+            required: no
+          =:
+            type: any
+      ConnectionSettings:
+        type: map
+        required: no
+        mapping:
+          IdleTimeout:
+            type: any
+            required: yes
+          =:
+            type: any
+      HealthCheck:
+        type: map
+        required: no
+        mapping:
+          HealthyThreshold:
+            type: any
+            required: yes
+          Interval:
+            type: any
+            required: yes
+          Target:
+            type: any
+            required: yes
+          Timeout:
+            type: any
+            required: yes
+          UnhealthyThreshold:
+            type: any
+            required: yes
+          =:
+            type: any
+
+      # sigh this could be List<AWS::EC2::Instance::Id> so can't enfore seq
+      Instances:
+        type:   any
+        required: no
+
+      LBCookieStickinessPolicy:
+        type: map
+        required: no
+        mapping:
+          CookieExpirationPeriod:
+            type: any
+            required: no
+          PolicyName:
+            type: any
+            required: yes
+          =:
+            type: any
       Listeners:
         type:   seq
         required: yes
         sequence:
-          - type:   any
+          - type: map
+            mapping:
+              InstancePort:
+                type: any
+                required: yes
+              LoadBalancerPort:
+                type: any
+                required: yes
+              PolicyNames:
+                type:   seq
+                required: no
+                sequence:
+                  - type:   any
+              =:
+                type: any
+      Policies:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Attributes:
+                type:   seq
+                required: yes
+                sequence:
+                  - type: map
+                    required: yes
+                    mapping:
+                      Name:
+                        type: any
+                        required: yes
+                      Value:
+                        type: any
+                        required: yes
+                      =:
+                        type: any
+              InstancePorts:
+                type:   seq
+                required: no
+                sequence:
+                  - type:   any
+              LoadBalancerPorts:
+                type:   seq
+                required: no
+                sequence:
+                  - type:   any
+              PolicyName:
+                type: any
+                required: yes
+              PolicyType:
+                type: any
+                required: yes
+
+      # sigh this could be List<AWS::EC2::SecurityGroup::Id> so can't enfore seq
+      SecurityGroups:
+        type:   any
+        required: no
+
+      # sigh this could be List<AWS::EC2::Subnet::Id> so can't enfore seq
+      Subnets:
+        type:   any
+        required: no
+
+      Tags:
+        type:   seq
+        required: no
+        sequence:
+          - type: map
+            mapping:
+              Key:
+                type: any
+                required: yes
+              Value:
+                type: any
+                required: yes
+              =:
+                type: any
       =:
         type: any
   =:

data/lib/cfn-model/schema/AWS_IAM_User.yml

@@ -18,8 +18,8 @@ mapping:
         required: no
         mapping:
           Password:
-           type: any
-           required: yes
+            type: any
+            required: yes
           =:
             type: any
       ManagedPolicyArns:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kwalify
@@ -35,12 +35,17 @@ files:
 - lib/cfn-model.rb
 - lib/cfn-model/model/bucket_policy.rb
 - lib/cfn-model/model/cfn_model.rb
+- lib/cfn-model/model/ec2_instance.rb
+- lib/cfn-model/model/ec2_network_interface.rb
 - lib/cfn-model/model/iam_group.rb
 - lib/cfn-model/model/iam_managed_policy.rb
 - lib/cfn-model/model/iam_policy.rb
 - lib/cfn-model/model/iam_role.rb
 - lib/cfn-model/model/iam_user.rb
+- lib/cfn-model/model/iam_user_to_group_addition.rb
+- lib/cfn-model/model/load_balancer.rb
 - lib/cfn-model/model/model_element.rb
+- lib/cfn-model/model/policy.rb
 - lib/cfn-model/model/policy_document.rb
 - lib/cfn-model/model/principal.rb
 - lib/cfn-model/model/queue_policy.rb
@@ -51,17 +56,26 @@ files:
 - lib/cfn-model/model/statement.rb
 - lib/cfn-model/model/topic_policy.rb
 - lib/cfn-model/parser/cfn_parser.rb
+- lib/cfn-model/parser/ec2_instance_parser.rb
+- lib/cfn-model/parser/ec2_network_interface_parser.rb
+- lib/cfn-model/parser/iam_group_parser.rb
 - lib/cfn-model/parser/iam_role_parser.rb
 - lib/cfn-model/parser/iam_user_parser.rb
+- lib/cfn-model/parser/load_balancer_parser.rb
+- lib/cfn-model/parser/load_balancer_v2_parser.rb
 - lib/cfn-model/parser/parser_error.rb
 - lib/cfn-model/parser/parser_registry.rb
 - lib/cfn-model/parser/policy_document_parser.rb
 - lib/cfn-model/parser/security_group_parser.rb
 - lib/cfn-model/parser/with_policy_document_parser.rb
 - lib/cfn-model/schema/AWS_CloudFront_Distribution.yml
+- lib/cfn-model/schema/AWS_EC2_Instance.yml
+- lib/cfn-model/schema/AWS_EC2_NetworkInterface.yml
+- lib/cfn-model/schema/AWS_EC2_NetworkInterfaceAttachment.yml
 - lib/cfn-model/schema/AWS_EC2_SecurityGroup.yml
 - lib/cfn-model/schema/AWS_EC2_SecurityGroupEgress.yml
 - lib/cfn-model/schema/AWS_EC2_SecurityGroupIngress.yml
+- lib/cfn-model/schema/AWS_ElasticLoadBalancingV2_LoadBalancer.yml
 - lib/cfn-model/schema/AWS_ElasticLoadBalancing_LoadBalancer.yml
 - lib/cfn-model/schema/AWS_IAM_Group.yml
 - lib/cfn-model/schema/AWS_IAM_ManagedPolicy.yml