Skip to content

Commit

Permalink
fix: Replace template_file with templatefile (#153)
Browse files Browse the repository at this point in the history
The hashicorp/template provider was deprecated and archived about 2
years ago. This commit replaces usage of the `data.template_file`
resources with the `templatefile()` function.

Fixes #152
  • Loading branch information
frits-v committed Jul 28, 2022
1 parent 10ca836 commit 0d02664
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 61 deletions.
37 changes: 36 additions & 1 deletion modules/cluster/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,42 @@ resource "google_compute_instance_template" "vault" {
var.vault_instance_metadata,
{
"google-compute-enable-virtio-rng" = "true"
"startup-script" = data.template_file.vault-startup-script.rendered
# Render the startup script. This script installs and configures
# Vault and all dependencies.
"startup-script" = templatefile("${path.module}/templates/startup.sh.tpl",
{
custom_http_proxy = var.http_proxy
service_account_email = var.vault_service_account_email
internal_lb = local.use_internal_lb
vault_args = var.vault_args
vault_port = var.vault_port
vault_proxy_port = var.vault_proxy_port
vault_version = var.vault_version
vault_tls_bucket = local.vault_tls_bucket
vault_ca_cert_filename = var.vault_ca_cert_filename
vault_tls_key_filename = var.vault_tls_key_filename
vault_tls_cert_filename = var.vault_tls_cert_filename
kms_project = var.vault_tls_kms_key_project == "" ? var.project_id : var.vault_tls_kms_key_project
kms_crypto_key = local.vault_tls_kms_key
user_startup_script = var.user_startup_script
# Render the Vault configuration.
config = templatefile("${path.module}/templates/config.hcl.tpl",
{
kms_project = var.project_id
kms_location = google_kms_key_ring.vault.location
kms_keyring = google_kms_key_ring.vault.name
kms_crypto_key = google_kms_crypto_key.vault-init.name
lb_ip = local.lb_ip
api_addr = local.api_addr
storage_bucket = var.vault_storage_bucket
vault_log_level = var.vault_log_level
vault_port = var.vault_port
vault_proxy_port = var.vault_proxy_port
vault_tls_disable_client_certs = var.vault_tls_disable_client_certs
vault_tls_require_and_verify_client_cert = var.vault_tls_require_and_verify_client_cert
vault_ui_enabled = var.vault_ui_enabled
})
})
},
)

Expand Down
60 changes: 0 additions & 60 deletions modules/cluster/startup.tf

This file was deleted.

0 comments on commit 0d02664

Please sign in to comment.