From 7f5f957703cfabdbb3e3377b012b7d6e80f015e2 Mon Sep 17 00:00:00 2001 From: Pablo Alonso Date: Tue, 20 Feb 2024 16:55:55 +0100 Subject: [PATCH] Fixed issues #51 & #52 Former-commit-id: eec0871874e003607780bd2a7115e1261c792fd7 --- orchestrator/networking.tf | 7 ++++--- orchestrator/provider.tf | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/orchestrator/networking.tf b/orchestrator/networking.tf index c596563b..47a31e04 100644 --- a/orchestrator/networking.tf +++ b/orchestrator/networking.tf @@ -1,10 +1,10 @@ # ####################################################################################################### # -# Copyright (c) 2023 Oracle and/or its affiliates, All rights reserved. # +# Copyright (c) 2024 Oracle and/or its affiliates, All rights reserved. # # Licensed under the Universal Permissive License v 1.0 as shown at https: //oss.oracle.com/licenses/upl. # # Author: Cosmin Tudor # # Author email: cosmin.tudor@oracle.com # -# Last Modified: Tue Nov 21 2023 # -# Modified by: Cosmin Tudor, email: cosmin.tudor@oracle.com # +# Last Modified: Tue Feb 20 2024 # +# Modified by: Pablo Alonso, email: pablo.alonso@oracle.com # # ####################################################################################################### # locals { @@ -242,6 +242,7 @@ locals { network_security_groups = vcn_value.network_security_groups != null ? length(vcn_value.network_security_groups) > 0 ? { for nsg_key, nsg_value in vcn_value.network_security_groups : nsg_key => { compartment_id = nsg_value.compartment_id != null ? nsg_value.compartment_id : nsg_value.compartment_key != null ? local.compartments[nsg_value.compartment_key].id : null + display_name = nsg_value.display_name defined_tags = nsg_value.defined_tags freeform_tags = nsg_value.freeform_tags ingress_rules = nsg_value.ingress_rules diff --git a/orchestrator/provider.tf b/orchestrator/provider.tf index acbcb49d..b2487996 100644 --- a/orchestrator/provider.tf +++ b/orchestrator/provider.tf @@ -3,8 +3,8 @@ # Licensed under the Universal Permissive License v 1.0 as shown at https: //oss.oracle.com/licenses/upl. # # Author: Cosmin Tudor # # Author email: cosmin.tudor@oracle.com # -# Last Modified: Thu Nov 16 2023 # -# Modified by: Cosmin Tudor, email: cosmin.tudor@oracle.com # +# Last Modified: Tue Feb 20 2024 # +# Modified by: Pablo Alonso, email: pablo.alonso@oracle.com # # ####################################################################################################### # provider "oci" { @@ -14,6 +14,7 @@ provider "oci" { fingerprint = var.fingerprint private_key_path = var.private_key_path private_key_password = var.private_key_password + ignore_defined_tags = ["Oracle-Tags.CreatedBy", "Oracle-Tags.CreatedOn"] } terraform {