Added unique key to avoid naming conflicts

Author: aberinnj

MtdrSpring/terraform/containerengine.tf

@@ -9,7 +9,7 @@ resource "oci_containerengine_cluster" "mtdrworkshop_cluster" {
     subnet_id = oci_core_subnet.endpoint.id
   }
   kubernetes_version  = "v1.25.4"
-  name                = "mtdrworkshopcluster"
+  name                = "mtdrworkshopcluster-${var.mtdrKey}"
   vcn_id              = oci_core_vcn.okevcn.id
   #optional
 

MtdrSpring/terraform/core.tf

@@ -2,7 +2,7 @@
 resource "oci_core_vcn" "okevcn" {
   cidr_block      = "10.0.0.0/16"
   compartment_id  = var.ociCompartmentOcid
-  display_name    = "mtdrworkshop"
+  display_name    = "mtdrworkshop-${var.mtdrKey}"
   dns_label       = "mtdrworkshop"
 }
 resource "oci_core_internet_gateway" "igw" {

MtdrSpring/terraform/main-var.tf

@@ -5,4 +5,7 @@ variable "ociUserOcid" {}
 variable "ociCompartmentOcid" {}
 variable "ociRegionIdentifier" {}
 variable "mtdrDbName" {}
-variable "runName" {}
+variable "runName" {}
+
+# mtdrKey is a unique generated id
+variable "mtdrKey" {}

MtdrSpring/terraform/repositories.tf

@@ -1,6 +1,6 @@
 resource "oci_artifacts_container_repository" todolist {
   #Required
   compartment_id = var.ociCompartmentOcid
-  display_name = "${var.runName}/todolistapp-springboot"
+  display_name = "${var.runName}/${var.mtdrKey}/todolistapp-springboot"
   is_public = true
 }

MtdrSpring/utils/main-setup.sh

@@ -67,6 +67,11 @@ while ! state_done USER_NAME; do
   state_set USER_NAME "$USER_NAME"
 done
 
+# Generate Unique Key
+while ! state_done MTDR_KEY; do
+  state_set MTDR_KEY $(python "$MTDRWORKSHOP_LOCATION/utils/python-scripts/generate-unique-key.py")
+done
+
 
 #Get Run Name from directory name
 while ! state_done RUN_NAME; do
@@ -178,7 +183,7 @@ while ! state_done DOCKER_REGISTRY; do
   while test $RETRIES -le 30; do
     if echo "$TOKEN" | docker login -u "$(state_get NAMESPACE)/$(state_get USER_NAME)" --password-stdin "$(state_get REGION).ocir.io" &>/dev/null; then
       echo "Docker login completed"
-      state_set DOCKER_REGISTRY "$(state_get REGION).ocir.io/$(state_get NAMESPACE)/$(state_get RUN_NAME)"
+      state_set DOCKER_REGISTRY "$(state_get REGION).ocir.io/$(state_get NAMESPACE)/$(state_get RUN_NAME)/$(state_get MTDR_KEY)"
       export OCI_CLI_PROFILE=$(state_get REGION)
       break
     else

MtdrSpring/utils/python-scripts/generate-unique-key.py

@@ -0,0 +1,11 @@
+import random
+import string
+
+def get_random_key(length):
+    letters = string.ascii_lowercase
+    digits = string.digits
+    length = length
+    result_str = ''.join(random.choice(letters + digits) for i in range(length))
+    print(result_str)
+
+get_random_key(5)

MtdrSpring/utils/terraform.sh

@@ -14,6 +14,7 @@ if ! state_done PROVISIONING; then
   export TF_VAR_ociRegionIdentifier="$(state_get REGION)"
   export TF_VAR_runName="$(state_get RUN_NAME)"
   export TF_VAR_mtdrDbName="$(state_get MTDR_DB_NAME)"
+  export TF_VAR_mtdrKey="$(state_get MTDR_KEY)"
   #export TF_VAR_inventoryDbName="$(state_get INVENTORY_DB_NAME)"
 
   if state_done K8S_PROVISIONING; then