From 21c4c87fa40fb7a0821e5d889812132fc5fc6583 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 24 Feb 2025 18:35:23 -0500 Subject: [PATCH 1/4] removed requirements.tf --- requirements.tf | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 requirements.tf diff --git a/requirements.tf b/requirements.tf deleted file mode 100644 index 7cef9f7..0000000 --- a/requirements.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_version = ">= 0.13" - - required_providers { - aws = { - source = "hashicorp/aws" - version = "~> 5.14.0" - } - } -} From b2c2a6f3806e4e2addb086f7a8fb2610612a79bc Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 24 Feb 2025 18:45:55 -0500 Subject: [PATCH 2/4] readd requirements --- README.md | 4 ++-- requirements.tf | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 requirements.tf diff --git a/README.md b/README.md index 43fe01a..a450348 100644 --- a/README.md +++ b/README.md @@ -97,13 +97,13 @@ efs-csi-controller 0 5m | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.13 | -| [aws](#requirement\_aws) | ~> 5.14.0 | +| [aws](#requirement\_aws) | ~> 5.14 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.84.0 | +| [aws](#provider\_aws) | 5.88.0 | | [terraform](#provider\_terraform) | n/a | ## Modules diff --git a/requirements.tf b/requirements.tf new file mode 100644 index 0000000..83145db --- /dev/null +++ b/requirements.tf @@ -0,0 +1,10 @@ +terraform { + required_version = ">= 0.13" + + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 5.14" + } + } +} From b0ed9f0c20ea4d21b3d5c09aa6df8a0bfa5244c0 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 24 Feb 2025 19:05:16 -0500 Subject: [PATCH 3/4] fix validation on tags to include colon ':' --- variables.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variables.tf b/variables.tf index 925c44f..6e008b0 100644 --- a/variables.tf +++ b/variables.tf @@ -145,7 +145,7 @@ variable "tags" { error_message = "Maximum number of tags allowed is 45." } validation { - condition = alltrue([for k, v in var.tags : length(k) <= 128 && length(v) <= 256 && can(regex("^[\\w\\s+=.@-]*$", k)) && can(regex("^[\\w\\s+=.@-]*$", v))]) - error_message = "Tag keys must be <= 128 chars, values <= 256 chars, and both can only contain alphanumeric characters, spaces, and '.+-=@_'." + condition = alltrue([for k, v in var.tags : length(k) <= 128 && length(v) <= 256 && can(regex("^[\\w\\s+=.@:-]*$", k)) && can(regex("^[\\w\\s+=.@:-]*$", v))]) + error_message = "Tag keys must be <= 128 chars, values <= 256 chars, and both can only contain alphanumeric characters, spaces, and '.+-=@:_'." } } From aafe331a22c9c3d54203412ef10fb8f8ba4e10c8 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Mon, 24 Feb 2025 19:18:39 -0500 Subject: [PATCH 4/4] fix regex --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 6e008b0..4153048 100644 --- a/variables.tf +++ b/variables.tf @@ -68,7 +68,7 @@ variable "eks_instance_types" { error_message = "At least one instance type must be specified." } validation { - condition = alltrue([for t in var.eks_instance_types : can(regex("^[a-z][1-9][.][a-z0-9]+$", t))]) + condition = alltrue([for t in var.eks_instance_types : can(regex("^[a-z][1-9][a-z]?[.][a-zA-Z0-9]+$", t))]) error_message = "Instance types must be valid EC2 instance type formats (e.g., t3.large, m5.xlarge)." } }