cfn-model 0.4.27 → 0.4.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5feb1962cc34b035503b0359a30d5dbbfd55d23f2c6753c8a4ede574f49d32e
-  data.tar.gz: 33e6ffd7bd6c8b543f696176b02e1443ddac8924ddaac58bd24a49bdeb8d820a
+  metadata.gz: df1ac14db4c825a752953a999fca09e56eaaa3e7141146bea1892cfe0c1f350c
+  data.tar.gz: 010c17ccd4d19b1999768d8b41b71dd98f6cca02713cf3065ac6cf208ee4d4f2
 SHA512:
-  metadata.gz: e411bd196fbfcb2e372c1e46bb6be0dad34c94193e2fdd182092f090f63617e8df3f4942b5b076cfb272b82fe05a6a0515b408a873119b932f925f19d34b20d4
-  data.tar.gz: 40eeee5ae68f71008117469f9aa4639b40770c997657d28a4b048377d59e926d5c3c2128e65dbf4e06f4dc39c65a18043d581273b9bad0218f1223217a70825b
+  metadata.gz: 2530d80cc408f921c69ec5757c6b4c73a064a1d6e7c980cce9dd3a0441bdd501e82685ceff915c756ea7a4cd4fd52f712ddb7cd63a190686abc9b8613b63de05
+  data.tar.gz: 8f053b02001d51fb7f4130e6b77d0e9cc7d3c36f35d8e3b9c3d55b6d9cc610a9ab02cdb8604c4385556819aa4e7581f2bf23cd912b910220b0f7c7bfd13d8dd6

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

@@ -3,13 +3,11 @@
 require_relative 'model_element'
 
 class AWS::EC2::NetworkAcl < ModelElement
-  attr_accessor :network_acl_egress_entries
-  attr_accessor :network_acl_ingress_entries
+  attr_accessor :network_acl_entries
 
   def initialize(cfn_model)
     super
-    @network_acl_egress_entries = []
-    @network_acl_ingress_entries = []
+    @network_acl_entries = []
     @resource_type = 'AWS::EC2::NetworkAcl'
   end
-end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_relative 'model_element'
+
+class AWS::EC2::NetworkAclEntry < ModelElement
+  def initialize(cfn_model)
+    super
+    @resource_type = 'AWS::EC2::NetworkAclEntry'
+  end
+end

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

@@ -8,45 +8,23 @@ require 'cfn-model/util/truthy'
 class Ec2NetworkAclParser
   def parse(cfn_model:, resource:)
     network_acl = resource
-
     attach_nacl_entries_to_nacl(cfn_model: cfn_model, network_acl: network_acl)
     network_acl
   end
 
   private
 
-  def egress_network_acl_entries(cfn_model)
-    network_acl_entries = cfn_model.resources_by_type 'AWS::EC2::NetworkAclEntry'
-    network_acl_entries.select(&:egress)
-  end
-
-  def ingress_network_acl_entries(cfn_model)
-    network_acl_entries = cfn_model.resources_by_type 'AWS::EC2::NetworkAclEntry'
-    network_acl_entries.select do |network_acl_entry|
-      not_truthy?(network_acl_entry.egress)
-    end
-  end
-
-  def egress_nacl_entries_for_nacl(cfn_model, logical_resource_id)
-    egress_nacl_entries = egress_network_acl_entries(cfn_model)
-    egress_nacl_entries.select do |egress_nacl_entry|
-      References.resolve_resource_id(egress_nacl_entry.networkAclId) == logical_resource_id
-    end
-  end
-
-  def ingress_nacl_entries_for_nacl(cfn_model, logical_resource_id)
-    ingress_nacl_entries = ingress_network_acl_entries(cfn_model)
-    ingress_nacl_entries.select do |ingress_nacl_entry|
-      References.resolve_resource_id(ingress_nacl_entry.networkAclId) == logical_resource_id
+  def nacl_entries_for_nacl(cfn_model, logical_resource_id)
+    network_acl_entries = cfn_model.resources_by_type('AWS::EC2::NetworkAclEntry')
+                                   .select do |network_acl_entry|
+      References.resolve_resource_id(network_acl_entry.networkAclId) == logical_resource_id
     end
+    network_acl_entries
   end
 
   def attach_nacl_entries_for_nacl(cfn_model, network_acl)
-    egress_nacl_entries_for_nacl(cfn_model, network_acl.logical_resource_id).each do |egress_entry|
-      network_acl.network_acl_egress_entries << egress_entry.logical_resource_id
-    end
-    ingress_nacl_entries_for_nacl(cfn_model, network_acl.logical_resource_id).each do |ingress_entry|
-      network_acl.network_acl_ingress_entries << ingress_entry.logical_resource_id
+    nacl_entries_for_nacl(cfn_model, network_acl.logical_resource_id).each do |network_acl_entry|
+      network_acl.network_acl_entries << network_acl_entry
     end
   end
 

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

@@ -0,0 +1,15 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::EC2::NetworkAcl/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      =:
+        type: any
+  =:
+    type: any

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

@@ -0,0 +1,21 @@
+---
+type: map
+mapping:
+  Type:
+    type: str
+    required: yes
+    pattern: /AWS::EC2::NetworkAclEntry/
+  Properties:
+    type: map
+    required: yes
+    mapping:
+      Icmp:
+        type: any
+        required: no
+      PortRange:
+        type: any
+        required: no
+      =:
+        type: any
+  =:
+    type: any

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.4.27
+  version: 0.4.28
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -67,6 +67,7 @@ files:
 - lib/cfn-model/model/cfn_model.rb
 - lib/cfn-model/model/ec2_instance.rb
 - lib/cfn-model/model/ec2_network_acl.rb
+- lib/cfn-model/model/ec2_network_acl_entry.rb
 - lib/cfn-model/model/ec2_network_interface.rb
 - lib/cfn-model/model/iam_group.rb
 - lib/cfn-model/model/iam_managed_policy.rb
@@ -115,6 +116,8 @@ files:
 - lib/cfn-model/psych/visitors/to_ruby_with_line_numbers.rb
 - lib/cfn-model/schema/AWS_CloudFront_Distribution.yml
 - lib/cfn-model/schema/AWS_EC2_Instance.yml
+- lib/cfn-model/schema/AWS_EC2_NetworkAcl.yml
+- lib/cfn-model/schema/AWS_EC2_NetworkAclEntry.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