From 7bbf1a6e76b2d0fd74cbca82ca80556c2e0fc227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=9Awi=C4=99s?= <10480513+pswies@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:24:32 +0200 Subject: [PATCH] Enable "mainnet" value for "environment" vars in all contexts (#42) --- indexer/variables.tf | 6 +++--- metric_ingestor/variables.tf | 6 +++--- modules/datadog_agent/log_forwarder/variables.tf | 7 ++++--- modules/iam/ecs_task_roles/variables.tf | 6 +++--- modules/iam/github_actions_role/variables.tf | 6 +++--- modules/metric_ingestor/variables.tf | 6 +++--- modules/validator/variables.tf | 6 +++--- 7 files changed, 22 insertions(+), 21 deletions(-) diff --git a/indexer/variables.tf b/indexer/variables.tf index 8d5c1a46..192754c4 100644 --- a/indexer/variables.tf +++ b/indexer/variables.tf @@ -38,14 +38,14 @@ variable "indexers" { variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." } } diff --git a/metric_ingestor/variables.tf b/metric_ingestor/variables.tf index f606fef2..e320eeeb 100644 --- a/metric_ingestor/variables.tf +++ b/metric_ingestor/variables.tf @@ -18,14 +18,14 @@ variable "datadog_site" { variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." } } diff --git a/modules/datadog_agent/log_forwarder/variables.tf b/modules/datadog_agent/log_forwarder/variables.tf index d471da4f..789a21e8 100644 --- a/modules/datadog_agent/log_forwarder/variables.tf +++ b/modules/datadog_agent/log_forwarder/variables.tf @@ -1,16 +1,17 @@ variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." } } + variable "name" { type = string description = "Name of the app." diff --git a/modules/iam/ecs_task_roles/variables.tf b/modules/iam/ecs_task_roles/variables.tf index ad50a254..6b388c97 100644 --- a/modules/iam/ecs_task_roles/variables.tf +++ b/modules/iam/ecs_task_roles/variables.tf @@ -5,14 +5,14 @@ variable "name" { variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "research", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "research", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2 | mainnet}." } } diff --git a/modules/iam/github_actions_role/variables.tf b/modules/iam/github_actions_role/variables.tf index f3ce88b0..e70ffa13 100644 --- a/modules/iam/github_actions_role/variables.tf +++ b/modules/iam/github_actions_role/variables.tf @@ -5,14 +5,14 @@ variable "name" { variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "research", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "research", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2 | mainnet}." } } diff --git a/modules/metric_ingestor/variables.tf b/modules/metric_ingestor/variables.tf index 701fd4f7..40712909 100644 --- a/modules/metric_ingestor/variables.tf +++ b/modules/metric_ingestor/variables.tf @@ -3,14 +3,14 @@ # ----------------------------------------------------------------------------- variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | testnet1 | testnet2 | mainnet}." } } diff --git a/modules/validator/variables.tf b/modules/validator/variables.tf index d0705ba4..1c2d2a12 100644 --- a/modules/validator/variables.tf +++ b/modules/validator/variables.tf @@ -3,14 +3,14 @@ # ----------------------------------------------------------------------------- variable "environment" { type = string - description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2}." + description = "Name of the environment {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2 | mainnet}." validation { condition = contains( - ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "research", "testnet1", "testnet2"], + ["dev", "dev2", "dev3", "dev4", "dev5", "staging", "testnet", "public-testnet", "research", "testnet1", "testnet2", "mainnet"], var.environment ) - error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2}." + error_message = "Err: invalid environment. Must be one of {dev | dev2 | dev3 | dev4 | dev5 | staging | testnet | public-testnet | research | testnet1 | testnet2 | mainnet}." } }