Skip to content

Commit 0feba34

Browse files
authored
fix: replace local script with file (rancher#119)
Signed-off-by: matttrach <matt.trachier@suse.com>
1 parent 67e90c0 commit 0feba34

1 file changed

Lines changed: 14 additions & 62 deletions

File tree

modules/deploy/main.tf

Lines changed: 14 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -70,111 +70,63 @@ resource "file_local" "instantiate_tpl_snapshot" {
7070
}
7171

7272
### Inputs ###
73-
resource "terraform_data" "write_tmp_inputs" {
73+
resource "file_local" "write_tmp_inputs" {
7474
depends_on = [
7575
file_local_directory.deploy_path,
7676
file_local_directory.tf_data_dir,
7777
]
78-
triggers_replace = {
79-
trigger = local.deploy_trigger
80-
}
81-
provisioner "local-exec" {
82-
command = <<-EOT
83-
cat <<'EOF'> "${local.tf_data_dir}/inputs"
84-
${local.inputs}
85-
EOF
86-
EOT
87-
}
78+
directory = local.tf_data_dir
79+
name = "inputs.tmp"
80+
contents = local.inputs
8881
}
8982
resource "file_local_snapshot" "persist_inputs" {
9083
depends_on = [
9184
file_local_directory.deploy_path,
9285
file_local_directory.tf_data_dir,
93-
terraform_data.write_tmp_inputs,
86+
file_local.write_tmp_inputs,
9487
]
9588
directory = local.tf_data_dir
96-
name = "inputs"
89+
name = "inputs.tmp"
9790
update_trigger = local.deploy_trigger
9891
}
99-
resource "terraform_data" "remove_tmp_inputs" {
100-
depends_on = [
101-
file_local_directory.deploy_path,
102-
file_local_directory.tf_data_dir,
103-
terraform_data.write_tmp_inputs,
104-
file_local_snapshot.persist_inputs,
105-
]
106-
triggers_replace = {
107-
trigger = local.deploy_trigger
108-
}
109-
provisioner "local-exec" {
110-
command = <<-EOT
111-
rm -f "${local.tf_data_dir}/inputs"
112-
EOT
113-
}
114-
}
11592
resource "file_local" "instantiate_inputs_snapshot" {
11693
depends_on = [
11794
file_local_directory.deploy_path,
11895
file_local_directory.tf_data_dir,
119-
terraform_data.write_tmp_inputs,
96+
file_local.write_tmp_inputs,
12097
file_local_snapshot.persist_inputs,
121-
terraform_data.remove_tmp_inputs,
12298
]
12399
directory = local.deploy_path
124100
name = "inputs.tfvars"
125101
contents = base64decode(file_local_snapshot.persist_inputs.snapshot)
126102
}
127103

128104
### Environment Variables ###
129-
resource "terraform_data" "write_tmp_envrc" {
105+
resource "file_local" "write_tmp_env" {
130106
depends_on = [
131107
file_local_directory.deploy_path,
132108
file_local_directory.tf_data_dir,
133109
]
134-
triggers_replace = {
135-
trigger = local.deploy_trigger
136-
}
137-
provisioner "local-exec" {
138-
command = <<-EOT
139-
cat <<'EOF'> "${local.tf_data_dir}/envrc"
140-
${local.export_contents}
141-
EOF
142-
EOT
143-
}
110+
directory = local.tf_data_dir
111+
name = "env.tmp"
112+
contents = local.export_contents
144113
}
145114
resource "file_local_snapshot" "persist_envrc" {
146115
depends_on = [
147116
file_local_directory.deploy_path,
148117
file_local_directory.tf_data_dir,
149-
terraform_data.write_tmp_envrc,
118+
file_local.write_tmp_env,
150119
]
151120
directory = local.tf_data_dir
152-
name = "envrc"
121+
name = "env.tmp"
153122
update_trigger = local.deploy_trigger
154123
}
155-
resource "terraform_data" "remove_tmp_envrc" {
156-
depends_on = [
157-
file_local_directory.deploy_path,
158-
file_local_directory.tf_data_dir,
159-
terraform_data.write_tmp_envrc,
160-
file_local_snapshot.persist_envrc,
161-
]
162-
triggers_replace = {
163-
trigger = local.deploy_trigger
164-
}
165-
provisioner "local-exec" {
166-
command = <<-EOT
167-
rm -f "${local.tf_data_dir}/envrc"
168-
EOT
169-
}
170-
}
171124
resource "file_local" "instantiate_envrc_snapshot" {
172125
depends_on = [
173126
file_local_directory.deploy_path,
174127
file_local_directory.tf_data_dir,
175-
terraform_data.write_tmp_envrc,
128+
file_local.write_tmp_env,
176129
file_local_snapshot.persist_envrc,
177-
terraform_data.remove_tmp_envrc,
178130
]
179131
directory = local.deploy_path
180132
name = "envrc"

0 commit comments

Comments
 (0)