Commit bc0a43c

committed

Fixed when private_ips is empty (fixed terraform-aws-modules#103)

1 parent cbc3bb2 commit bc0a43cCopy full SHA for bc0a43c

File tree

2 files changed

+17

-24

lines changed

examples/basic
- main.tf
main.tf

2 files changed

+17

-24

lines changed

`‎examples/basic/main.tf‎`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ module "ec2" {`
`63`	`63`
`64`	`64`	`instance_count = 2`
`65`	`65`
`66`		`- name = "example-normal"`
`67`		`- ami = data.aws_ami.amazon_linux.id`
`68`		`- instance_type = "c5.large"`
`69`		`- subnet_id = tolist(data.aws_subnet_ids.all.ids)[0]`
`70`		`- private_ip = ["123.0.0.1", "123.0.0.2"]`
	`66`	`+ name = "example-normal"`
	`67`	`+ ami = data.aws_ami.amazon_linux.id`
	`68`	`+ instance_type = "c5.large"`
	`69`	`+ subnet_id = tolist(data.aws_subnet_ids.all.ids)[0]`
	`70`	`+ // private_ips = ["172.31.32.5", "172.31.46.20"]`
`71`	`71`	`vpc_security_group_ids = [module.security_group.this_security_group_id]`
`72`	`72`	`associate_public_ip_address = true`
`73`	`73`	`placement_group = aws_placement_group.web.id`
`@@ -90,11 +90,12 @@ module "ec2_with_t2_unlimited" {`
`90`	`90`
`91`	`91`	`instance_count = 1`
`92`	`92`
`93`		`- name = "example-t2-unlimited"`
`94`		`- ami = data.aws_ami.amazon_linux.id`
`95`		`- instance_type = "t2.micro"`
`96`		`- cpu_credits = "unlimited"`
`97`		`- subnet_id = tolist(data.aws_subnet_ids.all.ids)[0]`
	`93`	`+ name = "example-t2-unlimited"`
	`94`	`+ ami = data.aws_ami.amazon_linux.id`
	`95`	`+ instance_type = "t2.micro"`
	`96`	`+ cpu_credits = "unlimited"`
	`97`	`+ subnet_id = tolist(data.aws_subnet_ids.all.ids)[0]`
	`98`	`+ // private_ip = "172.31.32.10"`
`98`	`99`	`vpc_security_group_ids = [module.security_group.this_security_group_id]`
`99`	`100`	`associate_public_ip_address = true`
`100`	`101`	`}`

`‎main.tf‎`

Lines changed: 6 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,9 @@ resource "aws_instance" "this" {`
`24`	`24`	`iam_instance_profile = var.iam_instance_profile`
`25`	`25`
`26`	`26`	`associate_public_ip_address = var.associate_public_ip_address`
`27`		`- private_ip = element(`
`28`		`- distinct(compact(concat([var.private_ip], var.private_ips))),`
`29`		`- count.index,`
`30`		`- )`
`31`		`- ipv6_address_count = var.ipv6_address_count`
`32`		`- ipv6_addresses = var.ipv6_addresses`
	`27`	`+ private_ip = length(var.private_ips) > 0 ? element(var.private_ips, count.index) : var.private_ip`
	`28`	`+ ipv6_address_count = var.ipv6_address_count`
	`29`	`+ ipv6_addresses = var.ipv6_addresses`
`33`	`30`
`34`	`31`	`ebs_optimized = var.ebs_optimized`
`35`	`32`
`@@ -90,7 +87,6 @@ resource "aws_instance" "this" {`
`90`	`87`	`# (eg, https://github.com/terraform-providers/terraform-provider-aws/issues/2036)`
`91`	`88`	`# we have to ignore changes in the following arguments`
`92`	`89`	`ignore_changes = [`
`93`		`- private_ip,`
`94`	`90`	`root_block_device,`
`95`	`91`	`ebs_block_device,`
`96`	`92`	`]`
`@@ -113,12 +109,9 @@ resource "aws_instance" "this_t2" {`
`113`	`109`	`iam_instance_profile = var.iam_instance_profile`
`114`	`110`
`115`	`111`	`associate_public_ip_address = var.associate_public_ip_address`
`116`		`- private_ip = element(`
`117`		`- distinct(compact(concat([var.private_ip], var.private_ips))),`
`118`		`- count.index,`
`119`		`- )`
`120`		`- ipv6_address_count = var.ipv6_address_count`
`121`		`- ipv6_addresses = var.ipv6_addresses`
	`112`	`+ private_ip = length(var.private_ips) > 0 ? element(var.private_ips, count.index) : var.private_ip`
	`113`	`+ ipv6_address_count = var.ipv6_address_count`
	`114`	`+ ipv6_addresses = var.ipv6_addresses`
`122`	`115`
`123`	`116`	`ebs_optimized = var.ebs_optimized`
`124`	`117`
`@@ -183,7 +176,6 @@ resource "aws_instance" "this_t2" {`
`183`	`176`	`# (eg, https://github.com/terraform-providers/terraform-provider-aws/issues/2036)`
`184`	`177`	`# we have to ignore changes in the following arguments`
`185`	`178`	`ignore_changes = [`
`186`		`- private_ip,`
`187`	`179`	`root_block_device,`
`188`	`180`	`ebs_block_device,`
`189`	`181`	`]`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit bc0a43c

File tree

2 files changed

2 files changed

`‎examples/basic/main.tf‎`

`‎main.tf‎`

0 commit comments