Apply the rules to Ingress and Egress resources

aws-cloudformation · Jan 21, 2024 · f033ae7 · f033ae7
1 parent c1349a7
commit f033ae7
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 11 deletions.
diff --git a/...nloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json b/...nloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
@@ -1 +1 @@
-{"etag": "\"abbad2d61bce41659bca87b27e9ee78f\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"176f4e2894ec2acb6290a05a269e6140\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupegress/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupegress/__init__.py
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupegress/cfn_schemas.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupegress/cfn_schemas.json
@@ -0,0 +1,11 @@
+[
+ {
+  "op": "add",
+  "path": "/cfnSchema",
+  "value": [
+   "aws_ec2_securitygroup/protocols_and_port_ranges_include",
+   "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
+   "aws_ec2_securitygroup/all_to_and_from_ports"
+  ]
+ }
+]
diff --git a/...cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupingress/cfn_schemas.json b/...cfnlint/data/schemas/patches/extensions/all/aws_ec2_securitygroupingress/cfn_schemas.json
@@ -0,0 +1,11 @@
+[
+ {
+  "op": "add",
+  "path": "/cfnSchema",
+  "value": [
+   "aws_ec2_securitygroup/protocols_and_port_ranges_include",
+   "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
+   "aws_ec2_securitygroup/all_to_and_from_ports"
+  ]
+ }
+]
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-securitygroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-securitygroup.json
@@ -59,14 +59,6 @@
     "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
     "aws_ec2_securitygroup/all_to_and_from_ports"
    ],
-   "dependencies": {
-    "FromPort": [
-     "ToPort"
-    ],
-    "ToPort": [
-     "FromPort"
-    ]
-   },
    "properties": {
     "CidrIp": {
      "type": "string"

diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-securitygroupegress.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-securitygroupegress.json
@@ -1,5 +1,10 @@
 {
  "additionalProperties": false,
+ "cfnSchema": [
+  "aws_ec2_securitygroup/protocols_and_port_ranges_include",
+  "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
+  "aws_ec2_securitygroup/all_to_and_from_ports"
+ ],
  "createOnlyProperties": [
   "/properties/IpProtocol",
   "/properties/DestinationSecurityGroupId",

diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-securitygroupingress.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-securitygroupingress.json
@@ -1,5 +1,10 @@
 {
  "additionalProperties": false,
+ "cfnSchema": [
+  "aws_ec2_securitygroup/protocols_and_port_ranges_include",
+  "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
+  "aws_ec2_securitygroup/all_to_and_from_ports"
+ ],
  "createOnlyProperties": [
   "/properties/GroupName",
   "/properties/IpProtocol",

diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-securitygroupegress.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-securitygroupegress.json
@@ -1,5 +1,10 @@
 {
  "additionalProperties": false,
+ "cfnSchema": [
+  "aws_ec2_securitygroup/protocols_and_port_ranges_include",
+  "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
+  "aws_ec2_securitygroup/all_to_and_from_ports"
+ ],
  "createOnlyProperties": [
   "/properties/IpProtocol",
   "/properties/DestinationSecurityGroupId",

diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-securitygroupegress.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-securitygroupegress.json
@@ -1,5 +1,10 @@
 {
  "additionalProperties": false,
+ "cfnSchema": [
+  "aws_ec2_securitygroup/protocols_and_port_ranges_include",
+  "aws_ec2_securitygroup/protocols_and_port_ranges_exclude",
+  "aws_ec2_securitygroup/all_to_and_from_ports"
+ ],
  "createOnlyProperties": [
   "/properties/IpProtocol",
   "/properties/DestinationSecurityGroupId",

diff --git a/test/unit/module/cfn_yaml/test_yaml.py b/test/unit/module/cfn_yaml/test_yaml.py
@@ -26,7 +26,7 @@ def setUp(self):
             },
             "generic_bad": {
                 "filename": "test/fixtures/templates/bad/generic.yaml",
-                "failures": 33,
+                "failures": 34,
             },
         }
 

diff --git a/test/unit/module/test_rules_collections.py b/test/unit/module/test_rules_collections.py
@@ -53,7 +53,7 @@ def test_fail_run(self):
         filename = "test/fixtures/templates/bad/generic.yaml"
         template = cfnlint.decode.cfn_yaml.load(filename)
         cfn = Template(filename, template, ["us-east-1"])
-        expected_err_count = 36
+        expected_err_count = 37
         matches = []
         matches.extend(self.rules.run(filename, cfn))
         assert (
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"etag": "\"abbad2d61bce41659bca87b27e9ee78f\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
		{"etag": "\"176f4e2894ec2acb6290a05a269e6140\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}