[terraform] remove deprecated template_file

Dimasta100 · Mar 3, 2022 · 62327e8 · 62327e8
1 parent c49be2d
commit 62327e8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 30 deletions.
diff --git a/terraform/validator/aws/cluster.tf b/terraform/validator/aws/cluster.tf
@@ -53,20 +53,19 @@ locals {
   }
 }
 
-data "template_file" "user_data" {
-  for_each = local.pools
-  template = file("${path.module}/templates/eks_user_data.sh")
-
-  vars = {
-    taints = each.value.taint ? "diem.org/nodepool=${each.key}:NoExecute" : ""
+locals {
+  user_data = { for pool in local.pools :
+    pool => templatefile("${path.module}/templates/eks_user_data.sh", {
+      taints = each.value.taint ? "diem.org/nodepool=${pool.key}:NoExecute" : ""
+    })
   }
 }
 
 resource "aws_launch_template" "nodes" {
   for_each      = local.pools
   name          = "diem-${local.workspace_name}/${each.key}"
   instance_type = each.value.instance_type
-  user_data     = base64encode(data.template_file.user_data[each.key].rendered)
+  user_data     = base64encode(local.user_data[each.key])
 
   tag_specifications {
     resource_type = "instance"

diff --git a/terraform/validator/aws/vault.tf b/terraform/validator/aws/vault.tf
@@ -272,10 +272,8 @@ resource "aws_instance" "bastion" {
   })
 }
 
-data "template_file" "vault_user_data" {
-  template = file("${path.module}/templates/vault_user_data.sh")
-
-  vars = {
+locals {
+  vault_user_data = templatefile("${path.module}/templates/vault_user_data.sh", {
     region           = var.region
     vault_version    = "1.8.1"
     vault_sha256     = "bb411f2bbad79c2e4f0640f1d3d5ef50e2bda7d4f40875a56917c95ff783c2db"
@@ -310,7 +308,7 @@ data "template_file" "vault_user_data" {
         disable_hostname = true
       }
     })
-  }
+  })
 }
 
 resource "aws_launch_template" "vault" {
@@ -319,7 +317,7 @@ resource "aws_launch_template" "vault" {
   instance_type          = "c5.large"
   key_name               = aws_key_pair.diem.key_name
   vpc_security_group_ids = [aws_security_group.vault.id]
-  user_data              = base64encode(data.template_file.vault_user_data.rendered)
+  user_data              = base64encode(local.vault_user_data)
 
   iam_instance_profile {
     arn = aws_iam_instance_profile.vault.arn

diff --git a/terraform/validator/aws/versions.tf b/terraform/validator/aws/versions.tf
@@ -19,9 +19,6 @@ terraform {
     random = {
       source  = "hashicorp/random"
     }
-    template = {
-      source  = "hashicorp/template"
-    }
     time = {
       source  = "hashicorp/time"
     }

diff --git a/terraform/validator/azure/vault.tf b/terraform/validator/azure/vault.tf
@@ -192,10 +192,8 @@ resource "azurerm_linux_virtual_machine" "bastion" {
   }
 }
 
-data "template_file" "vault_user_data" {
-  template = file("${path.module}/templates/vault_user_data.sh")
-
-  vars = {
+locals {
+  vault_user_data = templatefile("${path.module}/templates/vault_user_data.sh", {
     vault_version    = "1.8.1"
     vault_sha256     = "bb411f2bbad79c2e4f0640f1d3d5ef50e2bda7d4f40875a56917c95ff783c2db"
     vault_ca         = tls_self_signed_cert.ca.cert_pem
@@ -233,7 +231,7 @@ data "template_file" "vault_user_data" {
         disable_hostname = true
       }
     })
-  }
+  })
 }
 
 resource "azurerm_linux_virtual_machine_scale_set" "vault" {
@@ -243,7 +241,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vault" {
   sku                 = "Standard_F2s_v2"
   instances           = var.vault_num
   admin_username      = "az-user"
-  custom_data         = base64encode(data.template_file.vault_user_data.rendered)
+  custom_data         = base64encode(local.vault_user_data)
 
   admin_ssh_key {
     username   = "az-user"
@@ -295,8 +293,8 @@ resource "azurerm_lb" "vault" {
 }
 
 resource "azurerm_lb_backend_address_pool" "vault" {
-  name                = "vault"
-  loadbalancer_id     = azurerm_lb.vault.id
+  name            = "vault"
+  loadbalancer_id = azurerm_lb.vault.id
 }
 
 resource "azurerm_lb_probe" "vault" {

diff --git a/terraform/validator/gcp/vault.tf b/terraform/validator/gcp/vault.tf
@@ -214,10 +214,8 @@ resource "google_compute_instance" "bastion" {
   metadata_startup_script = file("${path.module}/templates/bastion_user_data.sh")
 }
 
-data "template_file" "vault_user_data" {
-  template = file("${path.module}/templates/vault_user_data.sh")
-
-  vars = {
+locals {
+  vault_user_data = templatefile("${path.module}/templates/vault_user_data.sh", {
     vault_version    = "1.8.1"
     vault_sha256     = "bb411f2bbad79c2e4f0640f1d3d5ef50e2bda7d4f40875a56917c95ff783c2db"
     vault_ca         = tls_self_signed_cert.ca.cert_pem
@@ -255,7 +253,7 @@ data "template_file" "vault_user_data" {
         disable_hostname = true
       }
     })
-  }
+  })
 }
 
 resource "google_compute_instance_template" "vault" {
@@ -282,7 +280,7 @@ resource "google_compute_instance_template" "vault" {
     ssh-keys = join("\n", [for user, sshkey in var.ssh_keys : "${user}:${sshkey}"])
   }
 
-  metadata_startup_script = data.template_file.vault_user_data.rendered
+  metadata_startup_script = local.vault_user_data
 
   lifecycle {
     create_before_destroy = true