Allow for patch in place (#3649)

* Allow for patch in place
aws-cloudformation · Sep 4, 2024 · e6eb757 · e6eb757
1 parent 466004b
commit e6eb757
Show file tree

Hide file tree

Showing 25 changed files with 247 additions and 27 deletions.
diff --git a/scripts/update_schemas_manually.py b/scripts/update_schemas_manually.py
@@ -1574,6 +1574,20 @@
                 ),
             ],
         ),
+        ResourcePatch(
+            resource_type="AWS::EC2::Subnet",
+            patches=[
+                Patch(
+                    values={
+                        "dependentExcluded": {
+                            "AvailabilityZone": ["AvailabilityZoneId"],
+                            "AvailabilityZoneId": ["AvailabilityZone"],
+                        },
+                    },
+                    path="/",
+                ),
+            ],
+        ),
     ]
 )
 

diff --git a/src/cfnlint/config.py b/src/cfnlint/config.py
@@ -533,6 +533,12 @@ def __call__(self, parser, namespace, values, option_string=None):
             help="Update the CloudFormation Specs",
             action="store_true",
         )
+        advanced.add_argument(
+            "-p",
+            "--patch-specs",
+            help="Patch the CloudFormation Specs in place",
+            action="store_true",
+        )
         advanced.add_argument(
             "--update-documentation", help=argparse.SUPPRESS, action="store_true"
         )
@@ -792,6 +798,10 @@ def custom_rules(self):
     def update_specs(self):
         return self._get_argument_value("update_specs", False, False)
 
+    @property
+    def patch_specs(self):
+        return self._get_argument_value("patch_specs", False, False)
+
     @property
     def update_documentation(self):
         return self._get_argument_value("update_documentation", False, False)

diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnet/manual.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_subnet/manual.json
@@ -0,0 +1,14 @@
+[
+ {
+  "op": "add",
+  "path": "/dependentExcluded",
+  "value": {
+   "AvailabilityZone": [
+    "AvailabilityZoneId"
+   ],
+   "AvailabilityZoneId": [
+    "AvailabilityZone"
+   ]
+  }
+ }
+]
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-subnet.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-subnet.json
@@ -33,6 +33,14 @@
    "type": "object"
   }
  },
+ "dependentExcluded": {
+  "AvailabilityZone": [
+   "AvailabilityZoneId"
+  ],
+  "AvailabilityZoneId": [
+   "AvailabilityZone"
+  ]
+ },
  "handlers": {
   "create": {
    "permissions": [

diff --git a/src/cfnlint/maintenance.py b/src/cfnlint/maintenance.py
@@ -29,6 +29,15 @@ def update_resource_specs(force: bool = False):
     PROVIDER_SCHEMA_MANAGER.update(force)
 
 
+def patch_resource_specs():
+    # Pool() uses cpu count if no number of processors is specified
+    # Pool() only implements the Context Manager protocol from Python3.3 onwards,
+    # so it will fail Python2.7 style linting, as well as throw AttributeError
+
+    # Update provider Schemas
+    PROVIDER_SCHEMA_MANAGER.patch_schemas()
+
+
 def update_documentation(rules):
     # Update the overview of all rules in the linter
     filename = "docs/rules.md"

diff --git a/src/cfnlint/runner.py b/src/cfnlint/runner.py
@@ -417,6 +417,10 @@ def cli(self) -> None:
             cfnlint.maintenance.update_resource_specs(self.config.force)
             sys.exit(0)
 
+        if self.config.patch_specs:
+            cfnlint.maintenance.patch_resource_specs()
+            sys.exit(0)
+
         if self.config.update_iam_policies:
             cfnlint.maintenance.update_iam_policies()
             sys.exit(0)