From 2a80e889ce5a0e01f959be03e52ceffc8790933a Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward@in4it.io>
Date: Mon, 9 May 2022 13:58:40 -0400
Subject: [PATCH] remove template_file provider

---
 docker-demo-3/cloudinit.tf | 15 +++++----------
 docker-demo-3/jenkins.tf   |  2 +-
 docker-demo-3/myapp.tf     | 13 ++++---------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/docker-demo-3/cloudinit.tf b/docker-demo-3/cloudinit.tf
index 8349a64..5e52cb3 100644
--- a/docker-demo-3/cloudinit.tf
+++ b/docker-demo-3/cloudinit.tf
@@ -1,18 +1,13 @@
-data "template_file" "jenkins-init" {
-  template = file("scripts/jenkins-init.sh")
-  vars = {
-    DEVICE          = var.INSTANCE_DEVICE_NAME
-    JENKINS_VERSION = var.JENKINS_VERSION
-  }
-}
-
-data "template_cloudinit_config" "cloudinit-jenkins" {
+data "cloudinit_config" "cloudinit-jenkins" {
   gzip          = false
   base64_encode = false
 
   part {
     content_type = "text/x-shellscript"
-    content      = data.template_file.jenkins-init.rendered
+    content      = templatefile("scripts/jenkins-init.sh", {
+      DEVICE          = var.INSTANCE_DEVICE_NAME
+      JENKINS_VERSION = var.JENKINS_VERSION
+    })
   }
 }
 
diff --git a/docker-demo-3/jenkins.tf b/docker-demo-3/jenkins.tf
index 4f22287..b0e62dc 100644
--- a/docker-demo-3/jenkins.tf
+++ b/docker-demo-3/jenkins.tf
@@ -12,7 +12,7 @@ resource "aws_instance" "jenkins-instance" {
   key_name = aws_key_pair.mykeypair.key_name
 
   # user data
-  user_data = data.template_cloudinit_config.cloudinit-jenkins.rendered
+  user_data = data.cloudinit_config.cloudinit-jenkins.rendered
 }
 
 resource "aws_ebs_volume" "jenkins-data" {
diff --git a/docker-demo-3/myapp.tf b/docker-demo-3/myapp.tf
index d30b744..75de2c5 100644
--- a/docker-demo-3/myapp.tf
+++ b/docker-demo-3/myapp.tf
@@ -1,16 +1,11 @@
 # app
 
-data "template_file" "myapp-task-definition-template" {
-  template = file("templates/app.json.tpl")
-  vars = {
-    REPOSITORY_URL = replace(aws_ecr_repository.myapp.repository_url, "https://", "")
-    APP_VERSION    = var.MYAPP_VERSION
-  }
-}
-
 resource "aws_ecs_task_definition" "myapp-task-definition" {
   family                = "myapp"
-  container_definitions = data.template_file.myapp-task-definition-template.rendered
+  container_definitions = templatefile("templates/app.json.tpl", {
+    REPOSITORY_URL = replace(aws_ecr_repository.myapp.repository_url, "https://", "")
+    APP_VERSION    = var.MYAPP_VERSION
+  })
 }
 
 resource "aws_ecs_service" "myapp-service" {