feat(terraform-cloud): cleanup

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
portefaix · Sep 6, 2024 · 5b3df81 · 5b3df81
1 parent 0fb28ea
commit 5b3df81
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 10 deletions.
diff --git a/terraform/alicloud/terraform-cloud/workspaces.tf b/terraform/alicloud/terraform-cloud/workspaces.tf
@@ -35,12 +35,18 @@ resource "tfe_workspace" "alicloud" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
   terraform_version   = "latest"
   tag_names           = each.value.tags
 }
 
+resource "tfe_workspace_settings" "alicloud" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.alicloud[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "alicloud_acces_key" {
   for_each = tfe_workspace.alicloud
 

diff --git a/terraform/aws/terraform-cloud/workspaces.tf b/terraform/aws/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "aws" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
   terraform_version   = "latest"
   tag_names           = each.value.tags
 }
 
+resource "tfe_workspace_settings" "aws" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.aws[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 # resource "tfe_variable" "aws_acces_key" {
 #   for_each = tfe_workspace.aws
 

diff --git a/terraform/azure/terraform-cloud/workspaces.tf b/terraform/azure/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "azure" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "azure" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.azure[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "arm_subscription_id" {
   for_each = tfe_workspace.azure
 

diff --git a/terraform/civo/terraform-cloud/workspaces.tf b/terraform/civo/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "this" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "this" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.this[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "env_civo_token" {
   for_each = tfe_workspace.this
 

diff --git a/terraform/digitalocean/terraform-cloud/workspaces.tf b/terraform/digitalocean/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "this" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "this" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.this[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "env_do_token" {
   for_each = tfe_workspace.this
 

diff --git a/terraform/exoscale/terraform-cloud/workspaces.tf b/terraform/exoscale/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "this" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "this" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.this[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "env_exo_api_key" {
   for_each = tfe_workspace.this
 

diff --git a/terraform/gcp/terraform-cloud/workspaces.tf b/terraform/gcp/terraform-cloud/workspaces.tf
@@ -35,12 +35,17 @@ resource "tfe_workspace" "gcp" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "gcp" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.gcp[each.key].id
+  execution_mode = each.value.execution_mode
+}
 
 resource "tfe_variable" "gcp_credentials" {
   for_each = tfe_workspace.gcp

diff --git a/terraform/k3s/terraform-cloud/workspaces.tf b/terraform/k3s/terraform-cloud/workspaces.tf
@@ -36,8 +36,14 @@ resource "tfe_workspace" "this" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
+
+resource "tfe_workspace_settings" "this" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.this[each.key].id
+  execution_mode = each.value.execution_mode
+}
diff --git a/terraform/scaleway/terraform-cloud/workspaces.tf b/terraform/scaleway/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "this" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "this" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.this[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "scw_access_key" {
   for_each = tfe_workspace.this
 

diff --git a/terraform/vultr/terraform-cloud/workspaces.tf b/terraform/vultr/terraform-cloud/workspaces.tf
@@ -36,12 +36,18 @@ resource "tfe_workspace" "this" {
   global_remote_state = true
   trigger_prefixes    = each.value.trigger
   allow_destroy_plan  = true
-  execution_mode      = each.value.execution_mode
   auto_apply          = each.value.auto_apply
 
   tag_names = each.value.tags
 }
 
+resource "tfe_workspace_settings" "this" {
+  for_each = var.workspaces
+
+  workspace_id   = tfe_workspace.this[each.key].id
+  execution_mode = each.value.execution_mode
+}
+
 resource "tfe_variable" "env_vultr_api_key" {
   for_each = tfe_workspace.this