Merge branch 'environment_variable_sets' of github.com:schubergphilis…

…/terraform-aws-mcaf-avm into environment_variable_sets

README.md

@@ -232,9 +232,6 @@ Note: the `workspace_boundary` and `workload_boundary` can be templated files, `
 | [tfe_variable.account_variable_set_clear_text_env_variables](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable) | resource |
 | [tfe_variable.account_variable_set_clear_text_hcl_variables](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable) | resource |
 | [tfe_variable.account_variable_set_clear_text_terraform_variables](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable) | resource |
-| [tfe_variable.account_variable_set_sensitive_env_variables](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable) | resource |
-| [tfe_variable.account_variable_set_sensitive_hcl_variables](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable) | resource |
-| [tfe_variable.account_variable_set_sensitive_terraform_variables](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable) | resource |
 | [tfe_variable_set.account](https://registry.terraform.io/providers/hashicorp/tfe/latest/docs/resources/variable_set) | resource |
 | [tls_certificate.oidc_certificate](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/data-sources/certificate) | data source |
 
@@ -245,14 +242,8 @@ Note: the `workspace_boundary` and `workload_boundary` can be templated files, `
 | <a name="input_account"></a> [account](#input\_account) | AWS account settings | <pre>object({<br>    alias_prefix = optional(string, null)<br>    contact_billing = optional(object({<br>      email_address = string<br>      name          = string<br>      phone_number  = string<br>      title         = string<br>    }), null)<br>    contact_operations = optional(object({<br>      email_address = string<br>      name          = string<br>      phone_number  = string<br>      title         = string<br>    }), null)<br>    contact_security = optional(object({<br>      email_address = string<br>      name          = string<br>      phone_number  = string<br>      title         = string<br>    }), null)<br>    email                    = string<br>    environment              = optional(string, null)<br>    organizational_unit      = string<br>    provisioned_product_name = optional(string, null)<br>    sso_email                = string<br>    sso_firstname            = optional(string, "AWS Control Tower")<br>    sso_lastname             = optional(string, "Admin")<br>  })</pre> | n/a | yes |
 | <a name="input_name"></a> [name](#input\_name) | Name of the account and default TFE workspace | `string` | n/a | yes |
 | <a name="input_tfe_workspace"></a> [tfe\_workspace](#input\_tfe\_workspace) | TFE workspace settings | <pre>object({<br>    add_permissions_boundary       = optional(bool, false)<br>    agent_pool_id                  = optional(string, null)<br>    agent_role_arns                = optional(list(string), null)<br>    auth_method                    = optional(string, "iam_user")<br>    auto_apply                     = optional(bool, false)<br>    branch                         = optional(string, "main")<br>    clear_text_env_variables       = optional(map(string), {})<br>    clear_text_hcl_variables       = optional(map(string), {})<br>    clear_text_terraform_variables = optional(map(string), {})<br>    connect_vcs_repo               = optional(bool, true)<br>    default_region                 = string<br>    execution_mode                 = optional(string, "remote")<br>    file_triggers_enabled          = optional(bool, true)<br>    global_remote_state            = optional(bool, false)<br>    name                           = optional(string, null)<br>    policy                         = optional(string, null)<br>    policy_arns                    = optional(list(string), ["arn:aws:iam::aws:policy/AdministratorAccess"])<br>    project_id                     = optional(string, null)<br>    queue_all_runs                 = optional(bool, null)<br>    remote_state_consumer_ids      = optional(set(string))<br>    repository_identifier          = optional(string, null)<br>    role_name                      = optional(string, "TFEPipeline")<br>    sensitive_env_variables        = optional(map(string), {})<br>    sensitive_hcl_variables        = optional(map(object({ sensitive = string })), {})<br>    sensitive_terraform_variables  = optional(map(string), {})<br>    ssh_key_id                     = optional(string, null)<br>    organization                   = string<br>    terraform_version              = optional(string, null)<br>    trigger_prefixes               = optional(list(string), ["modules"])<br>    username                       = optional(string, "TFEPipeline")<br>    vcs_oauth_token_id             = string<br>    variable_set_ids               = optional(map(string), {})<br>    working_directory              = optional(string, null)<br>    workspace_tags                 = optional(list(string), null)<br><br>    notification_configuration = optional(list(object({<br>      destination_type = string<br>      enabled          = optional(bool, true)<br>      url              = string<br>      triggers = optional(list(string), [<br>        "run:created",<br>        "run:planning",<br>        "run:needs_attention",<br>        "run:applying",<br>        "run:completed",<br>        "run:errored",<br>      ])<br>    })), [])<br><br>    team_access = optional(map(object({<br>      access = optional(string, null),<br>      permissions = optional(object({<br>        run_tasks         = bool<br>        runs              = string<br>        sentinel_mocks    = string<br>        state_versions    = string<br>        variables         = string<br>        workspace_locking = bool<br>      }), null)<br>    })), {})<br>  })</pre> | n/a | yes |
-| <a name="input_account_variable_set_clear_text_env_variables"></a> [account\_variable\_set\_clear\_text\_env\_variables](#input\_account\_variable\_set\_clear\_text\_env\_variables) | n/a | `map(string)` | `{}` | no |
-| <a name="input_account_variable_set_clear_text_hcl_variables"></a> [account\_variable\_set\_clear\_text\_hcl\_variables](#input\_account\_variable\_set\_clear\_text\_hcl\_variables) | n/a | `map(string)` | `{}` | no |
-| <a name="input_account_variable_set_clear_text_terraform_variables"></a> [account\_variable\_set\_clear\_text\_terraform\_variables](#input\_account\_variable\_set\_clear\_text\_terraform\_variables) | n/a | `map(string)` | `{}` | no |
-| <a name="input_account_variable_set_sensitive_env_variables"></a> [account\_variable\_set\_sensitive\_env\_variables](#input\_account\_variable\_set\_sensitive\_env\_variables) | n/a | `map(string)` | `{}` | no |
-| <a name="input_account_variable_set_sensitive_hcl_variables"></a> [account\_variable\_set\_sensitive\_hcl\_variables](#input\_account\_variable\_set\_sensitive\_hcl\_variables) | n/a | `map(object({ sensitive = string }))` | `{}` | no |
-| <a name="input_account_variable_set_sensitive_terraform_variables"></a> [account\_variable\_set\_sensitive\_terraform\_variables](#input\_account\_variable\_set\_sensitive\_terraform\_variables) | n/a | `map(string)` | `{}` | no |
+| <a name="input_account_variable_set"></a> [account\_variable\_set](#input\_account\_variable\_set) | Settings of variable set that is attached to each workspace | <pre>object({<br>    name                           = optional(string)<br>    clear_text_env_variables       = optional(map(string), {})<br>    clear_text_hcl_variables       = optional(map(string), {})<br>    clear_text_terraform_variables = optional(map(string), {})<br>  })</pre> | `{}` | no |
 | <a name="input_additional_tfe_workspaces"></a> [additional\_tfe\_workspaces](#input\_additional\_tfe\_workspaces) | Additional TFE workspaces | <pre>map(object({<br>    add_permissions_boundary       = optional(bool, false)<br>    agent_pool_id                  = optional(string, null)<br>    agent_role_arns                = optional(list(string), null)<br>    auth_method                    = optional(string, null)<br>    auto_apply                     = optional(bool, false)<br>    branch                         = optional(string, null)<br>    clear_text_env_variables       = optional(map(string), {})<br>    clear_text_hcl_variables       = optional(map(string), {})<br>    clear_text_terraform_variables = optional(map(string), {})<br>    connect_vcs_repo               = optional(bool, true)<br>    default_region                 = optional(string, null)<br>    execution_mode                 = optional(string, null)<br>    file_triggers_enabled          = optional(bool, true)<br>    global_remote_state            = optional(bool, false)<br>    name                           = optional(string, null)<br>    policy                         = optional(string, null)<br>    policy_arns                    = optional(list(string), ["arn:aws:iam::aws:policy/AdministratorAccess"])<br>    project_id                     = optional(string, null)<br>    queue_all_runs                 = optional(bool, null)<br>    remote_state_consumer_ids      = optional(set(string))<br>    repository_identifier          = optional(string, null)<br>    role_name                      = optional(string, null)<br>    sensitive_env_variables        = optional(map(string), {})<br>    sensitive_hcl_variables        = optional(map(object({ sensitive = string })), {})<br>    sensitive_terraform_variables  = optional(map(string), {})<br>    ssh_key_id                     = optional(string, null)<br>    terraform_version              = optional(string, null)<br>    trigger_prefixes               = optional(list(string), null)<br>    username                       = optional(string, null)<br>    vcs_oauth_token_id             = optional(string, null)<br>    variable_set_ids               = optional(map(string), {})<br>    working_directory              = optional(string, null)<br>    workspace_tags                 = optional(list(string), null)<br><br>    notification_configuration = optional(list(object({<br>      destination_type = string<br>      enabled          = optional(bool, true)<br>      url              = string<br>      triggers = optional(list(string), [<br>        "run:created",<br>        "run:planning",<br>        "run:needs_attention",<br>        "run:applying",<br>        "run:completed",<br>        "run:errored",<br>      ])<br>    })), [])<br><br>    team_access = optional(map(object({<br>      access = optional(string, null),<br>      permissions = optional(object({<br>        run_tasks         = bool<br>        runs              = string<br>        sentinel_mocks    = string<br>        state_versions    = string<br>        variables         = string<br>        workspace_locking = bool<br>      }), null)<br>    })), {})<br>  }))</pre> | `{}` | no |
-| <a name="input_create_account_variable"></a> [create\_account\_variable](#input\_create\_account\_variable) | Set to true to create a variable set and attach to all workspaces linked to the created account. You do not need to set this variable if setting any of the account\_variable\_set\_* variables. | `bool` | `false` | no |
 | <a name="input_create_default_workspace"></a> [create\_default\_workspace](#input\_create\_default\_workspace) | Set to false to skip creating default workspace | `bool` | `true` | no |
 | <a name="input_path"></a> [path](#input\_path) | Optional path for all IAM users, user groups, roles, and customer managed policies created by this module | `string` | `"/"` | no |
 | <a name="input_permissions_boundaries"></a> [permissions\_boundaries](#input\_permissions\_boundaries) | n/a | <pre>object({<br>    workspace_boundary      = optional(string, null)<br>    workspace_boundary_name = optional(string, null)<br>    workload_boundary       = optional(string, null)<br>    workload_boundary_name  = optional(string, null)<br>  })</pre> | `{}` | no |