Skip to content

Commit 872d688

Browse files
author
tallu
committed
fixes
1 parent 31d0bfb commit 872d688

File tree

4 files changed

+0
-98
lines changed

4 files changed

+0
-98
lines changed

‎CHANGELOG.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,9 @@
33

44

55

6-
<<<<<<< HEAD
76
<a name="v1.57.0"></a>
87
## [v1.57.0] - 2019-02-21
98

10-
=======
11-
<a name="v1.58.0"></a>
12-
## [v1.58.0] - 2019-03-01
13-
14-
- API gateway Endpoint ([#225](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/225))
15-
16-
17-
<a name="v1.57.0"></a>
18-
## [v1.57.0] - 2019-02-21
19-
20-
- Bump version
21-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
229
- Added CHANGELOG.md ([#221](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/221))
2310

2411

@@ -391,23 +378,13 @@
391378
- Reverted bad merge, fixed [#33](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/33)
392379

393380

394-
<<<<<<< HEAD
395381
<a name="v1.5.0"></a>
396382
## [v1.5.0] - 2017-11-23
397383

398384

399385

400386
<a name="v1.5.1"></a>
401387
## [v1.5.1] - 2017-11-23
402-
=======
403-
<a name="v1.5.1"></a>
404-
## [v1.5.1] - 2017-11-23
405-
406-
407-
408-
<a name="v1.5.0"></a>
409-
## [v1.5.0] - 2017-11-23
410-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
411388

412389
- Reverted bad merge, fixed [#33](https://github.com/terraform-aws-modules/terraform-aws-vpc/issues/33)
413390
- Set enable_dns_support=true by default
@@ -485,12 +462,7 @@
485462
- Initial commit
486463

487464

488-
<<<<<<< HEAD
489465
[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.57.0...HEAD
490-
=======
491-
[Unreleased]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.58.0...HEAD
492-
[v1.58.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.57.0...v1.58.0
493-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
494466
[v1.57.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.56.0...v1.57.0
495467
[v1.56.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.55.0...v1.56.0
496468
[v1.55.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.54.0...v1.55.0
@@ -547,15 +519,9 @@
547519
[v1.8.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.7.0...v1.8.0
548520
[v1.7.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.6.0...v1.7.0
549521
[v1.6.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.4.1...v1.6.0
550-
<<<<<<< HEAD
551522
[v1.4.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.0...v1.4.1
552523
[v1.5.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.1...v1.5.0
553524
[v1.5.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.4.0...v1.5.1
554-
=======
555-
[v1.4.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.1...v1.4.1
556-
[v1.5.1]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.5.0...v1.5.1
557-
[v1.5.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.4.0...v1.5.0
558-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
559525
[v1.4.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.3.0...v1.4.0
560526
[v1.3.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.2.0...v1.3.0
561527
[v1.2.0]: https://github.com/terraform-aws-modules/terraform-aws-vpc/compare/v1.1.0...v1.2.0

‎README.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ These types of resources are supported:
1515
* [VPN Gateway](https://www.terraform.io/docs/providers/aws/r/vpn_gateway.html)
1616
* [VPC Endpoint](https://www.terraform.io/docs/providers/aws/r/vpc_endpoint.html):
1717
* Gateway: S3, DynamoDB
18-
<<<<<<< HEAD
19-
* Interface: EC2, SSM, EC2 Messages, SSM Messages, ECR API, ECR DKR
20-
=======
2118
* Interface: EC2, SSM, EC2 Messages, SSM Messages, ECR API, ECR DKR, API Gateway
22-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
2319
* [RDS DB Subnet Group](https://www.terraform.io/docs/providers/aws/r/db_subnet_group.html)
2420
* [ElastiCache Subnet Group](https://www.terraform.io/docs/providers/aws/r/elasticache_subnet_group.html)
2521
* [Redshift Subnet Group](https://www.terraform.io/docs/providers/aws/r/redshift_subnet_group.html)
@@ -186,12 +182,6 @@ Terraform version 0.10.3 or newer is required for this module to work.
186182
| Name | Description | Type | Default | Required |
187183
|------|-------------|:----:|:-----:|:-----:|
188184
| amazon\_side\_asn | The Autonomous System Number (ASN) for the Amazon side of the gateway. By default the virtual private gateway is created with the current default Amazon ASN. | string | `"64512"` | no |
189-
<<<<<<< HEAD
190-
=======
191-
| apigw\_endpoint\_private\_dns\_enabled | Whether or not to associate a private hosted zone with the specified VPC for API GW endpoint | string | `"false"` | no |
192-
| apigw\_endpoint\_security\_group\_ids | The ID of one or more security groups to associate with the network interface for API GW endpoint | list | `[]` | no |
193-
| apigw\_endpoint\_subnet\_ids | The ID of one or more subnets in which to create a network interface for API GW endpoint. Only a single subnet within an AZ is supported. If omitted, private subnets will be used. | list | `[]` | no |
194-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
195185
| assign\_generated\_ipv6\_cidr\_block | Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length for the VPC. You cannot specify the range of IP addresses, or the size of the CIDR block | string | `"false"` | no |
196186
| azs | A list of availability zones in the region | list | `[]` | no |
197187
| cidr | The CIDR block for the VPC. Default value is a valid CIDR, but not acceptable by AWS and should be overridden | string | `"0.0.0.0/0"` | no |
@@ -236,10 +226,6 @@ Terraform version 0.10.3 or newer is required for this module to work.
236226
| elasticache\_subnet\_suffix | Suffix to append to elasticache subnets name | string | `"elasticache"` | no |
237227
| elasticache\_subnet\_tags | Additional tags for the elasticache subnets | map | `{}` | no |
238228
| elasticache\_subnets | A list of elasticache subnets | list | `[]` | no |
239-
<<<<<<< HEAD
240-
=======
241-
| enable\_apigw\_endpoint | Should be true if you want to provision an api gateway endpoint to the VPC | string | `"false"` | no |
242-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
243229
| enable\_dhcp\_options | Should be true if you want to specify a DHCP options set with a custom domain name, DNS servers, NTP servers, netbios servers, and/or netbios server type | string | `"false"` | no |
244230
| enable\_dns\_hostnames | Should be true to enable DNS hostnames in the VPC | string | `"false"` | no |
245231
| enable\_dns\_support | Should be true to enable DNS support in the VPC | string | `"true"` | no |
@@ -257,10 +243,7 @@ Terraform version 0.10.3 or newer is required for this module to work.
257243
| igw\_tags | Additional tags for the internet gateway | map | `{}` | no |
258244
| instance\_tenancy | A tenancy option for instances launched into the VPC | string | `"default"` | no |
259245
| intra\_route\_table\_tags | Additional tags for the intra route tables | map | `{}` | no |
260-
<<<<<<< HEAD
261-
=======
262246
| intra\_subnet\_suffix | Suffix to append to intra subnets name | string | `"intra"` | no |
263-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
264247
| intra\_subnet\_tags | Additional tags for the intra subnets | map | `{}` | no |
265248
| intra\_subnets | A list of intra subnets | list | `[]` | no |
266249
| manage\_default\_vpc | Should be true to adopt and manage Default VPC | string | `"false"` | no |

‎main.tf

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -530,30 +530,6 @@ resource "aws_vpc_endpoint" "ecr_dkr" {
530530
private_dns_enabled = "${var.ecr_dkr_endpoint_private_dns_enabled}"
531531
}
532532

533-
<<<<<<< HEAD
534-
=======
535-
#######################
536-
# VPC Endpoint for API Gateway
537-
#######################
538-
data "aws_vpc_endpoint_service" "apigw" {
539-
count = "${var.create_vpc && var.enable_apigw_endpoint ? 1 : 0}"
540-
541-
service = "execute-api"
542-
}
543-
544-
resource "aws_vpc_endpoint" "apigw" {
545-
count = "${var.create_vpc && var.enable_apigw_endpoint ? 1 : 0}"
546-
547-
vpc_id = "${local.vpc_id}"
548-
service_name = "${data.aws_vpc_endpoint_service.apigw.service_name}"
549-
vpc_endpoint_type = "Interface"
550-
551-
security_group_ids = ["${var.apigw_endpoint_security_group_ids}"]
552-
subnet_ids = ["${coalescelist(var.apigw_endpoint_subnet_ids, aws_subnet.private.*.id)}"]
553-
private_dns_enabled = "${var.apigw_endpoint_private_dns_enabled}"
554-
}
555-
556-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
557533
##########################
558534
# Route table association
559535
##########################

‎variables.tf

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -208,29 +208,6 @@ variable "enable_ssmmessages_endpoint" {
208208
default = false
209209
}
210210

211-
<<<<<<< HEAD
212-
=======
213-
variable "enable_apigw_endpoint" {
214-
description = "Should be true if you want to provision an api gateway endpoint to the VPC"
215-
default = false
216-
}
217-
218-
variable "apigw_endpoint_security_group_ids" {
219-
description = "The ID of one or more security groups to associate with the network interface for API GW endpoint"
220-
default = []
221-
}
222-
223-
variable "apigw_endpoint_private_dns_enabled" {
224-
description = "Whether or not to associate a private hosted zone with the specified VPC for API GW endpoint"
225-
default = false
226-
}
227-
228-
variable "apigw_endpoint_subnet_ids" {
229-
description = "The ID of one or more subnets in which to create a network interface for API GW endpoint. Only a single subnet within an AZ is supported. If omitted, private subnets will be used."
230-
default = []
231-
}
232-
233-
>>>>>>> 417c3018b4419c98e0d1c21048a7077199245c93
234211
variable "ssmmessages_endpoint_security_group_ids" {
235212
description = "The ID of one or more security groups to associate with the network interface for SSMMESSAGES endpoint"
236213
default = []

0 commit comments

Comments
 (0)