updated tags

Signed-off-by: Ali Mukadam <[email protected]>

Author: hyder

compute.tf

@@ -4,8 +4,7 @@
 resource "oci_core_instance" "operator" {
   availability_domain = element(local.ad_names, (var.availability_domain - 1))
   compartment_id      = var.compartment_id
-  freeform_tags       = var.tags.compute
-   
+  freeform_tags       = var.tags
 
   create_vnic_details {
     assign_public_ip = false

docs/terraformoptions.adoc

@@ -206,12 +206,9 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 |
 [source]
 ----
-compute = {
-  "environment" = "dev"
-  "role"        = "operator"
-}
-network = {
-  "environment" = "dev"
-  "role"        = "operator"
+tags = {
+    department  = "finance"
+    environment = "dev"
+    role        = "bastion"
 }
 ----

security.tf

@@ -4,12 +4,15 @@
 resource "oci_core_security_list" "operator" {
   compartment_id = var.compartment_id
   display_name   = "${var.label_prefix}-operator"
+  freeform_tags  = var.tags
 
   egress_security_rules {
     protocol    = local.all_protocols
     destination = local.anywhere
   }
 
+
+
   ingress_security_rules {
     # allow ssh
     protocol = local.tcp_protocol

subnets.tf

@@ -6,11 +6,11 @@ resource "oci_core_subnet" "operator" {
   compartment_id             = var.compartment_id
   display_name               = "${var.label_prefix}-operator"
   dns_label                  = "operator"
+  freeform_tags              = var.tags
   prohibit_public_ip_on_vnic = true
   route_table_id             = var.nat_route_id
   security_list_ids          = [oci_core_security_list.operator[0].id]
   vcn_id                     = var.vcn_id
-  freeform_tags              = var.tags.network
 
   count = var.operator_enabled == true ? 1 : 0
 }

terraform.tfvars.example

@@ -56,12 +56,7 @@ notification_protocol = "EMAIL"
 notification_topic = "operator"
 
 tags = {
-  compute = {
-    "environment" = "dev"
-    "role"        = "operator"
-  }
-  network = {
-    "environment" = "dev"
-    "role"        = "operator"
-  }
+    department  = "finance"
+    environment = "dev"
+    role        = "bastion"
 }

variables.tf

@@ -152,16 +152,11 @@ variable "notification_topic" {
 
 # tagging
 variable "tags" {
-  description = "Freeform tags for operator"
+  description = "Freeform tags for bastion"
   default = {
-    compute = {
-      "environment" = "dev"
-      "role"        = "operator"
-    }
-    network = {
-      "environment" = "dev"
-      "role"        = "operator"
-    }
+    department  = "finance"
+    environment = "dev"
+    role        = "bastion"
   }
   type = map(any)
 }