fix: setup and deployment script updates

Author: verbanicm

Diff for: deploy-monolith.sh

@@ -14,20 +14,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-printf "Enabling Cloud Build APIs..."
-gcloud services enable cloudbuild.googleapis.com > /dev/null 2>&1
-printf "Completed.\n"
+printf "Enabling Cloud Build APIs...\n"
+gcloud services enable cloudbuild.googleapis.com
+printf "Completed.\n\n"
 
-printf "Building Monolith Container..."
+printf "Building Monolith Container...\n"
 cd ~/monolith-to-microservices/monolith
-gcloud builds submit --tag gcr.io/${GOOGLE_CLOUD_PROJECT}/monolith:1.0.0 . > /dev/null 2>&1
-printf "Completed.\n"
+gcloud builds submit --tag gcr.io/${GOOGLE_CLOUD_PROJECT}/monolith:1.0.0 .
+printf "Completed.\n\n"
 
-printf "Deploying Monolith To GKE Cluster..."
-kubectl create deployment monolith --image=gcr.io/${GOOGLE_CLOUD_PROJECT}/monolith:1.0.0 > /dev/null 2>&1
-kubectl expose deployment monolith --type=LoadBalancer --port 80 --target-port 8080 > /dev/null 2>&1
+printf "Deploying Monolith To GKE Cluster...\n"
+kubectl create deployment monolith --image=gcr.io/${GOOGLE_CLOUD_PROJECT}/monolith:1.0.0
+kubectl expose deployment monolith --type=LoadBalancer --port 80 --target-port 8080
 printf "Completed.\n\n"
 
-printf "Please run the following command to find the IP address for the monolith service:  kubectl get service monolith\n\n"
+printf "Please run the following command to find the IP address for the monolith service: kubectl get service monolith\n\n"
 
-printf "Deployment Complete\n"
+printf "Deployment completed successfully!\n"

Diff for: logs/README.txt

@@ -13,27 +13,43 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-printf "Checking for required npm version..."
-npm install -g npm > ~/monolith-to-microservices/logs/npm.txt 2>&1
-printf "Completed.\n"
 
-printf "Installing monolith dependencies..."
+set -eEuo pipefail
+
+if [[ -v CLOUD_SHELL ]]
+then
+  printf "Setting up NVM...\n"
+  export NVM_DIR="/usr/local/nvm"
+  [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+  [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+  printf "Completed.\n\n"
+  
+  printf "Updating nodeJS version...\n"
+  nvm install --lts
+  printf "Completed.\n\n"
+else
+  printf "Checking for required npm version...\n"
+  npm install -g npm
+  printf "Completed.\n\n"
+fi
+
+printf "Installing monolith dependencies...\n"
 cd ./monolith
-npm install > ~/monolith-to-microservices/logs/monolith.txt 2>&1
-printf "Completed.\n"
+npm install
+printf "Completed.\n\n"
 
-printf "Installing microservies dependencies..."
+printf "Installing microservies dependencies...\n"
 cd ../microservices
-npm install > ~/monolith-to-microservices/logs/microservices.txt 2>&1
-printf "Completed.\n"
+npm install
+printf "Completed.\n\n"
 
-printf "Installing React app dependencies..."
+printf "Installing React app dependencies...\n"
 cd ../react-app
-npm install > ~/monolith-to-microservices/logs/react.txt 2>&1
-printf "Completed.\n"
+npm install
+printf "Completed.\n\n"
 
-printf "Building React app and placing into sub projects..."
-npm run build > ~/monolith-to-microservices/logs/build.txt 2>&1
+printf "Building React app and placing into sub projects...\n"
+npm run build
 printf "Completed.\n\n"
 
-printf "Script completed successfully!\n"
+printf "Setup completed successfully!\n"