From eb128e2b49db8bef7ba7971d63a424b3b5063af5 Mon Sep 17 00:00:00 2001 From: matttrach Date: Wed, 29 Nov 2023 16:57:28 -0600 Subject: [PATCH 1/3] fix: network acl id will be modified by AWS Signed-off-by: matttrach --- modules/vpc/main.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/vpc/main.tf b/modules/vpc/main.tf index 20cfb65..9b3d6f6 100644 --- a/modules/vpc/main.tf +++ b/modules/vpc/main.tf @@ -20,6 +20,11 @@ resource "aws_vpc" "new" { Name = local.name } assign_generated_ipv6_cidr_block = true + lifecycle { + ignore_changes = [ + default_network_acl_id, + ] + } } resource "aws_internet_gateway" "new" { From 6fb07d1b47ac0973d48e9a4b8486f4631a320fdc Mon Sep 17 00:00:00 2001 From: matttrach Date: Tue, 12 Dec 2023 12:55:58 -0600 Subject: [PATCH 2/3] fix: use ipinfo.io to prevent js errors Signed-off-by: matttrach --- main.tf | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/main.tf b/main.tf index 6337bb1..b4ed95a 100644 --- a/main.tf +++ b/main.tf @@ -16,16 +16,13 @@ locals { ssh_key_name = var.ssh_key_name public_ssh_key = var.public_ssh_key # create when public key is given, otherwise select with name - ifconfig_co_json = jsondecode(data.http.my_public_ip[0].response_body) - ip = (local.security_group_ip == "" ? local.ifconfig_co_json.ip : local.security_group_ip) + ipinfo_ip = chomp(data.http.my_public_ip[0].response_body) + ip = (local.security_group_ip == "" ? local.ipinfo_ip : local.security_group_ip) } data "http" "my_public_ip" { count = (local.security_group_ip == "" ? 1 : 0) - url = "https://ifconfig.co/json" - request_headers = { - Accept = "application/json" - } + url = "https://ipinfo.io/ip" } module "vpc" { From 09bc527d0ecc4349520c8d84f1cc3416a95cdb1f Mon Sep 17 00:00:00 2001 From: matttrach Date: Tue, 12 Dec 2023 13:02:43 -0600 Subject: [PATCH 3/3] fix: chomp ip Signed-off-by: matttrach --- modules/security_group/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/security_group/main.tf b/modules/security_group/main.tf index 8061277..29109f1 100644 --- a/modules/security_group/main.tf +++ b/modules/security_group/main.tf @@ -4,7 +4,7 @@ locals { create = (var.type != "" ? 1 : 0) # create if given a type type = (local.types[(var.type == "" ? "none" : var.type)]) owner = var.owner - ip = var.ip + ip = chomp(var.ip) cidr = var.cidr vpc_id = var.vpc_id vpc_cidr = var.vpc_cidr