Skip to content

Commit

Permalink
Merge pull request #11 from getindata/new_version_atlantis
Browse files Browse the repository at this point in the history
chore: Update getindata/atlantis-repo-config/null to 2.1.0
  • Loading branch information
maciejmacq-dev authored Mar 10, 2023
2 parents ea02361 + ac95b0b commit 861f2bf
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ module "atlantis" {

| Name | Source | Version |
|------|--------|---------|
| <a name="module_atlantis_repo_config"></a> [atlantis\_repo\_config](#module\_atlantis\_repo\_config) | getindata/atlantis-repo-config/null | 2.0.0 |
| <a name="module_atlantis_repo_config"></a> [atlantis\_repo\_config](#module\_atlantis\_repo\_config) | getindata/atlantis-repo-config/null | 2.1.0 |
| <a name="module_azure_container_group"></a> [azure\_container\_group](#module\_azure\_container\_group) | getindata/container-group/azurerm | 3.1.1 |
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |

Expand Down
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "atlantis_repo_config" {
source = "getindata/atlantis-repo-config/null"
version = "2.0.0"
version = "2.1.0"

repos = var.atlantis_repo_config_repos
repos_common_config = var.atlantis_repo_config_repos_common_config
Expand Down
4 changes: 2 additions & 2 deletions modules/caddy-automatic-https/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ module "atlantis_with_caddy" {
| <a name="input_atlantis_container"></a> [atlantis\_container](#input\_atlantis\_container) | Atlantis container configuration. First item of the ports list must refer to the Atlantis | <pre>object({<br> image = optional(string, "ghcr.io/runatlantis/atlantis")<br> cpu = optional(number, 1)<br> memory = optional(number, 1)<br> ports = optional(list(object({<br> port = number<br> protocol = optional(string, "TCP")<br> })), [{<br> port = 4141<br> protocol = "TCP"<br> }])<br> commands = optional(list(string), ["atlantis", "server"])<br> environment_variables = optional(map(string), {})<br> secure_environment_variables = optional(map(string), {})<br> secure_environment_variables_from_key_vault = optional(map(object({<br> key_vault_id = string<br> name = string<br> })), {})<br> volumes = optional(map(object({<br> mount_path = string<br> read_only = optional(bool, false)<br> empty_dir = optional(bool)<br> git_repo = optional(object({<br> url = string<br> directory = optional(string)<br> revision = optional(string)<br> }))<br> secret = optional(map(string))<br> secret_from_key_vault = optional(map(object({<br> key_vault_id = string<br> name = string<br> })), {})<br> storage_account_name = optional(string)<br> storage_account_key = optional(string)<br> share_name = optional(string)<br> })), {})<br> })</pre> | `{}` | no |
| <a name="input_atlantis_repo_config_file"></a> [atlantis\_repo\_config\_file](#input\_atlantis\_repo\_config\_file) | Configures config file generation if enabled | <pre>object({<br> enabled = optional(bool, false)<br> path = optional(string, ".")<br> name = optional(string, "repo_config.yaml")<br> format = optional(string, "yaml")<br> })</pre> | `{}` | no |
| <a name="input_atlantis_repo_config_repos"></a> [atlantis\_repo\_config\_repos](#input\_atlantis\_repo\_config\_repos) | Map of repositories and their configs. Refer to https://www.runatlantis.io/docs/server-side-repo-config.html#example-server-side-repo | <pre>list(object({<br> id = optional(string, "/.*/")<br> branch = optional(string)<br> apply_requirements = optional(list(string))<br> allowed_overrides = optional(list(string))<br> allowed_workflows = optional(list(string))<br> allow_custom_workflows = optional(bool)<br> delete_source_branch_on_merge = optional(bool)<br> pre_workflow_hooks = optional(list(object({<br> run = string<br> })))<br> post_workflow_hooks = optional(list(object({<br> run = string<br> })))<br> workflow = optional(string)<br> ######### Helpers #########<br> allow_all_server_side_workflows = optional(bool, false)<br> terragrunt_atlantis_config = optional(object({<br> enabled = optional(bool, false)<br> output = optional(string, "atlantis.yaml")<br> automerge = optional(bool)<br> autoplan = optional(bool)<br> parallel = optional(bool)<br> cascade_dependencies = optional(bool)<br> filter = optional(string)<br> use_project_markers = optional(bool)<br> }), {})<br> }))</pre> | `[]` | no |
| <a name="input_atlantis_repo_config_repos_common_config"></a> [atlantis\_repo\_config\_repos\_common\_config](#input\_atlantis\_repo\_config\_repos\_common\_config) | Common config that will be merged into each item of the repos list | <pre>object({<br> id = optional(string)<br> branch = optional(string)<br> apply_requirements = optional(list(string))<br> allowed_overrides = optional(list(string))<br> allowed_workflows = optional(list(string))<br> allow_custom_workflows = optional(bool)<br> delete_source_branch_on_merge = optional(bool)<br> pre_workflow_hooks = optional(list(object({<br> run = string<br> })))<br> post_workflow_hooks = optional(list(object({<br> run = string<br> })))<br> workflow = optional(string)<br> ######### Helpers #########<br> allow_all_server_side_workflows = optional(bool, false)<br> terragrunt_atlantis_config = optional(object({<br> enabled = optional(bool, false)<br> output = optional(string, "atlantis.yaml")<br> autoplan = optional(bool, false)<br> parallel = optional(bool, false)<br> filter = optional(string)<br> }), {})<br> })</pre> | `{}` | no |
| <a name="input_atlantis_repo_config_workflows"></a> [atlantis\_repo\_config\_workflows](#input\_atlantis\_repo\_config\_workflows) | List of custom workflow that will be added to the repo config file | <pre>map(object({<br> plan = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> apply = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> import = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> state_rm = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> template = optional(string, "terragrunt-basic")<br> asdf = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> checkov = optional(object({<br> enabled = optional(bool, false)<br> soft_fail = optional(bool, false)<br> file = optional(string, "$SHOWFILE")<br> }), {})<br> pull_gitlab_variables = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> check_gitlab_approvals = optional(object({<br> enabled = optional(bool, false)<br> }), {}),<br> }))</pre> | `{}` | no |
| <a name="input_atlantis_repo_config_repos_common_config"></a> [atlantis\_repo\_config\_repos\_common\_config](#input\_atlantis\_repo\_config\_repos\_common\_config) | Common config that will be merged into each item of the repos list | <pre>object({<br> id = optional(string)<br> branch = optional(string)<br> apply_requirements = optional(list(string))<br> allowed_overrides = optional(list(string))<br> allowed_workflows = optional(list(string))<br> allow_custom_workflows = optional(bool)<br> delete_source_branch_on_merge = optional(bool)<br> pre_workflow_hooks = optional(list(object({<br> run = string<br> })))<br> post_workflow_hooks = optional(list(object({<br> run = string<br> })))<br> workflow = optional(string)<br> ######### Helpers #########<br> allow_all_server_side_workflows = optional(bool, false)<br> terragrunt_atlantis_config = optional(object({<br> enabled = optional(bool, false)<br> output = optional(string, "atlantis.yaml")<br> autoplan = optional(bool, false)<br> parallel = optional(bool, false)<br> filter = optional(string)<br> }), {})<br> infracost = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> })</pre> | `{}` | no |
| <a name="input_atlantis_repo_config_workflows"></a> [atlantis\_repo\_config\_workflows](#input\_atlantis\_repo\_config\_workflows) | List of custom workflow that will be added to the repo config file | <pre>map(object({<br> plan = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> apply = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> import = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> state_rm = optional(object({<br> steps = optional(list(object({<br> env = optional(object({<br> name = string<br> command = string<br> }))<br> run = optional(string)<br> multienv = optional(string)<br> atlantis_step = optional(object({<br> command = string<br> extra_args = optional(list(string))<br> }))<br> })))<br> }))<br> template = optional(string, "terragrunt-basic")<br> asdf = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> checkov = optional(object({<br> enabled = optional(bool, false)<br> soft_fail = optional(bool, false)<br> file = optional(string, "$SHOWFILE")<br> }), {})<br> infracost = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> pull_gitlab_variables = optional(object({<br> enabled = optional(bool, false)<br> }), {})<br> check_gitlab_approvals = optional(object({<br> enabled = optional(bool, false)<br> }), {}),<br> }))</pre> | `{}` | no |
| <a name="input_atlantis_server_config"></a> [atlantis\_server\_config](#input\_atlantis\_server\_config) | Atlantis server config. If any option is not available here, it can be passed by `environment_variables` variable | <pre>object({<br> allow_draft_prs = optional(string)<br> allow_fork_prs = optional(string)<br> allow_repo_config = optional(string)<br> atlantis_url = optional(string)<br> automerge = optional(string)<br> autoplan_file_list = optional(string)<br> autoplan_modules = optional(string)<br> autoplan_modules_from_projects = optional(string)<br> azuredevops_hostname = optional(string)<br> azuredevops_webhook_password = optional(string)<br> azuredevops_webhook_user = optional(string)<br> azuredevops_token = optional(string)<br> azuredevops_user = optional(string)<br> bitbucket_base_url = optional(string)<br> bitbucket_token = optional(string)<br> bitbucket_user = optional(string)<br> bitbucket_webhook_secret = optional(string)<br> checkout_strategy = optional(string)<br> config = optional(string)<br> data_dir = optional(string)<br> default_tf_version = optional(string)<br> disable_apply = optional(string)<br> disable_apply_all = optional(string)<br> disable_autoplan = optional(string)<br> disable_markdown_folding = optional(string)<br> disable_repo_locking = optional(string)<br> enable_policy_checks = optional(string)<br> enable_regexp_cmd = optional(string)<br> enable_diff_markdown_format = optional(string)<br> gh_hostname = optional(string)<br> gh_token = optional(string)<br> gh_user = optional(string)<br> gh_webhook_secret = optional(string)<br> gh_org = optional(string)<br> gh_app_id = optional(string)<br> gh_app_slug = optional(string)<br> gh_app_key_file = optional(string)<br> gh_app_key = optional(string)<br> gh_team_allowlist = optional(string)<br> gh_allow_mergeable_bypass_apply = optional(string)<br> gitlab_hostname = optional(string)<br> gitlab_token = optional(string)<br> gitlab_user = optional(string)<br> gitlab_webhook_secret = optional(string)<br> help = optional(string)<br> hide_prev_plan_comments = optional(string)<br> locking_db_type = optional(string)<br> log_level = optional(string)<br> markdown_template_overrides_dir = optional(string)<br> parallel_pool_size = optional(string)<br> port = optional(string)<br> quiet_policy_checks = optional(string)<br> redis_host = optional(string)<br> redis_password = optional(string)<br> redis_port = optional(string)<br> redis_db = optional(string)<br> redis_tls_enabled = optional(string)<br> redis_insecure_skip_verify = optional(string)<br> repo_config = optional(string)<br> repo_config_json = optional(string)<br> repo_whitelist = optional(string)<br> repo_allowlist = optional(string)<br> require_approval = optional(string)<br> require_mergeable = optional(string)<br> silence_fork_pr_errors = optional(string)<br> silence_whitelist_errors = optional(string)<br> silence_allowlist_errors = optional(string)<br> silence_no_projects = optional(string)<br> silence_vcs_status_no_plans = optional(string)<br> skip_clone_no_changes = optional(string)<br> slack_token = optional(string)<br> ssl_cert_file = optional(string)<br> ssl_key_file = optional(string)<br> stats_namespace = optional(string)<br> tf_download_url = optional(string)<br> tfe_hostname = optional(string)<br> tfe_local_execution_mode = optional(string)<br> tfe_token = optional(string)<br> var_file_allowlist = optional(string)<br> vcs_status_name = optional(string)<br> write_git_creds = optional(string)<br> web_basic_auth = optional(bool)<br> web_username = optional(string)<br> web_password = optional(string)<br> websocket_check_origin = optional(string)<br> })</pre> | `{}` | no |
| <a name="input_attributes"></a> [attributes](#input\_attributes) | ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`,<br>in the order they appear in the list. New attributes are appended to the<br>end of the list. The elements of the list are joined by the `delimiter`<br>and treated as a single ID element. | `list(string)` | `[]` | no |
| <a name="input_caddy_container"></a> [caddy\_container](#input\_caddy\_container) | Caddy container configuration | <pre>object({<br> image = optional(string, "caddy")<br> cpu = optional(number, 0.5)<br> memory = optional(number, 0.5)<br> ports = optional(list(object({<br> port = number<br> protocol = optional(string, "TCP")<br> })), [<br> {<br> port = 443<br> protocol = "TCP"<br> },<br> {<br> port = 80<br> protocol = "TCP"<br> }<br> ])<br> commands = optional(list(string), ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"])<br> environment_variables = optional(map(string), {})<br> secure_environment_variables = optional(map(string), {})<br> secure_environment_variables_from_key_vault = optional(map(object({<br> key_vault_id = string<br> name = string<br> })), {})<br> volumes = optional(map(object({<br> mount_path = string<br> read_only = optional(bool, false)<br> empty_dir = optional(bool)<br> git_repo = optional(object({<br> url = string<br> directory = optional(string)<br> revision = optional(string)<br> }))<br> secret = optional(map(string))<br> secret_from_key_vault = optional(map(object({<br> key_vault_id = string<br> name = string<br> })), {})<br> storage_account_name = optional(string)<br> storage_account_key = optional(string)<br> share_name = optional(string)<br> })), {})<br> })</pre> | `{}` | no |
Expand Down
6 changes: 6 additions & 0 deletions modules/caddy-automatic-https/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ variable "atlantis_repo_config_repos_common_config" {
parallel = optional(bool, false)
filter = optional(string)
}), {})
infracost = optional(object({
enabled = optional(bool, false)
}), {})
})
default = {}
}
Expand Down Expand Up @@ -377,6 +380,9 @@ variable "atlantis_repo_config_workflows" {
soft_fail = optional(bool, false)
file = optional(string, "$SHOWFILE")
}), {})
infracost = optional(object({
enabled = optional(bool, false)
}), {})
pull_gitlab_variables = optional(object({
enabled = optional(bool, false)
}), {})
Expand Down

0 comments on commit 861f2bf

Please sign in to comment.