Merge pull request #17 from oracle/springboot-v1.0.1

Kuassim · web-flow · commit 7c4f93d9d6cf · 2023-02-16T11:03:23.000-08:00
Springboot v1.0.1
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ frontend/build
 .env.development.local
 .env.test.local
 .env.production.local
+.idea
 
 frontend/package-lock.json
 frontend/npm-debug.log*
diff --git a/MtdrSpring/.gitignore b/MtdrSpring/.gitignore
@@ -0,0 +1,3 @@
+**/node_modules/**
+**/build/**
+**/target/**
diff --git a/MtdrSpring/backend/src/main/resources/todolistapp-springboot.yaml b/MtdrSpring/backend/src/main/resources/todolistapp-springboot.yaml
@@ -2,8 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   name: todolistapp-springboot-service
+  annotations:
+    oci.oraclecloud.com/loadbalancer-policy: "IP_HASH"
 spec:
   type: LoadBalancer
+  externalTrafficPolicy: Local
+
   ports:
     - port: 80
       protocol: TCP
@@ -32,7 +36,7 @@ spec:
   selector:
     matchLabels:
       app: todolistapp-springboot
-  replicas: 1
+  replicas: 2
   template:
     metadata:
       labels:
diff --git a/MtdrSpring/terraform/containerengine.tf b/MtdrSpring/terraform/containerengine.tf
@@ -8,8 +8,8 @@ resource "oci_containerengine_cluster" "mtdrworkshop_cluster" {
     ]
     subnet_id = oci_core_subnet.endpoint.id
   }
-  kubernetes_version  = "v1.23.4"
-  name                = "mtdrworkshopcluster"
+  kubernetes_version  = "v1.25.4"
+  name                = "mtdrworkshopcluster-${var.mtdrKey}"
   vcn_id              = oci_core_vcn.okevcn.id
   #optional
 
@@ -36,7 +36,7 @@ resource "oci_containerengine_node_pool" "oke_node_pool" {
   #Required
   cluster_id         = oci_containerengine_cluster.mtdrworkshop_cluster.id
   compartment_id     = var.ociCompartmentOcid
-  kubernetes_version = "v1.23.4"
+  kubernetes_version = "v1.25.4"
   name               = "Pool"
   #  node_shape="VM.Standard2.4"
   #  node_shape         = "VM.Standard.B2.1"
diff --git a/MtdrSpring/terraform/core.tf b/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" {
diff --git a/MtdrSpring/terraform/main-var.tf b/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" {}
diff --git a/MtdrSpring/terraform/object_storage.tf b/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
+}
diff --git a/MtdrSpring/terraform/outputs.tf b/MtdrSpring/terraform/outputs.tf
@@ -0,0 +1,3 @@
+output lab_oke_cluster_id {
+  value = oci_containerengine_cluster.mtdrworkshop_cluster.id
+}
diff --git a/MtdrSpring/terraform/repositories.tf b/MtdrSpring/terraform/repositories.tf
@@ -0,0 +1,6 @@
+resource "oci_artifacts_container_repository" todolist {
+  #Required
+  compartment_id = var.ociCompartmentOcid
+  display_name = "${var.runName}/${var.mtdrKey}/todolistapp-springboot"
+  is_public = true
+}
diff --git a/MtdrSpring/utils/db-setup.sh b/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
diff --git a/MtdrSpring/utils/java-builds.sh b/MtdrSpring/utils/java-builds.sh
@@ -9,12 +9,12 @@ set -e
 BUILDS="todolistapp-springboot"
 
 # Provision Repos
-while ! state_done JAVA_REPOS; do
-  for b in $BUILDS; do
-    oci artifacts container repository create --compartment-id "$(state_get COMPARTMENT_OCID)" --display-name "$(state_get RUN_NAME)/$b" --is-public true
-  done
-  state_set_done JAVA_REPOS
-done
+#while ! state_done JAVA_REPOS; do
+#  for b in $BUILDS; do
+#    oci artifacts container repository create --compartment-id "$(state_get COMPARTMENT_OCID)" --display-name "$(state_get RUN_NAME)/$b" --is-public true
+#  done
+#  state_set_done JAVA_REPOS
+#done
 
 
 # Install Graal
diff --git a/MtdrSpring/utils/main-destroy.sh b/MtdrSpring/utils/main-destroy.sh
@@ -53,6 +53,7 @@ export TF_VAR_ociCompartmentOcid="$(state_get COMPARTMENT_OCID)"
 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)"
 terraform init
 terraform destroy -auto-approve
 
diff --git a/MtdrSpring/utils/main-setup.sh b/MtdrSpring/utils/main-setup.sh
@@ -54,8 +54,8 @@ while ! state_done USER_OCID; do
     USER_OCID=$TEST_USER_OCID
   fi
   # Validate
-  if test ""`oci iam user get --user-id "$OCI_CS_USER_OCID" --query 'data."lifecycle-state"' --raw-output 2>$MTDRWORKSHOP_LOG/user_ocid_err` == 'ACTIVE'; then
-    state_set USER_OCID "$OCI_CS_USER_OCID"
+  if test ""`oci iam user get --user-id "$USER_OCID" --query 'data."lifecycle-state"' --raw-output 2>$MTDRWORKSHOP_LOG/user_ocid_err` == 'ACTIVE'; then
+    state_set USER_OCID "$USER_OCID"
   else
     echo "That user OCID could not be validated"
     cat $MTDRWORKSHOP_LOG/user_ocid_err
@@ -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
@@ -109,7 +114,7 @@ done
 ##newest code added later
 while ! state_done COMPARTMENT_OCID; do
   if test $(state_get RUN_TYPE) -ne 3; then
-    read -p "if you have your own compartment, enter it here: if not, hit enter" COMPARTMENT_OCID
+    read -p "if you have your own compartment, enter it here: (if not, hit enter) " COMPARTMENT_OCID
     ##newest condition added
     if test "$COMPARTMENT_OCID" != "" && test `oci iam compartment get --compartment-id "$COMPARTMENT_OCID" --query 'data."lifecycle-state"' --raw-output 2>/dev/null` == 'ACTIVE'; then
       state_set COMPARTMENT_OCID "$COMPARTMENT_OCID"
@@ -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
diff --git a/MtdrSpring/utils/oke-setup.sh b/MtdrSpring/utils/oke-setup.sh
@@ -23,8 +23,12 @@ done
 
 # Get OKE OCID
 while ! state_done OKE_OCID; do
-  OKE_OCID=`oci ce cluster list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ',data[?"'"lifecycle-state"'"=='ACTIVE'].id)" --raw-output`
-  state_set OKE_OCID "$OKE_OCID"
+  OKE_OCID=$(terraform -chdir="${MTDRWORKSHOP_LOCATION}"/terraform output -json | python "$MTDRWORKSHOP_LOCATION"/utils/python-scripts/process-cluster-ocid-json.py)
+  if [[ $OKE_OCID == Error* ]]; then
+    echo "$OKE_OCID"
+    exit
+  fi
+    state_set OKE_OCID "$OKE_OCID"
   # Wait for OKE to warm up
 done
 
@@ -47,7 +51,7 @@ while ! state_done KUBECTL; do
 done
 
 
-# Wait for OKE nodes to become redy
+# Wait for OKE nodes to become ready
 while ! state_done BYO_K8S; do
   READY_NODES=`kubectl get nodes | grep Ready | wc -l` || echo 'Ignoring any Error'
   if test "$READY_NODES" -ge 3; then
diff --git a/MtdrSpring/utils/os-destroy.sh b/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
diff --git a/MtdrSpring/utils/python-scripts/generate-unique-key.py b/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)
diff --git a/MtdrSpring/utils/python-scripts/process-cluster-ocid-json.py b/MtdrSpring/utils/python-scripts/process-cluster-ocid-json.py
@@ -0,0 +1,18 @@
+import sys
+import json
+
+# This simple python file reads JSON and tries to access the lab_oke_cluster_id value
+# and prints the OCID for processing. The JSON is expected
+
+
+system_input = json.load(sys.stdin)
+
+try:
+    OCID = system_input["lab_oke_cluster_id"]["value"]
+    print(OCID)
+except KeyError as e:
+    print("Error: Failed to access expected JSON key lab_oke_cluster_id or value")
+except json.decoder.JSONDecodeError as e:
+    print("Error: Failed to decode JSON")
+except Exception as e:
+    print("Error: Encountered unexpected error")
diff --git a/MtdrSpring/utils/repo-destroy.sh b/MtdrSpring/utils/repo-destroy.sh
@@ -7,16 +7,16 @@ set -e
 
 
 # Delete Images
-echo "Deleting Images"
-IIDS=`oci artifacts container image list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ',data.items[*].id)" --raw-output`
-for i in $IIDS; do
-  oci artifacts container image delete --image-id "$i" --force
-done
-
-# Delete Repos
-echo "Deleting Repositories"
-REPO_IDS=`oci artifacts container repository list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ', data.items[*].id)" --raw-output`
-for r in $REPO_IDS; do
-  oci artifacts container repository delete --repository-id "$r" --force
-done
+#echo "Deleting Images"
+#IIDS=`oci artifacts container image list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ',data.items[*].id)" --raw-output`
+#for i in $IIDS; do
+#  oci artifacts container image delete --image-id "$i" --force
+#done
+#
+## Delete Repos
+#echo "Deleting Repositories"
+#REPO_IDS=`oci artifacts container repository list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ', data.items[*].id)" --raw-output`
+#for r in $REPO_IDS; do
+#  oci artifacts container repository delete --repository-id "$r" --force
+#done
 
diff --git a/MtdrSpring/utils/terraform.sh b/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
diff --git a/README.md b/README.md
@@ -8,4 +8,12 @@ A repository for full stack Cloud Native applications with a React JS frontend a
 The `mtdrworkshop` repository hosts the materiald (code, scripts and instructions) for building and deploying Cloud Native Application using a Java/Helidon backend
 
 
+### Requirements
+The lab executes scripts that require the following software to run properly: (These are already installed on and included with the OCI Cloud Shell)
+* oci-cli
+* python 2.7^
+* terraform
+* kubectl
+* mvn (maven) 
+
 ## Expect more ...

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/node_modules/`
	`2`	`+/build/`
	`3`	`+/target/`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`resource "oci_core_vcn" "okevcn" {`
`3`	`3`	`cidr_block = "10.0.0.0/16"`
`4`	`4`	`compartment_id = var.ociCompartmentOcid`
`5`		`- display_name = "mtdrworkshop"`
	`5`	`+ display_name = "mtdrworkshop-${var.mtdrKey}"`
`6`	`6`	`dns_label = "mtdrworkshop"`
`7`	`7`	`}`
`8`	`8`	`resource "oci_core_internet_gateway" "igw" {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+output lab_oke_cluster_id {`
	`2`	`+ value = oci_containerengine_cluster.mtdrworkshop_cluster.id`
	`3`	`+}`