fix: update logic that was using deprecated lookup feature (#585)

terraform-ibm-modules · Dec 18, 2023 · 8d58f15 · 8d58f15
1 parent eed487e
commit 8d58f15
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 28 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-07-25T10:57:54Z",
+  "generated_at": "2023-12-17T20:20:32Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -77,7 +77,7 @@
     }
   ],
   "results": {},
-  "version": "0.13.1+ibm.61.dss",
+  "version": "0.13.1+ibm.62.dss",
   "word_list": {
     "file": null,
     "hash": null

diff --git a/common-dev-assets b/common-dev-assets
diff --git a/load_balancer.tf b/load_balancer.tf
@@ -13,7 +13,7 @@ resource "ibm_is_lb" "lb" {
   for_each        = local.load_balancer_map
   name            = "${var.prefix}-${each.value.name}-lb"
   subnets         = var.subnets[*].id
-  type            = each.value.type
+  type            = each.value.type #checkov:skip=CKV2_IBM_1:See https://github.com/bridgecrewio/checkov/issues/5824#
   profile         = each.value.profile
   security_groups = each.value.security_group == null ? null : [ibm_is_security_group.security_group[each.value.security_group.name].id]
   resource_group  = var.resource_group_id

diff --git a/security_group.tf b/security_group.tf
@@ -96,18 +96,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
       )
@@ -144,19 +138,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
       )
@@ -193,18 +181,12 @@ resource "ibm_is_security_group_rule" "security_group_rules" {
     # Conditionally adds content if sg has udp
     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
       )
+2 −2		.secrets.baseline
+0 −5		commitlint.config.js
+8 −5		common-go-assets/cloudinfo-region-secmgr-prefs.yaml
+8 −5		common-go-assets/cloudinfo-region-vpc-gen2-prefs.yaml
+13 −0		common-go-assets/common-permanent-resources.yaml
+12 −9		module-assets/.pre-commit-config.yaml
+6 −6		module-assets/ci/install-deps.sh
+0 −216		module-assets/ci/run-catalog-onboarding-pipeline.sh
+14 −1		module-assets/ci/run-tests.sh
+72 −46		module-assets/ci/terraformDocs.py
+1 −1		pipeline-assets/image_vuln_scan.sh