Merge pull request #28 from oracle/helidon-v2.0.0

Helidon v2.0.0 update

Author: Kuassim

.gitignore

@@ -26,7 +26,9 @@ hs_err_pid*
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-frontend/node_modules
+*/frontend-app/node_modules
+*/frontend/node_modules
+*/backend/target
 frontend/.pnp
 .pnp.js
 
@@ -42,8 +44,6 @@ frontend/build
 .env.development.local
 .env.test.local
 .env.production.local
-
-frontend/package-lock.json
-frontend/npm-debug.log*
-frontend/yarn-debug.log*
-frontend/yarn-error.log*
+.idea
+*/*/wallet/*
+*/wallet

README.md

@@ -5,7 +5,6 @@ A repository for full stack Cloud Native applications with a React JS frontend a
 
 
 ## MyToDo React JS
-The `mtdrworkshop` repository hosts the materiald (code, scripts and instructions) for building and deploying Cloud Native Application using a Java/Helidon backend
+The `mtdrworkshop` repository hosts the materials (code, scripts and instructions) for building and deploying Cloud Native Application using a Java/Helidon backend
 
 
-## Expect more ...

THIRD_PARTY_LICENSES.txt

@@ -1,3 +1,30 @@
+NextJS
+https://github.com/vercel/next.js
+
+The MIT License (MIT)
+
+Copyright (c) 2023 Vercel, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+___________________________________________________________________________________________________
+
 React
 https://github.com/facebook/react/
 

mtdrworkshop/README.md

@@ -1,4 +1,4 @@
-# MyToDoReact version 1.0.
+# MyToDoReact version 2.0.0
 Copyright (c) 2021 Oracle, Inc.
 
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
@@ -7,11 +7,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
 
 Learn how to deploy a simple Cloud native application using the most commonly used frameworks and the Oracle Cloud Infrastructure services.
 
-![](./images/Application.png " ")
-
-You will will learn how to use the Autonomous Database, the Container Registry, the Kubernetes Cluster (OKE) , Helidon, and the API Gateway managed services of the Oracle Cloud Infrastructure through the deployment of a simple MyToDo List React JS application.
-![](./images/architecture.png " ")
-
 # Prerequisites
 
 * An Oracle Free Tier, Always Free, Paid or LiveLabs Cloud Account

mtdrworkshop/backend/backend.md

@@ -1,34 +1,18 @@
 #!/bin/bash
-## MyToDoReact version 1.0.
+## MyToDoReact version 2.0.0
 ##
 ## Copyright (c) 2021 Oracle, Inc.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 SCRIPT_DIR=$(dirname $0)
 
-IMAGE_NAME=todolistapp-helidon-se
-IMAGE_VERSION=0.1
+# set vars
+source set.sh
 
-if [ -z "$DOCKER_REGISTRY" ]; then
-    echo "DOCKER_REGISTRY not set. Will get it with state_get"
-  export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
-fi
-
-if [ -z "$DOCKER_REGISTRY" ]; then
-    echo "Error: DOCKER_REGISTRY env variable needs to be set!"
-    exit 1
-fi
-
-export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
-mvn install
+mvn clean package
 docker build -f src/main/docker/Dockerfile -t $IMAGE .
-# mvn package docker:build
 
-# if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
 if [ $? -ne 0 ]; then
     exit 1
 fi
 docker push $IMAGE
-# if [  $? -eq 0 ]; then
-#     docker rmi ${IMAGE}
-# fi

mtdrworkshop/backend/build.sh

@@ -1,46 +1,40 @@
 #!/bin/bash
-## MyToDoReact version 1.0.
+## MyToDoReact version 2.0.0
 ##
 ## Copyright (c) 2021 Oracle, Inc.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 SCRIPT_DIR=$(dirname $0)
-export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
-if [ -z "$TODO_PDB_NAME" ]; then
-    echo "TODO_PDB_NAME not set. Will get it with state_get"
-  export TODO_PDB_NAME=$(state_get MTDR_DB_NAME)
-fi
-if [ -z "$TODO_PDB_NAME" ]; then
-    echo "Error: TODO_PDB_NAME env variable needs to be set!"
-    exit 1
-fi
-if [ -z "$OCI_REGION" ]; then
-    echo "OCI_REGION not set. Will get it with state_get"
-    export OCI_REGION=$(state_get REGION)
-fi
-if [ -z "$OCI_REGION" ]; then
-    echo "Error: OCI_REGION env variable needs to be set!"
-    exit 1
-fi
+
 echo "Creating helidon deployment and service"
+
+# set vars
+source set.sh
+
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
+YAML_NAME=manifest-$CURRENTTIME.yaml
+
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
-cp src/main/k8s/todolistapp-helidon-se-deployment.yaml todolistapp-helidon-se-deployment-$CURRENTTIME.yaml
+cp src/main/k8s/manifest.yaml "$YAML_NAME"
 #may hit sed incompat issue with mac
-sed -i "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" todolistapp-helidon-se-deployment-$CURRENTTIME.yaml
-#kubectl apply -f $SCRIPT_DIR/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml 
+sed -i "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" "$YAML_NAME"
+#kubectl apply -f $SCRIPT_DIR/"$YAML_NAME" 
 
-sed -e "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" todolistapp-helidon-se-deployment-${CURRENTTIME}.yaml > /tmp/todolistapp-helidon-se-deployment-${CURRENTTIME}.yaml
-mv -- /tmp/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml todolistapp-helidon-se-deployment-$CURRENTTIME.yaml
-sed -e "s|%TODO_PDB_NAME%|${TODO_PDB_NAME}|g" todolistapp-helidon-se-deployment-${CURRENTTIME}.yaml > /tmp/todolistapp-helidon-se-deployment-${CURRENTTIME}.yaml
-mv -- /tmp/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml todolistapp-helidon-se-deployment-$CURRENTTIME.yaml
-sed -e "s|%OCI_REGION%|${OCI_REGION}|g" todolistapp-helidon-se-deployment-${CURRENTTIME}.yaml > /tmp/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml
-mv -- /tmp/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml todolistapp-helidon-se-deployment-$CURRENTTIME.yaml
+sed -e "s|%DOCKER_REGISTRY%|${DOCKER_REGISTRY}|g" "$YAML_NAME" > /tmp/"$YAML_NAME"
+mv -- /tmp/"$YAML_NAME" "$YAML_NAME"
+sed -e "s|%DOCKER_IMAGE%|${IMAGE_NAME}|g" "$YAML_NAME" > /tmp/"$YAML_NAME"
+mv -- /tmp/"$YAML_NAME" "$YAML_NAME"
+sed -e "s|%DOCKER_IMAGE_TAG%|${IMAGE_VERSION}|g" "$YAML_NAME" > /tmp/"$YAML_NAME"
+mv -- /tmp/"$YAML_NAME" "$YAML_NAME"
+sed -e "s|%TODO_PDB_NAME%|${TODO_PDB_NAME}|g" "$YAML_NAME" > /tmp/"$YAML_NAME"
+mv -- /tmp/"$YAML_NAME" "$YAML_NAME"
+sed -e "s|%OCI_REGION%|${OCI_REGION}|g" "$YAML_NAME" > /tmp/"$YAML_NAME"
+mv -- /tmp/"$YAML_NAME" "$YAML_NAME"
 
 
 if [ -z "$1" ]; then
-    kubectl apply -f $SCRIPT_DIR/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml -n mtdrworkshop
+    kubectl apply -f $SCRIPT_DIR/"$YAML_NAME" -n mtdrworkshop
 else
-    kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/todolistapp-helidon-se-deployment-$CURRENTTIME.yaml) -n mtdrworkshop
+    kubectl apply -f <(istioctl kube-inject -f $SCRIPT_DIR/"$YAML_NAME") -n mtdrworkshop
 fi
 
 #kubectl apply -f $SCRIPT_DIR/order-service.yaml -n mtdrworkshop