Skip to content

Commit ee37b06

Browse files
committed
precommit no verify - broken ipam example
1 parent 3646569 commit ee37b06

File tree

5 files changed

+46
-19
lines changed

5 files changed

+46
-19
lines changed

examples/ipam-vpc/main.tf

Lines changed: 42 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,31 +35,58 @@ module "no_ipam_vpc_example" {
3535
cidr = "172.2.0.32/28"
3636
}
3737

38-
module "ipv4_ipam_explicit_cidr_vpc" {
39-
source = "../.."
40-
name = "ipv4-explicit-cidr-${local.name}"
41-
ipv4_ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
42-
cidr = "172.2.0.32/28"
38+
data "aws_vpc_ipam_preview_next_cidr" "previewed_cidr" {
39+
ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
40+
netmask_length = 24
41+
4342
depends_on = [
4443
aws_vpc_ipam_pool_cidr.ipv4_example
4544
]
4645
}
4746

48-
module "ipv4_ipam_explicit_netmask_vpc" {
49-
source = "../.."
50-
name = "ipv4-explicit-netmask-${local.name}"
51-
ipv4_ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
52-
ipv4_netmask_length = 28
53-
depends_on = [
54-
aws_vpc_ipam_pool_cidr.ipv4_example
55-
]
47+
locals {
48+
partition = cidrsubnets(data.aws_vpc_ipam_preview_next_cidr.previewed_cidr.cidr, 2, 2)
49+
private_subnets = cidrsubnets(local.partition[0], 2, 2)
50+
public_subnets = cidrsubnets(local.partition[1], 2, 2)
5651
}
5752

58-
module "ipv4_ipam_default_netmask_vpc" {
53+
module "ipv4_ipam_calculate_subnets" {
5954
source = "../.."
60-
name = "ipv4-default-netmask-${local.name}"
55+
name = "ipv4-calculated-subnets-${local.name}"
6156
ipv4_ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
57+
cidr = data.aws_vpc_ipam_preview_next_cidr.previewed_cidr.cidr
58+
private_subnets = local.private_subnets
59+
public_subnets = local.public_subnets
6260
depends_on = [
6361
aws_vpc_ipam_pool_cidr.ipv4_example
6462
]
6563
}
64+
65+
# module "ipv4_ipam_explicit_cidr_vpc" {
66+
# source = "../.."
67+
# name = "ipv4-explicit-cidr-${local.name}"
68+
# ipv4_ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
69+
# cidr = "172.2.0.32/28"
70+
# depends_on = [
71+
# aws_vpc_ipam_pool_cidr.ipv4_example
72+
# ]
73+
# }
74+
75+
# module "ipv4_ipam_explicit_netmask_vpc" {
76+
# source = "../.."
77+
# name = "ipv4-explicit-netmask-${local.name}"
78+
# ipv4_ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
79+
# ipv4_netmask_length = 28
80+
# depends_on = [
81+
# aws_vpc_ipam_pool_cidr.ipv4_example
82+
# ]
83+
# }
84+
85+
# module "ipv4_ipam_default_netmask_vpc" {
86+
# source = "../.."
87+
# name = "ipv4-default-netmask-${local.name}"
88+
# ipv4_ipam_pool_id = aws_vpc_ipam_pool.ipv4_example.id
89+
# depends_on = [
90+
# aws_vpc_ipam_pool_cidr.ipv4_example
91+
# ]
92+
# }

examples/ipam-vpc/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.68"
7+
version = ">= 3.73"
88
}
99
}
1010
}

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ locals {
2525
resource "aws_vpc" "this" {
2626
count = var.create_vpc ? 1 : 0
2727

28-
cidr_block = var.ipv4_ipam_pool_id != null ? null : var.cidr
28+
cidr_block = var.cidr
2929
ipv4_ipam_pool_id = var.ipv4_ipam_pool_id
3030
ipv4_netmask_length = var.ipv4_netmask_length
3131

variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variable "name" {
1313
variable "cidr" {
1414
description = "(Optional) The IPv4 CIDR block for the VPC. CIDR can be explicitly set or it can be derived from IPAM using `ipv4_netmask_length` & `ipv4_ipam_pool_id`"
1515
type = string
16-
default = "0.0.0.0/0"
16+
default = null
1717
}
1818

1919
variable "enable_ipv6" {

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.68"
7+
version = ">= 3.73"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)