Adding Lint tests, modifications to Marco Fragment output for correct…

… types
ElendelOSS · Jan 10, 2019 · ac679a2 · ac679a2
1 parent 88089d4
commit ac679a2
Show file tree

Hide file tree

Showing 14 changed files with 6,425 additions and 2,452 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
 kombustion.yaml
 *.zip
-*.pyc
-*/*.pyc
+*.__pycache__
+__pycache__
+.cache
 *~
+*.pyc
 *.swp
 .coverage
 coverage*

diff --git a/requirements_test.txt b/requirements_test.txt
@@ -6,4 +6,6 @@ pycodestyle==2.2.0
 coverage==4.3.4
 pynt==0.8.1
 pyyaml>=4.2b1
-coveralls==1.5.1
+coveralls==1.5.1
+awscli>=1.16.85
+cfn-lint>=0.11.1
diff --git a/src/__init__.pyc b/src/__init__.pyc
diff --git a/src/macro.py b/src/macro.py
@@ -16,6 +16,13 @@ def isIPv6Route(cidr):
         return "DestinationCidrBlock"
 
 
+def str2bool(v):
+    if v.lower() in ("yes", "true", "t", "1"):
+        return True
+    else:
+        return False
+
+
 def buildTransitGateways(properties, resources, outputs):
     for transitgw, objects in properties["TransitGateways"].iteritems():
         resources[transitgw + "TransitGWAttach"] = {
@@ -241,17 +248,17 @@ def buildNetworlACLs(properties, resources, outputs):
                 "Type": "AWS::EC2::NetworkAclEntry",
                 "Properties": {
                     isIPv6NetACL(splitset[4]): splitset[4],
-                    "Egress": splitset[3],
+                    "Egress": str2bool(splitset[3]),
                     "NetworkAclId": {
                         "Ref": networkacl
                     },
                     "PortRange": {
-                        "From": splitset[5],
-                        "To": splitset[6]
+                        "From": int(splitset[5]),
+                        "To": int(splitset[6])
                     },
-                    "Protocol": splitset[1],
+                    "Protocol": int(splitset[1]),
                     "RuleAction": splitset[2],
-                    "RuleNumber": splitset[0]
+                    "RuleNumber": int(splitset[0])
                 }
             }
 
@@ -428,8 +435,8 @@ def buildBaseline(properties, resources, outputs):
         "Type": "AWS::EC2::VPC",
         "Properties": {
             "CidrBlock": properties["CIDR"],
-            "EnableDnsHostnames": "true",
-            "EnableDnsSupport": "true",
+            "EnableDnsHostnames": True,
+            "EnableDnsSupport": True,
             "InstanceTenancy": "default",
             "Tags": [
                 {
@@ -460,7 +467,7 @@ def buildBaseline(properties, resources, outputs):
                     "VpcId": {
                         "Ref": properties["Details"]["VPCName"]
                     },
-                    "AmazonProvidedIpv6CidrBlock": "true"
+                    "AmazonProvidedIpv6CidrBlock": True
                 }
             }
 

diff --git a/src/macro.pyc b/src/macro.pyc
diff --git a/tests/.cache/v/cache/lastfailed b/tests/.cache/v/cache/lastfailed
diff --git a/tests/__init__.pyc b/tests/__init__.pyc
diff --git a/tests/__pycache__/test_functions.cpython-27-PYTEST.pyc b/tests/__pycache__/test_functions.cpython-27-PYTEST.pyc
diff --git a/tests/__pycache__/test_vpcbulder.cpython-27-PYTEST.pyc b/tests/__pycache__/test_vpcbulder.cpython-27-PYTEST.pyc
diff --git a/tests/__pycache__/test_vpcbulder_all.cpython-27-PYTEST.pyc b/tests/__pycache__/test_vpcbulder_all.cpython-27-PYTEST.pyc