cfn-model 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df7b00fc32259e430e24108cd53e3f9d6a314415
-  data.tar.gz: fdfe0f37dc53623ffda3fad4cd32b9aaa466b3fa
+  metadata.gz: 11842247e694adc589a0eec6a813f9d9e84df92e
+  data.tar.gz: 7a0c86cacc8e661245d9ccf137dc097dffa0baa8
 SHA512:
-  metadata.gz: 98060606e4d5a092a4b6619093f770b09b7bdf714a15dd93481f0c3df6b10ba6907afcfe26db0940cdb5a7cf9666b72acf828aa61a40f6e6c1cb6c68286d2f3f
-  data.tar.gz: 4e30e1684419ff1cab3d400dfcf5eb57591c9a6518ae7fea8fd6362788280c5d4bcbca9344eca566f8b4441bed5da4e8433c3ca910cbb652c3cf469eb992bff3
+  metadata.gz: fac13a07ddd7d808922f31dbaab5c659e4980012ba7ceb035b162022c1dd3ffc3c6a6d8c0d874478ac1422bee7d3a1b1d8f8236f9877d74ff4bd50bc1e61d292
+  data.tar.gz: 294a42bfd36cff5967c5eb91f2c027acfd3ffbbe453abdb71b9fff8149ec8efbbd0d1a95d61336a0e1787f1f091d0db2b936acc206a3816e94896c9b298a03f7

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

@@ -1,12 +1,8 @@
 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

@@ -39,26 +39,4 @@ class CfnModel
   def resources_by_type(resource_type)
     @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
 end

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

@@ -0,0 +1,21 @@
+require_relative 'model_element'
+
+##
+# This is the base class for a model element where we aren't anticipating
+# a schema or doing any fancier post-processing to think the element up
+# with other elements or wrap properties into higher-level objects
+#
+class DynamicModelElement < ModelElement
+  ##
+  # Treat any missing method as an instance variable get/set
+  #
+  # This will allow arbitrary elements in Resource/Properties definitions
+  # to map to instance variables without having to anticipate them in a schema
+  def method_missing(method_name, *args)
+    if method_name =~ /^(\w+)=$/
+      instance_variable_set "@#{$1}", args[0]
+    else
+      instance_variable_get "@#{method_name}"
+    end
+  end
+end

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

@@ -3,13 +3,19 @@ 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_policy.rb

@@ -3,8 +3,6 @@ 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,14 +1,20 @@
 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,14 +3,9 @@ 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/model_element.rb

@@ -12,10 +12,6 @@ module AWS
 
   end
 
-  module ElasticLoadBalancingV2
-
-  end
-
   module IAM
 
   end
@@ -41,10 +37,6 @@ module AWS
   end
 end
 
-module Custom
-
-end
-
 class ModelElement
   attr_accessor :logical_resource_id, :resource_type
 
@@ -70,19 +62,6 @@ END
 
   private
 
-  ##
-  # Treat any missing method as an instance variable get/set
-  #
-  # This will allow arbitrary elements in Resource/Properties definitions
-  # to map to instance variables without having to anticipate them in a schema
-  def method_missing(method_name, *args)
-    if method_name =~ /^(\w+)=$/
-      instance_variable_set "@#{$1}", args[0]
-    else
-      instance_variable_get "@#{method_name}"
-    end
-  end
-
   def instance_variables_without_at_sign
     self.instance_variables.map { |instance_variable| strip(instance_variable) }
   end

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

@@ -3,9 +3,6 @@ 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

@@ -2,17 +2,11 @@ require_relative 'model_element'
 
 class AWS::EC2::SecurityGroup < ModelElement
   attr_accessor :groupDescription, :vpcId
-  attr_accessor :tags
   attr_accessor :securityGroupIngress, :securityGroupEgress
 
-  attr_accessor :ingresses, :egresses
-
   def initialize
     @securityGroupIngress = []
     @securityGroupEgress = []
-    @ingresses = []
-    @egresses = []
-    @tags = []
     @resource_type = 'AWS::EC2::SecurityGroup'
   end
 end

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

@@ -3,9 +3,6 @@ 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/cfn_parser.rb

@@ -12,12 +12,9 @@ Dir["#{__dir__}/../model/*.rb"].each { |model| require "cfn-model/model/#{File.b
 #
 class CfnParser
   # this will convert any !Ref or !GetAtt into tranditional hash like in json
+  YAML.add_domain_type('', 'GetAtt') { |type, val| { 'Fn::GetAtt' => val } }
   YAML.add_domain_type('', 'Ref') { |type, val| { 'Ref' => val } }
 
-  %w(GetAtt Join Base64 Sub Split Select ImportValue GetAZs FindInMap And Or If Not).each do |function_name|
-    YAML.add_domain_type('', function_name) { |type, val| { "Fn::#{function_name}" => val } }
-  end
-
   ##
   # Given raw json/yml CloudFormation template, returns a CfnModel object
   # or raise ParserErrors if something is amiss with the format
@@ -85,7 +82,7 @@ class CfnParser
   def assign_fields_based_upon_properties(resource_object, resource)
     unless resource['Properties'].nil?
       resource['Properties'].each do |property_name, property_value|
-        resource_object.send("#{initial_lower(property_name)}=", property_value)
+        resource_object.send("#{initialLower(property_name)}=", property_value)
       end
     end
   end
@@ -94,33 +91,22 @@ class CfnParser
     begin
       resource_class = Object.const_get type_name, inherit=false
     rescue NameError
-      # puts "Never seen class: #{type_name} so going dynamic"
-      resource_class = generate_resource_class_from_type type_name
-    end
-    resource_class
-  end
+      puts "Never seen class: #{type_name} so going dynamic"
+      resource_class = Class.new(DynamicModelElement)
 
-  def initial_lower(str)
-    str.slice(0).downcase + str[1..(str.length)]
-  end
-
-  def generate_resource_class_from_type(type_name)
-    resource_class = Class.new(ModelElement)
-
-    module_names = type_name.split('::')
-    if module_names.first == 'Custom'
-      Object.const_set(module_names[1], resource_class)
-    elsif module_names.first == 'AWS'
       begin
-        module_constant = AWS.const_get(module_names[1])
+        module_constant = AWS.const_get(type_name.split('::')[1])
       rescue NameError
         module_constant = Module.new
-        module_constant.const_set(module_names[1], module_constant)
+        module_constant.const_set(type_name.split('::')[1], module_constant)
       end
-      module_constant.const_set(module_names[2], resource_class)
-    else
-      raise "Unknown namespace in resource type: #{module_names.first}"
+
+      module_constant.const_set(type_name.split('::')[2], resource_class)
     end
     resource_class
   end
+
+  def initialLower(str)
+    str.slice(0).downcase + str[1..(str.length)]
+  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'
+require 'cfn-model/model/policy_document'
 require_relative 'policy_document_parser'
 
 class IamRoleParser
   def parse(cfn_model:, resource:)
     iam_role = resource
 
-    iam_role.assume_role_policy_document = PolicyDocumentParser.new.parse(iam_role.assumeRolePolicyDocument)
+    iam_role.assumeRolePolicyDocument = PolicyDocumentParser.new.parse(iam_role.assumeRolePolicyDocument)
+
+    iam_role.policies = iam_role.policies.map do |policy|
 
-    iam_role.policy_objects = iam_role.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.policyName = policy['PolicyName']
+      new_policy.policyDocument = PolicyDocumentParser.new.parse(policy['PolicyDocument'])
       new_policy
     end
-
     iam_role
   end
 end

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

@@ -1,25 +1,13 @@
-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.group_names << user_to_group_addition.groupName
+        iam_user.groups << 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/parser_registry.rb

@@ -6,17 +6,12 @@ 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::S3::BucketPolicy' => WithPolicyDocumentParser,
       'AWS::SNS::TopicPolicy' => WithPolicyDocumentParser,
+      'AWS::S3::BucketPolicy' => 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.ingresses = security_group.securityGroupIngress.map do |ingress|
+    security_group.securityGroupIngress = 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.egresses = security_group.securityGroupEgress.map do |egress|
+    security_group.securityGroupEgress = 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.ingresses << security_group_ingress
+        security_group.securityGroupIngress << 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.egresses << security_group_egress
+        security_group.securityGroupEgress << 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.policy_document = PolicyDocumentParser.new.parse(resource.policyDocument)
+    resource.policyDocument = PolicyDocumentParser.new.parse(resource.policyDocument)
     resource
   end
 end

data/lib/cfn-model/schema/{AWS_EC2_SecurityGroup.yml → AWS::EC2::SecurityGroup.yml}

@@ -15,20 +15,6 @@ 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::ElasticLoadBalancing::LoadBalancer.yml

@@ -0,0 +1,32 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::ElasticLoadBalancing::LoadBalancer/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      AccessLoggingPolicy:
+        type: map
+        required: no
+        mapping:
+          Enabled:
+            type: any
+            required: yes
+          S3BucketName:
+            type: any
+            required: yes
+          =:
+            type: any
+      Listeners:
+        type:   seq
+        required: yes
+        sequence:
+          - type:   any
+      =:
+        type: any
+  =:
+    type: any

data/lib/cfn-model/schema/{AWS_IAM_User.yml → AWS::IAM::User.yml}

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

data/lib/cfn-model/validator/schema_generator.rb

@@ -46,9 +46,6 @@ class SchemaGenerator
         'mapping' => {
           'Type' => {
             'type' => 'str'
-          },
-          '=' => {
-            'type' => 'any'
           }
         }
       }
@@ -71,7 +68,7 @@ class SchemaGenerator
   end
 
   def schema_file(file)
-    "#{__dir__}/../schema/#{file.gsub(/::/, '_')}"
+    "#{__dir__}/../schema/#{file}"
   end
 
   def schema_for_type(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kwalify
@@ -26,26 +26,19 @@ dependencies:
         version: 0.7.2
 description: An object model for CloudFormation templates
 email: 
-executables:
-- cfn_parse
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/cfn_parse
 - 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/dynamic_model_element.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
@@ -56,37 +49,28 @@ 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
-- lib/cfn-model/schema/AWS_IAM_Policy.yml
-- lib/cfn-model/schema/AWS_IAM_Role.yml
-- lib/cfn-model/schema/AWS_IAM_User.yml
-- lib/cfn-model/schema/AWS_IAM_UserToGroupAddition.yml
-- lib/cfn-model/schema/AWS_Lambda_Permission.yml
-- lib/cfn-model/schema/AWS_S3_BucketPolicy.yml
-- lib/cfn-model/schema/AWS_SNS_TopicPolicy.yml
-- lib/cfn-model/schema/AWS_SQS_QueuePolicy.yml
+- lib/cfn-model/schema/AWS::CloudFront::Distribution.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::ElasticLoadBalancing::LoadBalancer.yml
+- lib/cfn-model/schema/AWS::IAM::Group.yml
+- lib/cfn-model/schema/AWS::IAM::ManagedPolicy.yml
+- lib/cfn-model/schema/AWS::IAM::Policy.yml
+- lib/cfn-model/schema/AWS::IAM::Role.yml
+- lib/cfn-model/schema/AWS::IAM::User.yml
+- lib/cfn-model/schema/AWS::IAM::UserToGroupAddition.yml
+- lib/cfn-model/schema/AWS::Lambda::Permission.yml
+- lib/cfn-model/schema/AWS::S3::BucketPolicy.yml
+- lib/cfn-model/schema/AWS::SNS::TopicPolicy.yml
+- lib/cfn-model/schema/AWS::SQS::QueuePolicy.yml
 - lib/cfn-model/schema/schema.yml.erb
 - lib/cfn-model/validator/cloudformation_validator.rb
 - lib/cfn-model/validator/reference_validator.rb

data/bin/cfn_parse

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-require 'cfn-model'
-
-puts '======'
-puts ARGV[0]
-puts '======'
-cfn_model = CfnParser.new.parse IO.read(ARGV[0])
-puts cfn_model

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

@@ -1,15 +0,0 @@
-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