From 6dfd7453d87923feca586938dce3b8d51ad98aee Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Tue, 3 Jan 2023 11:22:28 +0100 Subject: [PATCH 1/5] enforce valid docker machine name --- variables.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/variables.tf b/variables.tf index 1059279d1..ca9b3bdcb 100644 --- a/variables.tf +++ b/variables.tf @@ -619,6 +619,11 @@ variable "overrides" { condition = length(var.overrides["name_docker_machine_runners"]) <= 28 error_message = "Maximum length for name_docker_machine_runners is 28 characters!" } + + validation { + condition = var.overrides["name_docker_machine_runners"] != "" && can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) + error_message = "Valid characters for the docker machine name are: [a-zA-Z0-9\\.-]" + } } variable "cache_bucket" { From 45f0673ede8fabf14caa3b499bba672b1dffaf7a Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Tue, 3 Jan 2023 11:32:03 +0100 Subject: [PATCH 2/5] Update variables.tf --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index ca9b3bdcb..d6157521a 100644 --- a/variables.tf +++ b/variables.tf @@ -622,7 +622,7 @@ variable "overrides" { validation { condition = var.overrides["name_docker_machine_runners"] != "" && can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) - error_message = "Valid characters for the docker machine name are: [a-zA-Z0-9\\.-]" + error_message = "Valid characters for the docker machine name are: [a-zA-Z0-9\\.-]." } } From b419f1f84f6165a91947bb94d4d4274ad8ca0893 Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Tue, 3 Jan 2023 23:48:33 +0100 Subject: [PATCH 3/5] Update variables.tf --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index d6157521a..21ecf63f1 100644 --- a/variables.tf +++ b/variables.tf @@ -621,7 +621,7 @@ variable "overrides" { } validation { - condition = var.overrides["name_docker_machine_runners"] != "" && can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) + condition = var.overrides["name_docker_machine_runners"] == "" || can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) error_message = "Valid characters for the docker machine name are: [a-zA-Z0-9\\.-]." } } From 1997b94d6b8110694b940f31981bf929f134fbda Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Tue, 3 Jan 2023 23:51:46 +0100 Subject: [PATCH 4/5] Update variables.tf --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 21ecf63f1..ff30532ca 100644 --- a/variables.tf +++ b/variables.tf @@ -621,7 +621,7 @@ variable "overrides" { } validation { - condition = var.overrides["name_docker_machine_runners"] == "" || can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) + condition = var.overrides["name_docker_machine_runners"] == "" || can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) error_message = "Valid characters for the docker machine name are: [a-zA-Z0-9\\.-]." } } From 5a660c8e05652e2e6e583f7bd247d713882b8711 Mon Sep 17 00:00:00 2001 From: Matthias Kay Date: Wed, 4 Jan 2023 14:04:43 +0100 Subject: [PATCH 5/5] format code --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index ff30532ca..629708a6a 100644 --- a/variables.tf +++ b/variables.tf @@ -619,7 +619,7 @@ variable "overrides" { condition = length(var.overrides["name_docker_machine_runners"]) <= 28 error_message = "Maximum length for name_docker_machine_runners is 28 characters!" } - + validation { condition = var.overrides["name_docker_machine_runners"] == "" || can(regex("^[a-zA-Z0-9\\.-]+$", var.overrides["name_docker_machine_runners"])) error_message = "Valid characters for the docker machine name are: [a-zA-Z0-9\\.-]."