fix: Add null handling for bastion, operator image locals

Signed-off-by: Devon Crouse <devon.crouse@oracle.com>

Author: devoncrouse

module-bastion.tf

@@ -19,13 +19,13 @@ data "oci_core_images" "bastion" {
 }
 
 locals {
-  bastion_public_ip = (var.create_bastion
-    ? one(module.bastion[*].public_ip)
+  bastion_public_ip = (var.create_bastion && length(module.bastion) > 0
+    ? lookup(element(module.bastion, 0), "public_ip", var.bastion_public_ip)
     : var.bastion_public_ip
   )
 
-  bastion_images    = one(data.oci_core_images.bastion[*].images) # Data source result or null
-  bastion_image_ids = local.bastion_images[*].id                  # Image OCIDs from data source
+  bastion_images    = try(data.oci_core_images.bastion[0].images, tolist([])) # Data source result or empty
+  bastion_image_ids = local.bastion_images[*].id                              # Image OCIDs from data source
   bastion_image_id = (var.bastion_image_type == "custom"
     ? var.bastion_image_id : element(coalescelist(local.bastion_image_ids, ["none"]), 0)
   )

module-operator.tf

@@ -20,8 +20,8 @@ data "oci_core_images" "operator" {
 
 locals {
   // The private IP of the operator instance, whether created in this TF state or existing provided by ID
-  operator_private_ip = (local.cluster_enabled && var.create_operator
-    ? one(module.operator[*].private_ip)
+  operator_private_ip = (local.cluster_enabled && var.create_operator && length(module.operator) > 0
+    ? lookup(element(module.operator, 0), "private_ip", var.operator_private_ip)
     : var.operator_private_ip
   )
 
@@ -32,8 +32,8 @@ locals {
   ])
 
   // The resolved image ID for the created operator instance
-  operator_images    = one(data.oci_core_images.operator[*].images) # Data source result or null
-  operator_image_ids = local.operator_images[*].id                  # Image OCIDs from data source
+  operator_images    = try(data.oci_core_images.operator[0].images, tolist([])) # Data source result or empty
+  operator_image_ids = local.operator_images[*].id                              # Image OCIDs from data source
   operator_image_id = (var.operator_image_type == "custom"
     ? var.operator_image_id : element(coalescelist(local.operator_image_ids, ["none"]), 0)
   )

modules/operator/variables.tf

@@ -20,7 +20,7 @@ variable "install_kubectx" { type = bool }
 variable "kubeconfig" { type = string }
 variable "kubernetes_version" { type = string }
 variable "nsg_ids" { type = list(string) }
-variable "operator_image_os_version" { type = string}
+variable "operator_image_os_version" { type = string }
 variable "pv_transit_encryption" { type = bool }
 variable "shape" { type = map(any) }
 variable "ssh_private_key" {

modules/workers/locals.tf

@@ -168,11 +168,11 @@ locals {
     for k, v in local.enabled_worker_pools : tobool(v.drain) ? lookup(v, "size", var.worker_pool_size) : 0
   ])
 
-   # Number of work pools in the worker pools with autoscale enabled
+  # Number of work pools in the worker pools with autoscale enabled
   expected_autoscale_worker_pools = length(local.enabled_worker_pools) == 0 ? 0 : sum([
     for k, v in local.enabled_worker_pools : tobool(v.autoscale) ? 1 : 0
   ])
- 
+
   # Enabled worker_pool map entries for node pools
   enabled_node_pools = {
     for k, v in local.enabled_worker_pools : k => v

variables-cluster.tf

@@ -8,7 +8,7 @@ variable "create_cluster" {
 }
 
 variable "cluster_name" {
-  default     = null
+  default     = "oke"
   description = "The name of oke cluster."
   type        = string
 }