Use jsonpatch to fixup spec files before generating code

requirements-dev.txt

@@ -5,6 +5,9 @@
 cfn_flip>=1.0.2
 awacs>=2.0.0
 
+# ---- Use jsonpatch to fixup spec files
+jsonpatch
+
 # ---- Documentation Libraries
 Sphinx>=1.8
 sphinx_rtd_theme>=0.4.2

scripts/gen.py

@@ -3,8 +3,10 @@
 
 import argparse
 import json
+import os
 import sys
 
+import jsonpatch
 import yaml
 
 # Python code generator to create new troposphere classes from the
@@ -516,6 +518,13 @@ def process_file(filename, stub=False):
     f = open(args.filename[0])
     j = json.load(f)
 
+    # Apply json patches
+    patch_dir = "scripts/patches"
+    for patch_file in os.listdir(patch_dir):
+        if patch_file.endswith(".json"):
+            patch = json.loads(open(os.path.join(patch_dir, patch_file)).read())
+            j = jsonpatch.apply_patch(j, patch)
+
     spec_version = j["ResourceSpecificationVersion"]
 
     r = Resources()

scripts/patches/DataBrew.json

@@ -0,0 +1 @@
+[{"op": "add", "path": "/PropertyTypes/AWS::DataBrew::Recipe.Action/Properties/Parameters/Type", "value": "RecipeParameters"}]

scripts/patches/IoTSiteWise.json

@@ -0,0 +1,4 @@
+[
+{"op": "move", "from": "/PropertyTypes/AWS::IoTSiteWise::AccessPolicy.Portal", "path": "/PropertyTypes/AWS::IoTSiteWise::AccessPolicy.PortalProperty"},
+{"op": "replace", "path": "/PropertyTypes/AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource/Properties/Portal/Type", "value": "PortalProperty"}
+]

scripts/patches/NetworkFirewall.json

@@ -0,0 +1,6 @@
+[
+{"op": "move", "from": "/PropertyTypes/AWS::NetworkFirewall::RuleGroup.RuleGroup", "path": "/PropertyTypes/AWS::NetworkFirewall::RuleGroup.RuleGroupProperty"},
+{"op": "replace", "path": "/ResourceTypes/AWS::NetworkFirewall::RuleGroup/Properties/RuleGroup/Type", "value": "RuleGroupProperty"},
+{"op": "move", "from": "/PropertyTypes/AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy", "path": "/PropertyTypes/AWS::NetworkFirewall::FirewallPolicy.FirewallPolicyProperty"},
+{"op": "replace", "path": "/ResourceTypes/AWS::NetworkFirewall::FirewallPolicy/Properties/FirewallPolicy/Type", "value": "FirewallPolicyProperty"}
+]