Merge pull request #19 from bmoller/molleb/develop

Template validation fixes

Author: andrew-glenn

templates/aws-vpc.template

@@ -597,8 +597,8 @@
                 "InstanceTenancy": {
                     "Ref": "VPCTenancy"
                 },
-                "EnableDnsSupport": "true",
-                "EnableDnsHostnames": "true",
+                "EnableDnsSupport": true,
+                "EnableDnsHostnames": true,
                 "Tags": [
                     {
                         "Key": "Name",
@@ -2498,27 +2498,27 @@
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "false",
+                "Egress": false,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet1BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet1BNetworkAclEntryOutbound": {
             "Condition": "AdditionalPrivateSubnetsCondition",
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "true",
+                "Egress": true,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet1BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet1BNetworkAclAssociation": {
@@ -2601,27 +2601,27 @@
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "false",
+                "Egress": false,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet2BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet2BNetworkAclEntryOutbound": {
             "Condition": "AdditionalPrivateSubnetsCondition",
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "true",
+                "Egress": true,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet2BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet2BNetworkAclAssociation": {
@@ -2704,27 +2704,27 @@
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "false",
+                "Egress": false,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet3BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet3BNetworkAclEntryOutbound": {
             "Condition": "AdditionalPrivateSubnets&3AZCondition",
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "true",
+                "Egress": true,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet3BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet3BNetworkAclAssociation": {
@@ -2807,27 +2807,27 @@
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "false",
+                "Egress": false,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet4BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet4BNetworkAclEntryOutbound": {
             "Condition": "AdditionalPrivateSubnets&4AZCondition",
             "Type": "AWS::EC2::NetworkAclEntry",
             "Properties": {
                 "CidrBlock": "0.0.0.0/0",
-                "Egress": "true",
+                "Egress": true,
                 "NetworkAclId": {
                     "Ref": "PrivateSubnet4BNetworkAcl"
                 },
-                "Protocol": "-1",
+                "Protocol": -1,
                 "RuleAction": "allow",
-                "RuleNumber": "100"
+                "RuleNumber": 100
             }
         },
         "PrivateSubnet4BNetworkAclAssociation": {
@@ -3016,6 +3016,7 @@
             }
         },
         "S3VPCEndpoint": {
+            "Condition": "PrivateSubnetsCondition",
             "Type": "AWS::EC2::VPCEndpoint",
             "Properties": {
                 "PolicyDocument": {
@@ -3446,6 +3447,7 @@
             }
         },
         "S3VPCEndpoint": {
+            "Condition": "PrivateSubnetsCondition",
             "Description": "S3 VPC Endpoint",
             "Value": {
                 "Ref": "S3VPCEndpoint"