Make label prefix optional (#4)

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

Author: karthicgit-zz

compute.tf

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

examples/variables.tf

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

ons.tf

@@ -12,7 +12,7 @@ provider "oci" {
 
 resource "oci_ons_notification_topic" "bastion_notification" {
   compartment_id = var.compartment_id
-  name           = "${var.label_prefix}-${var.notification_topic}"
+  name           = var.label_prefix == "none" ? var.notification_topic : "${var.label_prefix}-${var.notification_topic}"
 
   count = (var.bastion_enabled == true && var.notification_enabled == true) ? 1 : 0
 }
@@ -33,7 +33,7 @@ resource "oci_identity_dynamic_group" "bastion_notification" {
   depends_on     = [oci_core_instance.bastion]
   description    = "dynamic group to allow bastion to send notifications to ONS"
   matching_rule  = "ALL {instance.id = '${join(",", data.oci_core_instance.bastion.*.id)}'}"
-  name           = "${var.label_prefix}-bastion-notification"
+  name           = var.label_prefix == "none" ? "bastion-notification" : "${var.label_prefix}-bastion-notification"
 
   count = (var.bastion_enabled == true && var.notification_enabled == true) ? 1 : 0
 }
@@ -44,7 +44,7 @@ resource "oci_identity_policy" "bastion_notification" {
   compartment_id = var.compartment_id
   depends_on     = [oci_core_instance.bastion]
   description    = "policy to allow bastion host to publish messages to ONS"
-  name           = "${var.label_prefix}-bastion-notification"
+  name           = var.label_prefix == "none" ? "bastion-notification" : "${var.label_prefix}-bastion-notification"
   statements     = ["Allow dynamic-group ${oci_identity_dynamic_group.bastion_notification[0].name} to use ons-topic in compartment id ${var.compartment_id} where request.permission='ONS_TOPIC_PUBLISH'"]
 
   count = (var.bastion_enabled == true && var.notification_enabled == true) ? 1 : 0

security.tf

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

subnets.tf

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

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