fix: updated logic which was using deprecated lookup function<br>* fixed bug where wait_till variable was not being used (#648)

akocbek · web-flow · commit 8425eb3692a6 · 2023-12-12T15:20:48.000Z
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-10-14T15:23:43Z",
+  "generated_at": "2023-12-11T18:26:42Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -88,7 +88,7 @@
       }
     ]
   },
-  "version": "0.13.1+ibm.61.dss",
+  "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,
     "hash": null
diff --git a/bastion_host.tf b/bastion_host.tf
@@ -65,7 +65,7 @@ module "bastion_host" {
   ]
   ssh_key_ids = [
     for ssh_key in each.value.ssh_keys :
-    lookup(module.ssh_keys.ssh_key_map, ssh_key).id
+    module.ssh_keys.ssh_key_map[ssh_key].id
   ]
   machine_type       = each.value.machine_type
   security_group     = each.value.security_group
diff --git a/commitlint.config.js b/commitlint.config.js
diff --git a/common-dev-assets b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 58d733c8481b5c32af65955fbd324c5f69bca4a2
+Subproject commit 3f72dcec43245fcd9c9e9b99dfa13158a1d280fb
diff --git a/f5_vsi.tf b/f5_vsi.tf
@@ -136,7 +136,7 @@ module "f5_vsi" {
       interface_name    = group.interface_name
     }
   ]
-  image_id       = lookup(local.public_image_map[each.value.f5_image_name], var.region)
+  image_id       = local.public_image_map[each.value.f5_image_name][var.region]
   user_data      = module.dynamic_values.f5_template_map[each.key].user_data
   machine_type   = each.value.machine_type
   vsi_per_subnet = 1
@@ -155,7 +155,7 @@ module "f5_vsi" {
   # Get ssh keys
   ssh_key_ids = [
     for ssh_key in each.value.ssh_keys :
-    lookup(module.ssh_keys.ssh_key_map, ssh_key).id
+    module.ssh_keys.ssh_key_map[ssh_key].id
   ]
   # Get block storage volumes
   block_storage_volumes = each.value.block_storage_volumes == null ? [] : [
diff --git a/kms/dynamic_values.unit_tests.tf b/kms/dynamic_values.unit_tests.tf
@@ -22,13 +22,13 @@ locals {
   # tflint-ignore: terraform_unused_declarations
   assert_use_kms_resource_returns_correct_crn = regex("resource", module.unit_test_kms_resource.crn)
   # tflint-ignore: terraform_unused_declarations
-  assert_key_exists_in_map = lookup(module.unit_test_hs_crypto.keys, "test_key")
+  assert_key_exists_in_map = module.unit_test_hs_crypto.keys["test_key"]
   # tflint-ignore: terraform_unused_declarations
   assert_key_ring_exists_in_map = regex("test-ring", module.unit_test_hs_crypto.key_rings[0])
   # tflint-ignore: terraform_unused_declarations
   assert_no_duplicate_key_rings = regex("1", tostring(length(module.unit_test_hs_crypto.key_rings)))
   # tflint-ignore: terraform_unused_declarations
-  assert_key_management_policy_exists = lookup(module.unit_test_hs_crypto.policies, "test_key")
+  assert_key_management_policy_exists = module.unit_test_hs_crypto.policies["test_key"]
 }
 
 ##############################################################################
diff --git a/module-metadata.json b/module-metadata.json
diff --git a/patterns/mixed/config.tf b/patterns/mixed/config.tf
@@ -302,7 +302,7 @@ locals {
     key_management                 = lookup(local.override[local.override_type], "key_management", local.config.key_management)
     atracker                       = lookup(local.override[local.override_type], "atracker", local.config.atracker)
     clusters                       = lookup(local.override[local.override_type], "clusters", local.config.clusters)
-    wait_till                      = lookup(local.override[local.override_type], "wait_till", "IngressReady")
+    wait_till                      = lookup(local.override[local.override_type], "wait_till", var.wait_till)
     iam_account_settings           = lookup(local.override[local.override_type], "iam_account_settings", local.config.iam_account_settings)
     access_groups                  = lookup(local.override[local.override_type], "access_groups", local.config.access_groups)
     appid                          = lookup(local.override[local.override_type], "appid", local.config.appid)
diff --git a/patterns/roks/module/config.tf b/patterns/roks/module/config.tf
@@ -282,7 +282,7 @@ locals {
     key_management                 = lookup(local.override[local.override_type], "key_management", local.config.key_management)
     atracker                       = lookup(local.override[local.override_type], "atracker", local.config.atracker)
     clusters                       = lookup(local.override[local.override_type], "clusters", local.config.clusters)
-    wait_till                      = lookup(local.override[local.override_type], "wait_till", "IngressReady")
+    wait_till                      = lookup(local.override[local.override_type], "wait_till", var.wait_till)
     iam_account_settings           = lookup(local.override[local.override_type], "iam_account_settings", local.config.iam_account_settings)
     access_groups                  = lookup(local.override[local.override_type], "access_groups", local.config.access_groups)
     appid                          = lookup(local.override[local.override_type], "appid", local.config.appid)
diff --git a/security_groups.tf b/security_groups.tf
@@ -53,18 +53,12 @@ resource "ibm_is_security_group_rule" "security_group_rules" {
     # Conditianally add content if sg has icmp
     content {
       type = lookup(
-        lookup(
-          each.value,
-          "icmp"
-        ),
+        each.value["icmp"],
         "type",
         null
       )
       code = lookup(
-        lookup(
-          each.value,
-          "icmp"
-        ),
+        each.value["icmp"],
         "code",
         null
       )
@@ -92,19 +86,13 @@ resource "ibm_is_security_group_rule" "security_group_rules" {
     # Conditionally adds content if sg has tcp
     content {
       port_min = lookup(
-        lookup(
-          each.value,
-          "tcp"
-        ),
+        each.value["tcp"],
         "port_min",
         null
       )
 
       port_max = lookup(
-        lookup(
-          each.value,
-          "tcp"
-        ),
+        each.value["tcp"],
         "port_max",
         null
       )
@@ -132,18 +120,12 @@ resource "ibm_is_security_group_rule" "security_group_rules" {
     # Conditionally adds content if sg has tcp
     content {
       port_min = lookup(
-        lookup(
-          each.value,
-          "udp"
-        ),
+        each.value["udp"],
         "port_min",
         null
       )
       port_max = lookup(
-        lookup(
-          each.value,
-          "udp"
-        ),
+        each.value["udp"],
         "port_max",
         null
       )
diff --git a/variables.tf b/variables.tf
@@ -682,6 +682,7 @@ variable "cos" {
 # Service Instance Variables
 ##############################################################################
 
+# tflint-ignore: terraform_unused_declarations
 variable "service_endpoints" {
   description = "Service endpoints. Can be `public`, `private`, or `public-and-private`"
   type        = string
@@ -903,21 +904,21 @@ variable "appid" {
   validation {
     error_message = "Name must be included if use_appid is true."
     condition = (
-      lookup(var.appid, "use_appid") == false
+      var.appid["use_appid"] == false
       ) || (
       lookup(var.appid, "name", null) != null &&
-      lookup(var.appid, "use_appid") == true
+      var.appid["use_appid"] == true
     )
   }
 
   # app id key validation
   validation {
     condition = lookup(var.appid, "keys", null) == null || (
       length(
-        lookup(var.appid, "keys", null) == null ? [] : lookup(var.appid, "keys")
+        lookup(var.appid, "keys", null) == null ? [] : var.appid["keys"]
         ) == length(
         distinct(
-          lookup(var.appid, "keys", null) == null ? [] : lookup(var.appid, "keys")
+          lookup(var.appid, "keys", null) == null ? [] : var.appid["keys"]
         )
       )
     )
@@ -1049,7 +1050,7 @@ variable "iam_account_settings" {
     condition = (
       lookup(var.iam_account_settings, "allowed_ip_addresses", null) == null
       ? true
-      : can(regex("^([[:digit:]]{1,3}.[[:digit:]]{1,3}.[[:digit:]]{1,3}.[[:digit:]]{1,3}(/[[:digit:]]{1,2})?,?)+$", lookup(var.iam_account_settings, "allowed_ip_addresses")))
+      : can(regex("^([[:digit:]]{1,3}.[[:digit:]]{1,3}.[[:digit:]]{1,3}.[[:digit:]]{1,3}(/[[:digit:]]{1,2})?,?)+$", var.iam_account_settings["allowed_ip_addresses"]))
     )
   }
 
@@ -1080,7 +1081,7 @@ variable "iam_account_settings" {
     condition = (
       lookup(var.iam_account_settings, "mfa", null) == null
       ? true
-      : contains(["NONE", "TOTP", "TOTP4ALL", "LEVEL1", "LEVEL2", "LEVEL3", "null"], lookup(var.iam_account_settings, "mfa"))
+      : contains(["NONE", "TOTP", "TOTP4ALL", "LEVEL1", "LEVEL2", "LEVEL3", "null"], var.iam_account_settings["mfa"])
     )
   }
 
@@ -1089,7 +1090,7 @@ variable "iam_account_settings" {
     condition = (
       lookup(var.iam_account_settings, "restrict_create_service_id", null) == null
       ? true
-      : contains(["NOT_SET", "RESTRICTED", "NOT_RESTRICTED"], lookup(var.iam_account_settings, "restrict_create_service_id"))
+      : contains(["NOT_SET", "RESTRICTED", "NOT_RESTRICTED"], var.iam_account_settings["restrict_create_service_id"])
     )
   }
 
@@ -1098,7 +1099,7 @@ variable "iam_account_settings" {
     condition = (
       lookup(var.iam_account_settings, "restrict_create_platform_apikey", null) == null
       ? true
-      : contains(["NOT_SET", "RESTRICTED", "NOT_RESTRICTED"], lookup(var.iam_account_settings, "restrict_create_platform_apikey"))
+      : contains(["NOT_SET", "RESTRICTED", "NOT_RESTRICTED"], var.iam_account_settings["restrict_create_platform_apikey"])
     )
   }
 
@@ -1432,7 +1433,7 @@ variable "f5_template_data" {
 
   validation {
     error_message = "Value for tmos_password must be at least 15 characters, contain one numeric, one uppercase, and one lowercase character."
-    condition = lookup(var.f5_template_data, "tmos_admin_password") == null ? true : (
+    condition = var.f5_template_data["tmos_admin_password"] == null ? true : (
       length(var.f5_template_data.tmos_admin_password) >= 15
       && can(regex("[A-Z]", var.f5_template_data.tmos_admin_password))
       && can(regex("[a-z]", var.f5_template_data.tmos_admin_password))
diff --git a/virtual_servers.tf b/virtual_servers.tf
@@ -64,7 +64,7 @@ module "vsi" {
   ]
   ssh_key_ids = [
     for ssh_key in each.value.ssh_keys :
-    lookup(module.ssh_keys.ssh_key_map, ssh_key).id
+    module.ssh_keys.ssh_key_map[ssh_key].id
   ]
   machine_type   = each.value.machine_type
   vsi_per_subnet = each.value.vsi_per_subnet

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"files": "go.sum\|^.secrets.baseline$",`
`4`	`4`	`"lines": null`
`5`	`5`	`},`
`6`		`- "generated_at": "2023-10-14T15:23:43Z",`
	`6`	`+ "generated_at": "2023-12-11T18:26:42Z",`
`7`	`7`	`"plugins_used": [`
`8`	`8`	`{`
`9`	`9`	`"name": "AWSKeyDetector"`
`@@ -88,7 +88,7 @@`
`88`	`88`	`}`
`89`	`89`	`]`
`90`	`90`	`},`
`91`		`- "version": "0.13.1+ibm.61.dss",`
	`91`	`+ "version": "0.13.1+ibm.62.dss",`
`92`	`92`	`"word_list": {`
`93`	`93`	`"file": null,`
`94`	`94`	`"hash": null`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ module "bastion_host" {`
`65`	`65`	`]`
`66`	`66`	`ssh_key_ids = [`
`67`	`67`	`for ssh_key in each.value.ssh_keys :`
`68`		`- lookup(module.ssh_keys.ssh_key_map, ssh_key).id`
	`68`	`+ module.ssh_keys.ssh_key_map[ssh_key].id`
`69`	`69`	`]`
`70`	`70`	`machine_type = each.value.machine_type`
`71`	`71`	`security_group = each.value.security_group`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ module "f5_vsi" {`
`136`	`136`	`interface_name = group.interface_name`
`137`	`137`	`}`
`138`	`138`	`]`
`139`		`- image_id = lookup(local.public_image_map[each.value.f5_image_name], var.region)`
	`139`	`+ image_id = local.public_image_map[each.value.f5_image_name][var.region]`
`140`	`140`	`user_data = module.dynamic_values.f5_template_map[each.key].user_data`
`141`	`141`	`machine_type = each.value.machine_type`
`142`	`142`	`vsi_per_subnet = 1`
`@@ -155,7 +155,7 @@ module "f5_vsi" {`
`155`	`155`	`# Get ssh keys`
`156`	`156`	`ssh_key_ids = [`
`157`	`157`	`for ssh_key in each.value.ssh_keys :`
`158`		`- lookup(module.ssh_keys.ssh_key_map, ssh_key).id`
	`158`	`+ module.ssh_keys.ssh_key_map[ssh_key].id`
`159`	`159`	`]`
`160`	`160`	`# Get block storage volumes`
`161`	`161`	`block_storage_volumes = each.value.block_storage_volumes == null ? [] : [`