From 0d019ccd1f7e215194e2dc125521d586c0492c73 Mon Sep 17 00:00:00 2001
From: Terraform IBM Modules Operations
 <106112202+terraform-ibm-modules-ops@users.noreply.github.com>
Date: Sun, 29 Sep 2024 23:09:39 +0100
Subject: [PATCH] fix: remove terraform version constraints from the agents DA
 variation (#200)

---
 solutions/agents/version.tf                          | 2 +-
 tests/resources/existing-resources/agents/main.tf    | 5 ++++-
 tests/resources/existing-resources/agents/outputs.tf | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/solutions/agents/version.tf b/solutions/agents/version.tf
index 572d341..37efd35 100644
--- a/solutions/agents/version.tf
+++ b/solutions/agents/version.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.3.0, <1.7.0"
+  required_version = ">= 1.3.0"
 
   required_providers {
     # Lock DA into an exact provider version - renovate automation will keep it updated
diff --git a/tests/resources/existing-resources/agents/main.tf b/tests/resources/existing-resources/agents/main.tf
index 356a20f..36e7b52 100644
--- a/tests/resources/existing-resources/agents/main.tf
+++ b/tests/resources/existing-resources/agents/main.tf
@@ -15,12 +15,15 @@ module "resource_group" {
 ##############################################################################
 
 module "landing_zone" {
-  source                 = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v5.33.0"
+  source                 = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone//patterns//roks//module?ref=v6.0.3"
   region                 = var.region
   prefix                 = var.prefix
   tags                   = var.resource_tags
   add_atracker_route     = false
   enable_transit_gateway = false
+  # GHA runtime has no access to private
+  verify_cluster_network_readiness    = false
+  use_ibm_cloud_private_api_endpoints = false
 }
 
 ##############################################################################
diff --git a/tests/resources/existing-resources/agents/outputs.tf b/tests/resources/existing-resources/agents/outputs.tf
index c5db996..c8d506d 100644
--- a/tests/resources/existing-resources/agents/outputs.tf
+++ b/tests/resources/existing-resources/agents/outputs.tf
@@ -10,16 +10,16 @@ output "cluster_data" {
 }
 
 output "workload_cluster_id" {
-  value       = lookup([for cluster in module.landing_zone.cluster_data : cluster if strcontains(cluster.resource_group_name, "workload")][0], "id", "")
+  value       = module.landing_zone.workload_cluster_id
   description = "ID of the workload cluster."
 }
 
 output "workload_cluster_name" {
-  value       = [for cluster_name in module.landing_zone.cluster_names : cluster_name if strcontains(cluster_name, "workload")][0]
+  value       = module.landing_zone.workload_cluster_name
   description = "Name of the workload cluster."
 }
 
 output "cluster_resource_group_id" {
-  value       = lookup([for cluster in module.landing_zone.cluster_data : cluster if strcontains(cluster.resource_group_name, "workload")][0], "resource_group_id", "")
+  value       = module.landing_zone.cluster_data["${var.prefix}-workload-cluster"].resource_group_id
   description = "Resource group ID of the workload cluster."
 }