Skip to content

feat: show config.toml and user data in Terraform plan #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 22, 2023
Merged

feat: show config.toml and user data in Terraform plan #754

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6fc131a
feat: show runner config.toml in Terraform plan
tmeijn Mar 17, 2023
abb8678
add local as required provider
tmeijn Mar 17, 2023
ed4eb6c
fmt
tmeijn Mar 17, 2023
18f73fa
fix version in examples
tmeijn Mar 17, 2023
17162b0
update lockfiles....
tmeijn Mar 17, 2023
707403a
disable kics
tmeijn Mar 17, 2023
f960d5e
address PR comments
tmeijn Mar 20, 2023
c160a71
Merge branch 'main' of github.com:cattle-ops/terraform-aws-gitlab-run…
tmeijn Mar 20, 2023
39b3da0
update variable
tmeijn Mar 20, 2023
a10f93c
fix count logic
tmeijn Mar 20, 2023
72df3d3
Merge branch 'main' of github.com:cattle-ops/terraform-aws-gitlab-run…
tmeijn Mar 21, 2023
7ab7a3c
Merge branch 'main' into feat/show-config-files-in-diff
kayman-mk Mar 22, 2023
773bce4
enhance variable description
kayman-mk Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"version": "0.2",
"language": "en",
"words": [
"amazonec",
"amannn",
"anytrue",
"aquasecurity",
Expand All @@ -12,6 +13,8 @@
"concat",
"devskim",
"dind",
"endfor",
"formatlist",
"gitter",
"kics",
"jsonencode",
Expand All @@ -21,11 +24,13 @@
"oxsecurity",
"shuf",
"signoff",
"signum",
"substr",
"templatefile",
"terrascan",
"tfenv",
"tflint",
"tftpl",
"tfsec",
"tfvars",
"tmpfs",
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ builds/

# Python
venv/

# Terraform rendered templates
debug/
7 changes: 6 additions & 1 deletion examples/runner-default/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 19 additions & 15 deletions examples/runner-docker/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 32 additions & 29 deletions examples/runner-multi-region/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/runner-multi-region/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
}
local = {
source = "hashicorp/local"
version = "2.2.3"
version = "2.4.0"
}
null = {
source = "hashicorp/null"
Expand Down
61 changes: 32 additions & 29 deletions examples/runner-pre-registered/.terraform.lock.hcl
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/runner-pre-registered/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ terraform {
}
local = {
source = "hashicorp/local"
version = "2.2.3"
version = "2.4.0"
}
null = {
source = "hashicorp/null"
Expand Down
11 changes: 11 additions & 0 deletions locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,14 @@ locals {

docker_machine_adds_name_tag = signum(sum(local.docker_machine_version_test)) <= 0
}

resource "local_file" "config_toml" {
content = local.template_runner_config
filename = "${path.module}/debug/runner_config.toml"
}

resource "local_file" "user_data" {
count = var.show_user_data_in_plan ? 1 : 0
content = nonsensitive(local.template_user_data)
filename = "${path.module}/debug/user_data.sh"
}
Loading