Updated Object Storage provisioning and deletion

Author: aberinnj

MtdrSpring/terraform/object_storage.tf

@@ -0,0 +1,11 @@
+data oci_objectstorage_namespace namespace {
+  #Required
+  compartment_id = var.ociCompartmentOcid
+}
+
+resource "oci_objectstorage_bucket" dbbucket {
+  #Required
+  compartment_id = var.ociCompartmentOcid
+  name = "${var.runName}-${var.mtdrKey}"
+  namespace = data.oci_objectstorage_namespace.namespace.namespace
+}

MtdrSpring/utils/db-setup.sh

@@ -8,10 +8,12 @@ set -e
 
 # Create Object Store Bucket (Should be replaced by terraform one day)
 while ! state_done OBJECT_STORE_BUCKET; do
-  echo "creating object storage bucket"
-  oci os bucket create --compartment-id "$(state_get COMPARTMENT_OCID)" --name "$(state_get RUN_NAME)"
-  state_set_done OBJECT_STORE_BUCKET
-  echo "finished creating object storage buckets"
+  echo "Checking object storage bucket"
+#  oci os bucket create --compartment-id "$(state_get COMPARTMENT_OCID)" --name "$(state_get RUN_NAME)"
+  if oci os bucket get --name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)"; then
+    state_set_done OBJECT_STORE_BUCKET
+    echo "finished checking object storage bucket"
+  fi
 done
 
 
@@ -40,7 +42,7 @@ done
 while ! state_done CWALLET_SSO_OBJECT; do
   echo "grabbing wallet"
   cd $MTDRWORKSHOP_LOCATION/wallet
-  oci os object put --bucket-name "$(state_get RUN_NAME)" --name "cwallet.sso" --file 'cwallet.sso'
+  oci os object put --bucket-name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)" --name "cwallet.sso" --file 'cwallet.sso'
   cd $MTDRWORKSHOP_LOCATION
   state_set_done CWALLET_SSO_OBJECT
   echo "done grabbing wallet"
@@ -50,7 +52,7 @@ done
 # Create Authenticated Link to Wallet
 while ! state_done CWALLET_SSO_AUTH_URL; do
   echo "creating authenticated link to wallet"
-  ACCESS_URI=`oci os preauth-request create --object-name 'cwallet.sso' --access-type 'ObjectRead' --bucket-name "$(state_get RUN_NAME)" --name 'mtdrworkshop' --time-expires $(date '+%Y-%m-%d' --date '+7 days') --query 'data."access-uri"' --raw-output`
+  ACCESS_URI=`oci os preauth-request create --object-name 'cwallet.sso' --access-type 'ObjectRead' --bucket-name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)" --name 'mtdrworkshop' --time-expires $(date '+%Y-%m-%d' --date '+7 days') --query 'data."access-uri"' --raw-output`
   state_set CWALLET_SSO_AUTH_URL "https://objectstorage.$(state_get REGION).oraclecloud.com${ACCESS_URI}"
   echo "done creating authenticated link to wallet"
 done

MtdrSpring/utils/os-destroy.sh

@@ -12,25 +12,25 @@ echo "Deleting Object Store"
 # ## delete object storage bucket
 # oci os bucket delete --bucket-name "$(state_get RUN_NAME)"
 
-PARIDS=`oci os preauth-request list --bucket-name "$(state_get RUN_NAME)" --query "join(' ',data[*].id)" --raw-output`
+PARIDS=`oci os preauth-request list --bucket-name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)" --query "join(' ',data[*].id)" --raw-output`
 for id in $PARIDS; do
-    oci os preauth-request delete --par-id "$id" --bucket-name "$(state_get RUN_NAME)" --force
+    oci os preauth-request delete --par-id "$id" --bucket-name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)" --force
 done
 
 # Object
 if state_done WALLET_ZIP_OBJECT; then
-  oci os object delete --object-name "wallet.zip" --bucket-name "$(state_get RUN_NAME)" --force
+  oci os object delete --object-name "wallet.zip" --bucket-name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)" --force
   state_reset WALLET_ZIP_OBJECT
 fi
 
 # Object
 if state_done CWALLET_SSO_OBJECT; then
-  oci os object delete --object-name "cwallet.sso" --bucket-name "$(state_get RUN_NAME)" --force
+  oci os object delete --object-name "cwallet.sso" --bucket-name "$(state_get RUN_NAME)-$(state_get MTDR_KEY)" --force
   state_reset CWALLET_SSO_OBJECT
 fi
 
-# Bucket
-if state_done OBJECT_STORE_BUCKET; then
-   oci os bucket delete --bucket-name "$(state_get RUN_NAME)" --force
- state_reset OBJECT_STORE_BUCKET
-fi
+## Bucket
+#if state_done OBJECT_STORE_BUCKET; then
+#   oci os bucket delete --bucket-name "$(state_get RUN_NAME)" --force
+# state_reset OBJECT_STORE_BUCKET
+#fi