feat: added support for wait_till in classic clusters with new variable is_vpc_cluster (#192)

Author: ctolon22

solutions/agents/provider.tf

@@ -21,13 +21,21 @@ provider "helm" {
 }
 
 data "ibm_container_vpc_cluster" "cluster" {
+  count             = var.is_vpc_cluster ? 1 : 0
+  name              = var.cluster_name
+  wait_till         = var.wait_till
+  wait_till_timeout = var.wait_till_timeout
+}
+
+data "ibm_container_cluster" "cluster" {
+  count             = var.is_vpc_cluster ? 0 : 1
   name              = var.cluster_name
   wait_till         = var.wait_till
   wait_till_timeout = var.wait_till_timeout
 }
 
 data "ibm_container_cluster_config" "cluster_config" {
-  cluster_name_id = data.ibm_container_vpc_cluster.cluster.name
+  cluster_name_id = var.is_vpc_cluster ? data.ibm_container_vpc_cluster.cluster[0].name : data.ibm_container_cluster.cluster[0].name
   config_dir      = "${path.module}/kubeconfig"
   endpoint_type   = var.cluster_endpoint_type
 }

solutions/agents/variables.tf

@@ -260,3 +260,9 @@ variable "cluster_scanner_imagesbomextractor_limits_memory" {
   description = "Specifies the memory limit for the image SBOM Extractor that runs on the cluster scanner."
   default     = "350Mi"
 }
+
+variable "is_vpc_cluster" {
+  type        = bool
+  description = "Specify true if the target cluster for the DA is a VPC cluster, false if it is classic cluster."
+  default     = true
+}

solutions/agents/version.tf

@@ -5,7 +5,7 @@ terraform {
     # Lock DA into an exact provider version - renovate automation will keep it updated
     ibm = {
       source  = "ibm-cloud/ibm"
-      version = "1.69.0"
+      version = "1.69.1"
     }
     helm = {
       source  = "hashicorp/helm"

solutions/instances/README.md

@@ -18,7 +18,7 @@ This solution supports provisioning and configuring the following infrastructure
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.69.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | 1.69.1 |
 | <a name="requirement_time"></a> [time](#requirement\_time) | 0.12.0 |
 
 ### Modules
@@ -36,13 +36,13 @@ This solution supports provisioning and configuring the following infrastructure
 
 | Name | Type |
 |------|------|
-| [ibm_en_subscription_email.email_subscription](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.0/docs/resources/en_subscription_email) | resource |
-| [ibm_en_topic.en_topic](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.0/docs/resources/en_topic) | resource |
+| [ibm_en_subscription_email.email_subscription](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.1/docs/resources/en_subscription_email) | resource |
+| [ibm_en_topic.en_topic](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.1/docs/resources/en_topic) | resource |
 | [time_sleep.wait_for_scc](https://registry.terraform.io/providers/hashicorp/time/0.12.0/docs/resources/sleep) | resource |
-| [ibm_en_destinations.en_destinations](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.0/docs/data-sources/en_destinations) | data source |
-| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.0/docs/data-sources/iam_account_settings) | data source |
-| [ibm_resource_group.group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.0/docs/data-sources/resource_group) | data source |
-| [ibm_resource_instance.scc_instance](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.0/docs/data-sources/resource_instance) | data source |
+| [ibm_en_destinations.en_destinations](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.1/docs/data-sources/en_destinations) | data source |
+| [ibm_iam_account_settings.iam_account_settings](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.1/docs/data-sources/iam_account_settings) | data source |
+| [ibm_resource_group.group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.1/docs/data-sources/resource_group) | data source |
+| [ibm_resource_instance.scc_instance](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.69.1/docs/data-sources/resource_instance) | data source |
 
 ### Inputs
 

solutions/instances/version.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.69.0"
+      version = "1.69.1"
     }
     time = {
       source  = "hashicorp/time"