From 7ab18d55437bbd3806970ef119bee3fb5251ea4e Mon Sep 17 00:00:00 2001
From: Matthew Creal Morgan <matthew.c.morgan@census.gov>
Date: Tue, 25 Feb 2025 09:06:14 -0800
Subject: [PATCH] Provider resolution (#36)

fixed variable regex validation on tags (missing ':')
fixed variable regex validation on instance types (missing instance type
options like t4g or m7i)
removed 3rd octet from required version which was preventing the ~>
operator from functioning
---
 README.md       | 4 ++--
 requirements.tf | 2 +-
 variables.tf    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

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 |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.14.0 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 5.14 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.84.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.88.0 |
 | <a name="provider_terraform"></a> [terraform](#provider\_terraform) | n/a |
 
 ## Modules
diff --git a/requirements.tf b/requirements.tf
index 7cef9f7..83145db 100644
--- a/requirements.tf
+++ b/requirements.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 5.14.0"
+      version = "~> 5.14"
     }
   }
 }
diff --git a/variables.tf b/variables.tf
index 925c44f..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)."
   }
 }
@@ -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 '.+-=@:_'."
   }
 }