mend small mistakes when manually resolving conflicts

schubergphilis · Aug 5, 2024 · 2d40dc6 · 2d40dc6
1 parent b27bdc4
commit 2d40dc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/main.tf b/main.tf
@@ -233,6 +233,7 @@ module "additional_tfe_workspaces" {
   clear_text_env_variables       = each.value.clear_text_env_variables
   clear_text_hcl_variables       = each.value.clear_text_hcl_variables
   clear_text_terraform_variables = each.value.clear_text_terraform_variables
+  description                    = each.value.description
   execution_mode                 = coalesce(each.value.execution_mode, var.tfe_workspace.execution_mode)
   file_triggers_enabled          = each.value.connect_vcs_repo != false ? each.value.file_triggers_enabled : null
   global_remote_state            = each.value.global_remote_state

diff --git a/variables.tf b/variables.tf
@@ -183,8 +183,8 @@ variable "tfe_workspace" {
     username                       = optional(string, "TFEPipeline")
     vcs_oauth_token_id             = string
     variable_set_ids               = optional(map(string), {})
-    working_directory              = optional(string, null)
-    workspace_tags                 = optional(list(string), null)
+    working_directory              = optional(string)
+    workspace_tags                 = optional(list(string))
 
     notification_configuration = optional(list(object({
       destination_type = string