From 15a4f6c2af85c00cddbc5bfda8b601f18e9ecc77 Mon Sep 17 00:00:00 2001
From: Valentin Widmer <widmerva@amazon.com>
Date: Tue, 19 Dec 2023 16:25:51 +0100
Subject: [PATCH] Small bugfixes and improvements

---
 patterns/aws-vpc-cni-network-policy/main.tf |  2 +-
 patterns/vpc-lattice/main.tf                | 35 ++++++---------------
 patterns/vpc-lattice/versions.tf            |  4 +++
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/patterns/aws-vpc-cni-network-policy/main.tf b/patterns/aws-vpc-cni-network-policy/main.tf
index 1b29e90d85..204407c62f 100644
--- a/patterns/aws-vpc-cni-network-policy/main.tf
+++ b/patterns/aws-vpc-cni-network-policy/main.tf
@@ -101,7 +101,7 @@ module "vpc" {
 }
 
 ################################################################################
-# EKS Addons (demo application + lattice resources)
+# EKS Addons (demo application)
 ################################################################################
 
 module "addons" {
diff --git a/patterns/vpc-lattice/main.tf b/patterns/vpc-lattice/main.tf
index 7f215bcd4c..42c6a681a3 100644
--- a/patterns/vpc-lattice/main.tf
+++ b/patterns/vpc-lattice/main.tf
@@ -159,26 +159,17 @@ module "addons" {
   tags = local.tags
 }
 
-resource "null_resource" "wait_for_crd_registration" {
-  triggers = {
-    build_number = "$(timestamp())"
-  }
-
-  provisioner "local-exec" {
-    command = <<EOF
-      echo "Waiting for crd registration of aws api gateway controller..."
-      sleep 30
-    EOF
-  }
-
+resource "time_sleep" "wait_for_crd_registration" {
   depends_on = [module.addons]
+
+  create_duration = "30s"
 }
 
 data "aws_iam_policy_document" "gateway_api_controller" {
   statement {
     sid       = ""
     effect    = "Allow"
-    resources = ["*"]
+    resources = ["*"] # For testing purposes only - highly recommended limit access to specific resources for production usage
 
     actions = [
       "vpc-lattice:*",
@@ -207,7 +198,7 @@ resource "helm_release" "demo_application" {
   create_namespace = true
   namespace        = "apps"
 
-  depends_on = [null_resource.wait_for_crd_registration]
+  depends_on = [time_sleep.wait_for_crd_registration]
 }
 
 ################################################################################
@@ -246,18 +237,10 @@ resource "aws_vpclattice_service_network_vpc_association" "client_vpc" {
   service_network_identifier = aws_vpclattice_service_network.this.id
 }
 
-resource "null_resource" "wait_for_lattice_resources" {
-  triggers = {
-    build_number = "$(timestamp())"
-  }
-  provisioner "local-exec" {
-    command = <<EOF
-      echo "Waiting for vpc lattice resources..."
-      sleep 120
-    EOF
-  }
-
+resource "time_sleep" "wait_for_lattice_resources" {
   depends_on = [helm_release.demo_application]
+
+  create_duration = "120s"
 }
 
 data "aws_vpclattice_service" "server" {
@@ -265,7 +248,7 @@ data "aws_vpclattice_service" "server" {
 
   tags = local.tags
 
-  depends_on = [null_resource.wait_for_lattice_resources]
+  depends_on = [time_sleep.wait_for_lattice_resources]
 }
 
 ################################################################################
diff --git a/patterns/vpc-lattice/versions.tf b/patterns/vpc-lattice/versions.tf
index b26b395e43..9adde16313 100644
--- a/patterns/vpc-lattice/versions.tf
+++ b/patterns/vpc-lattice/versions.tf
@@ -14,5 +14,9 @@ terraform {
       source  = "hashicorp/kubernetes"
       version = ">= 2.24"
     }
+    time = {
+      source  = "hashicorp/time"
+      version = ">= 0.10"
+    }
   }
 }