From 12b9ca30a6876cd6d1d5cf8e2fb0af5ae0cea885 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 29 Jul 2024 18:26:33 -0400 Subject: [PATCH] fmt --- dns_zones.tf | 12 ++++++------ main.tf | 4 ++-- variables.tf | 3 ++- version.tf | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dns_zones.tf b/dns_zones.tf index 2b974ae..fe40ef7 100644 --- a/dns_zones.tf +++ b/dns_zones.tf @@ -2,7 +2,7 @@ locals { vpc_domain_name = var.vpc_domain_name cluster_domain_name = format("%v.%v", var.cluster_name, local.vpc_domain_name) cluster_domain_description = format("%v EKS Cluster DNS Zone", var.cluster_name) - region = var.region + region = var.region } #--- @@ -32,7 +32,7 @@ provider "aws" { # dummy vpc, so we can associate the zone to this account #--- data "aws_vpc" "dummy_vpc" { - count = ! (var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0 + count = !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0 filter { name = "tag:Name" values = ["vpc0-dummy"] @@ -45,14 +45,14 @@ resource "aws_route53_zone" "cluster_domain" { force_destroy = false vpc { - vpc_id = ! (var.shared_vpc_label == null || var.shared_vpc_label == "") ? try(data.aws_vpc.dummy_vpc[0].id, null) : data.aws_vpc.eks_vpc.id + vpc_id = !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? try(data.aws_vpc.dummy_vpc[0].id, null) : data.aws_vpc.eks_vpc.id vpc_region = local.region } lifecycle { ignore_changes = [vpc] precondition { - condition = (var.shared_vpc_label == null || var.shared_vpc_label == "") || (! (var.shared_vpc_label == null || var.shared_vpc_label == "") && ! (var.vpc_domain_name == null || var.vpc_domain_name == "")) + condition = (var.shared_vpc_label == null || var.shared_vpc_label == "") || (!(var.shared_vpc_label == null || var.shared_vpc_label == "") && !(var.vpc_domain_name == null || var.vpc_domain_name == "")) error_message = "var.vpc_domain_name must be provided when shared VPCs are in use." } } @@ -68,7 +68,7 @@ resource "aws_route53_zone" "cluster_domain" { # need to also associate with network-prod account and this vpc #--- module "route53_cluster_domain_east" { - count = local.region == "us-gov-east-1" && ! (var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0 + count = local.region == "us-gov-east-1" && !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0 providers = { aws.self = aws aws.peer = aws.route53_main_east @@ -83,7 +83,7 @@ module "route53_cluster_domain_east" { } module "route53_cluster_domain_west" { - count = local.region == "us-gov-west-1" && ! (var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0 + count = local.region == "us-gov-west-1" && !(var.shared_vpc_label == null || var.shared_vpc_label == "") ? 1 : 0 providers = { aws.self = aws aws.peer = aws.route53_main_west diff --git a/main.tf b/main.tf index 85c4da2..60f4400 100644 --- a/main.tf +++ b/main.tf @@ -139,8 +139,8 @@ module "cluster" { xvda = { device_name = "/dev/xvda" ebs = { - volume_size = var.eks_instance_disk_size - volume_type = "gp3" + volume_size = var.eks_instance_disk_size + volume_type = "gp3" # iops = 3000 # throughput = 125 encrypted = true diff --git a/variables.tf b/variables.tf index 5a9d599..bd993f2 100644 --- a/variables.tf +++ b/variables.tf @@ -159,7 +159,7 @@ variable "shared_vpc_label" { variable "region_map" { description = "AWS region map" type = map(string) - default = {"east": "us-gov-east-1", "west": "us-gov-west-1"} + default = { "east" : "us-gov-east-1", "west" : "us-gov-west-1" } } variable "route53_endpoints" { @@ -172,5 +172,6 @@ variable "route53_endpoints" { "us-gov-east-1" = "vpc-070595c5b133243dd" "us-gov-west-1" = "vpc-08b7b4db6a5ddf9c1" } + route53_main_legacy = {} } } diff --git a/version.tf b/version.tf index c28528d..1223816 100644 --- a/version.tf +++ b/version.tf @@ -1,5 +1,5 @@ locals { - _module_name = "tfmod-eks" - _module_version = "0.0.2" + _module_name = "tfmod-eks" + _module_version = "0.0.2" _module_providers = [] }