Skip to content
This repository was archived by the owner on Oct 4, 2024. It is now read-only.

Commit 4dc56d6

Browse files
author
Brandon Moller
committed
Fixed develop branch build errors
- Resolved all ERROR-level validation errors in the template - Removed deprecated properties for EC2 instance NAT gateways - Added missing conditional dependant on private subnets for the S3 VPC endpoint
1 parent bf66bfe commit 4dc56d6

File tree

1 file changed

+28
-51
lines changed

1 file changed

+28
-51
lines changed

‎templates/aws-vpc.template‎

Lines changed: 28 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,6 @@
4444
"PrivateSubnetBTag3",
4545
"VPCTenancy"
4646
]
47-
},
48-
{
49-
"Label": {
50-
"default": "Deprecated: NAT Instance Configuration"
51-
},
52-
"Parameters": [
53-
"KeyPairName",
54-
"NATInstanceType"
55-
]
5647
}
5748
],
5849
"ParameterLabels": {
@@ -65,12 +56,6 @@
6556
"CreatePrivateSubnets": {
6657
"default": "Create private subnets"
6758
},
68-
"KeyPairName": {
69-
"default": "Deprecated: Key pair name"
70-
},
71-
"NATInstanceType": {
72-
"default": "Deprecated: NAT instance type"
73-
},
7459
"NumberOfAZs": {
7560
"default": "Number of Availability Zones"
7661
},
@@ -169,16 +154,6 @@
169154
"Description": "Set to false to create only public subnets. If false, the CIDR parameters for ALL private subnets will be ignored.",
170155
"Type": "String"
171156
},
172-
"KeyPairName": {
173-
"Description": "Deprecated. NAT gateways are now supported in all regions.",
174-
"Type": "String",
175-
"Default": "deprecated"
176-
},
177-
"NATInstanceType": {
178-
"Default": "deprecated",
179-
"Description": "Deprecated. NAT gateways are now supported in all regions.",
180-
"Type": "String"
181-
},
182157
"NumberOfAZs": {
183158
"AllowedValues": [
184159
"2",
@@ -597,8 +572,8 @@
597572
"InstanceTenancy": {
598573
"Ref": "VPCTenancy"
599574
},
600-
"EnableDnsSupport": "true",
601-
"EnableDnsHostnames": "true",
575+
"EnableDnsSupport": true,
576+
"EnableDnsHostnames": true,
602577
"Tags": [
603578
{
604579
"Key": "Name",
@@ -2498,27 +2473,27 @@
24982473
"Type": "AWS::EC2::NetworkAclEntry",
24992474
"Properties": {
25002475
"CidrBlock": "0.0.0.0/0",
2501-
"Egress": "false",
2476+
"Egress": false,
25022477
"NetworkAclId": {
25032478
"Ref": "PrivateSubnet1BNetworkAcl"
25042479
},
2505-
"Protocol": "-1",
2480+
"Protocol": -1,
25062481
"RuleAction": "allow",
2507-
"RuleNumber": "100"
2482+
"RuleNumber": 100
25082483
}
25092484
},
25102485
"PrivateSubnet1BNetworkAclEntryOutbound": {
25112486
"Condition": "AdditionalPrivateSubnetsCondition",
25122487
"Type": "AWS::EC2::NetworkAclEntry",
25132488
"Properties": {
25142489
"CidrBlock": "0.0.0.0/0",
2515-
"Egress": "true",
2490+
"Egress": true,
25162491
"NetworkAclId": {
25172492
"Ref": "PrivateSubnet1BNetworkAcl"
25182493
},
2519-
"Protocol": "-1",
2494+
"Protocol": -1,
25202495
"RuleAction": "allow",
2521-
"RuleNumber": "100"
2496+
"RuleNumber": 100
25222497
}
25232498
},
25242499
"PrivateSubnet1BNetworkAclAssociation": {
@@ -2601,27 +2576,27 @@
26012576
"Type": "AWS::EC2::NetworkAclEntry",
26022577
"Properties": {
26032578
"CidrBlock": "0.0.0.0/0",
2604-
"Egress": "false",
2579+
"Egress": false,
26052580
"NetworkAclId": {
26062581
"Ref": "PrivateSubnet2BNetworkAcl"
26072582
},
2608-
"Protocol": "-1",
2583+
"Protocol": -1,
26092584
"RuleAction": "allow",
2610-
"RuleNumber": "100"
2585+
"RuleNumber": 100
26112586
}
26122587
},
26132588
"PrivateSubnet2BNetworkAclEntryOutbound": {
26142589
"Condition": "AdditionalPrivateSubnetsCondition",
26152590
"Type": "AWS::EC2::NetworkAclEntry",
26162591
"Properties": {
26172592
"CidrBlock": "0.0.0.0/0",
2618-
"Egress": "true",
2593+
"Egress": true,
26192594
"NetworkAclId": {
26202595
"Ref": "PrivateSubnet2BNetworkAcl"
26212596
},
2622-
"Protocol": "-1",
2597+
"Protocol": -1,
26232598
"RuleAction": "allow",
2624-
"RuleNumber": "100"
2599+
"RuleNumber": 100
26252600
}
26262601
},
26272602
"PrivateSubnet2BNetworkAclAssociation": {
@@ -2704,27 +2679,27 @@
27042679
"Type": "AWS::EC2::NetworkAclEntry",
27052680
"Properties": {
27062681
"CidrBlock": "0.0.0.0/0",
2707-
"Egress": "false",
2682+
"Egress": false,
27082683
"NetworkAclId": {
27092684
"Ref": "PrivateSubnet3BNetworkAcl"
27102685
},
2711-
"Protocol": "-1",
2686+
"Protocol": -1,
27122687
"RuleAction": "allow",
2713-
"RuleNumber": "100"
2688+
"RuleNumber": 100
27142689
}
27152690
},
27162691
"PrivateSubnet3BNetworkAclEntryOutbound": {
27172692
"Condition": "AdditionalPrivateSubnets&3AZCondition",
27182693
"Type": "AWS::EC2::NetworkAclEntry",
27192694
"Properties": {
27202695
"CidrBlock": "0.0.0.0/0",
2721-
"Egress": "true",
2696+
"Egress": true,
27222697
"NetworkAclId": {
27232698
"Ref": "PrivateSubnet3BNetworkAcl"
27242699
},
2725-
"Protocol": "-1",
2700+
"Protocol": -1,
27262701
"RuleAction": "allow",
2727-
"RuleNumber": "100"
2702+
"RuleNumber": 100
27282703
}
27292704
},
27302705
"PrivateSubnet3BNetworkAclAssociation": {
@@ -2807,27 +2782,27 @@
28072782
"Type": "AWS::EC2::NetworkAclEntry",
28082783
"Properties": {
28092784
"CidrBlock": "0.0.0.0/0",
2810-
"Egress": "false",
2785+
"Egress": false,
28112786
"NetworkAclId": {
28122787
"Ref": "PrivateSubnet4BNetworkAcl"
28132788
},
2814-
"Protocol": "-1",
2789+
"Protocol": -1,
28152790
"RuleAction": "allow",
2816-
"RuleNumber": "100"
2791+
"RuleNumber": 100
28172792
}
28182793
},
28192794
"PrivateSubnet4BNetworkAclEntryOutbound": {
28202795
"Condition": "AdditionalPrivateSubnets&4AZCondition",
28212796
"Type": "AWS::EC2::NetworkAclEntry",
28222797
"Properties": {
28232798
"CidrBlock": "0.0.0.0/0",
2824-
"Egress": "true",
2799+
"Egress": true,
28252800
"NetworkAclId": {
28262801
"Ref": "PrivateSubnet4BNetworkAcl"
28272802
},
2828-
"Protocol": "-1",
2803+
"Protocol": -1,
28292804
"RuleAction": "allow",
2830-
"RuleNumber": "100"
2805+
"RuleNumber": 100
28312806
}
28322807
},
28332808
"PrivateSubnet4BNetworkAclAssociation": {
@@ -3016,6 +2991,7 @@
30162991
}
30172992
},
30182993
"S3VPCEndpoint": {
2994+
"Condition": "PrivateSubnetsCondition",
30192995
"Type": "AWS::EC2::VPCEndpoint",
30202996
"Properties": {
30212997
"PolicyDocument": {
@@ -3446,6 +3422,7 @@
34463422
}
34473423
},
34483424
"S3VPCEndpoint": {
3425+
"Condition": "PrivateSubnetsCondition",
34493426
"Description": "S3 VPC Endpoint",
34503427
"Value": {
34513428
"Ref": "S3VPCEndpoint"

0 commit comments

Comments
 (0)