From a5157fe91fe43abe600f97bda0d8b3940774b440 Mon Sep 17 00:00:00 2001
From: Robert Peteuil <robert@peteuil.com>
Date: Fri, 9 Sep 2022 14:23:33 -0700
Subject: [PATCH] change template_file provider to templatefile func

---
 .../terraform-aws/vault-client.tf             | 24 ++++++--------
 .../terraform-aws/vault-server.tf             | 31 +++++++++----------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/identity/vault-agent-demo/terraform-aws/vault-client.tf b/identity/vault-agent-demo/terraform-aws/vault-client.tf
index 7e9e35e9..021cd716 100644
--- a/identity/vault-agent-demo/terraform-aws/vault-client.tf
+++ b/identity/vault-agent-demo/terraform-aws/vault-client.tf
@@ -11,11 +11,18 @@ resource "aws_instance" "vault-client" {
   iam_instance_profile        = aws_iam_instance_profile.vault-client.id
 
   tags = {
-    Name     = "${var.environment_name}-vault-client"
-    TTL      = var.hashibot_reaper_ttl
+    Name = "${var.environment_name}-vault-client"
+    TTL  = var.hashibot_reaper_ttl
   }
 
-  user_data = data.template_file.vault-client.rendered
+  user_data = templatefile(
+    "${path.module}/templates/userdata-vault-client.tpl",
+    {
+      tpl_vault_zip_file     = var.vault_zip_file
+      tpl_vault_service_name = "vault-${var.environment_name}"
+      tpl_vault_server_addr  = aws_instance.vault-server[0].private_ip
+    }
+  )
 
   lifecycle {
     ignore_changes = [
@@ -24,14 +31,3 @@ resource "aws_instance" "vault-client" {
     ]
   }
 }
-
-data "template_file" "vault-client" {
-  template = file("${path.module}/templates/userdata-vault-client.tpl")
-
-  vars = {
-    tpl_vault_zip_file     = var.vault_zip_file
-    tpl_vault_service_name = "vault-${var.environment_name}"
-    tpl_vault_server_addr  = aws_instance.vault-server[0].private_ip
-  }
-}
-
diff --git a/identity/vault-agent-demo/terraform-aws/vault-server.tf b/identity/vault-agent-demo/terraform-aws/vault-server.tf
index 64144ad0..6cca1a51 100644
--- a/identity/vault-agent-demo/terraform-aws/vault-server.tf
+++ b/identity/vault-agent-demo/terraform-aws/vault-server.tf
@@ -12,11 +12,22 @@ resource "aws_instance" "vault-server" {
   iam_instance_profile        = aws_iam_instance_profile.vault-server.id
 
   tags = {
-    Name     = "${var.environment_name}-vault-server-${count.index}"
-    TTL      = var.hashibot_reaper_ttl
+    Name = "${var.environment_name}-vault-server-${count.index}"
+    TTL  = var.hashibot_reaper_ttl
   }
 
-  user_data = data.template_file.vault-server.rendered
+  user_data = templatefile(
+    "${path.module}/templates/userdata-vault-server.tpl",
+    {
+      tpl_vault_zip_file     = var.vault_zip_file
+      tpl_vault_service_name = "vault-${var.environment_name}"
+      tpl_kms_key            = aws_kms_key.vault.id
+      tpl_aws_region         = var.aws_region
+      account_id             = data.aws_caller_identity.current.account_id
+      role_name              = "${var.environment_name}-vault-client-role"
+      tpl_node_id            = "${var.environment_name}-vault-server-role"
+    }
+  )
 
   lifecycle {
     ignore_changes = [
@@ -28,17 +39,3 @@ resource "aws_instance" "vault-server" {
 
 data "aws_caller_identity" "current" {
 }
-
-data "template_file" "vault-server" {
-  template = file("${path.module}/templates/userdata-vault-server.tpl")
-
-  vars = {
-    tpl_vault_zip_file          = var.vault_zip_file
-    tpl_vault_service_name      = "vault-${var.environment_name}"
-    tpl_kms_key                 = aws_kms_key.vault.id
-    tpl_aws_region              = var.aws_region
-    account_id                  = data.aws_caller_identity.current.account_id
-    role_name                   = "${var.environment_name}-vault-client-role"
-    tpl_node_id                 = "${var.environment_name}-vault-server-role"
-  }
-}