From 8af01246e44e795ea9566d47680eab7b88766336 Mon Sep 17 00:00:00 2001 From: Vincent Burckhardt Date: Fri, 1 Dec 2023 10:57:37 +0000 Subject: [PATCH 1/2] fix: address prefix auto generated when subnets passed --- common-dev-assets | 2 +- main.tf | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common-dev-assets b/common-dev-assets index b2245098..e76d022b 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit b2245098f2b3d23be7b9ed89e734f8766fb96696 +Subproject commit e76d022bbbae0a97ee32760da427697000d4e0d1 diff --git a/main.tf b/main.tf index 9f492643..14ba7210 100644 --- a/main.tf +++ b/main.tf @@ -39,11 +39,12 @@ locals { ############################################################################## resource "ibm_is_vpc" "vpc" { - count = var.create_vpc == true ? 1 : 0 - name = var.prefix != null ? "${var.prefix}-${var.name}-vpc" : "${var.name}-vpc" - resource_group = var.resource_group_id - classic_access = var.classic_access - address_prefix_management = length([for prefix in values(coalesce(var.address_prefixes, {})) : prefix if prefix != null]) != 0 ? "manual" : null + count = var.create_vpc == true ? 1 : 0 + name = var.prefix != null ? "${var.prefix}-${var.name}-vpc" : "${var.name}-vpc" + resource_group = var.resource_group_id + classic_access = var.classic_access + # address prefix is set to auto only if no address prefixes NOR any subnet is passed as input + address_prefix_management = (length([for prefix in values(coalesce(var.address_prefixes, {})) : prefix if prefix != null]) != 0) || (length([for subnet in values(coalesce(var.subnets, {})) : subnet if subnet != null]) != 0) ? "manual" : null default_network_acl_name = var.default_network_acl_name default_security_group_name = var.default_security_group_name default_routing_table_name = var.default_routing_table_name From 9feb54c36c87bf20be5ae57c2aa11b7756b92961 Mon Sep 17 00:00:00 2001 From: Vincent Burckhardt Date: Mon, 18 Dec 2023 10:28:34 +0000 Subject: [PATCH 2/2] chore: bump dev tools --- .secrets.baseline | 4 ++-- common-dev-assets | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index 44be5965..255a6c72 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "go.sum|^.secrets.baseline$", "lines": null }, - "generated_at": "2023-11-07T13:53:51Z", + "generated_at": "2023-12-18T10:27:35Z", "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 index e76d022b..ef9143b8 160000 --- a/common-dev-assets +++ b/common-dev-assets @@ -1 +1 @@ -Subproject commit e76d022bbbae0a97ee32760da427697000d4e0d1 +Subproject commit ef9143b8eab6d30962ab1c50aec4aca9837256c1