make label prefix optional (#7)

Signed-off-by: Karthic Ravindran <[email protected]>

Author: karthicgit-zz

compute.tf

@@ -8,13 +8,13 @@ resource "oci_core_instance" "operator" {
 
   create_vnic_details {
     assign_public_ip = false
-    display_name     = "${var.label_prefix}-operator-vnic"
-    hostname_label   = "${var.label_prefix}-operator"
+    display_name     = var.label_prefix == "none" ? "operator-vnic" : "${var.label_prefix}-operator-vnic"
+    hostname_label   = var.label_prefix == "none" ? "operator" : "${var.label_prefix}-operator"
     nsg_ids          = var.nsg_ids
     subnet_id        = oci_core_subnet.operator[0].id
   }
 
-  display_name = "${var.label_prefix}-operator"
+  display_name = var.label_prefix == "none" ? "operator" : "${var.label_prefix}-operator"
 
   # prevent the operator from destroying and recreating itself if the image ocid changes 
   lifecycle {

instance_principal.tf

@@ -17,7 +17,7 @@ resource "oci_identity_dynamic_group" "operator_instance_principal" {
   compartment_id = var.tenancy_id
   description    = "dynamic group to allow instances to call services for 1 operator"
   matching_rule  = "ALL {instance.id = '${join(",", data.oci_core_instance.operator.*.id)}'}"
-  name           = "${var.label_prefix}-operator-instance-principal"
+  name           = var.label_prefix == "none" ? "operator-instance-principal" : "${var.label_prefix}-operator-instance-principal"
 
   count = var.operator_enabled == true && var.operator_instance_principal == true ? 1 : 0
 }
@@ -27,7 +27,7 @@ resource "oci_identity_policy" "operator_instance_principal" {
 
   compartment_id = var.compartment_id
   description    = "policy to allow operator host to call services"
-  name           = "${var.label_prefix}-operator-instance-principal"
+  name           = var.label_prefix == "none" ? "operator-instance-principal" : "${var.label_prefix}-operator-instance-principal"
   statements     = ["Allow dynamic-group ${oci_identity_dynamic_group.operator_instance_principal[0].name} to manage all-resources in compartment id ${var.compartment_id}"]
 
   count = var.operator_enabled == true && var.operator_instance_principal == true ? 1 : 0

security.tf

@@ -3,7 +3,7 @@
 
 resource "oci_core_security_list" "operator" {
   compartment_id = var.compartment_id
-  display_name   = "${var.label_prefix}-operator"
+  display_name   = var.label_prefix == "none" ? "operator" : "${var.label_prefix}-operator"
   freeform_tags  = var.tags
 
   egress_security_rules {

subnets.tf

@@ -4,7 +4,7 @@
 resource "oci_core_subnet" "operator" {
   cidr_block                 = cidrsubnet(local.vcn_cidr, var.newbits, var.netnum)
   compartment_id             = var.compartment_id
-  display_name               = "${var.label_prefix}-operator"
+  display_name               = var.label_prefix == "none" ? "operator" : "${var.label_prefix}-operator"
   dns_label                  = "operator"
   freeform_tags              = var.tags
   prohibit_public_ip_on_vnic = true

variables.tf

@@ -42,6 +42,7 @@ variable "compartment_id" {
 variable "label_prefix" {
   description = "a string that will be prepended to all resources"
   type        = string
+  default     = "none"
 }
 
 # network parameters