Fix issue 484: fail to create sink connector if issue wrong DB password #484 (#485)

* add user/pass validation in setup script

* add user/pass validation in setup script

* fix script kafka bug

* fix script return to exit code

Author: pasimoes

workshops/txeventq-kafka/cloud-setup/cmd/txeventq-add-topic

@@ -48,6 +48,17 @@ TXEVENTQ_SUBSCRIBER=${TXEVENTQ_TOPIC}_SUBS
 # DB Connection Setup
 export TNS_ADMIN=$LAB_HOME/wallet
 
+# Validate User/Password
+user_is_valid=$(sqlplus -S /nolog <<!
+  connect $LAB_DB_USER/"$ORACLE_DB_PASSWORD"@$LAB_DB_SVC
+!
+)
+
+if [[ "$user_is_valid" == *"ORA-01017"* ]]; then
+  echo "ERROR: invalid username/password."
+  exit 2
+fi
+
 # Add TxEventQ Topic
 VAR=$(sqlplus -S /nolog <<!
   connect $LAB_DB_USER/"$ORACLE_DB_PASSWORD"@$LAB_DB_SVC
@@ -58,6 +69,7 @@ VAR=$(sqlplus -S /nolog <<!
 !
 )
 
+
 if [[ "$VAR" == *"PL/SQL procedure successfully"* ]]; then
   echo "Created topic ${TXEVENTQ_TOPIC}"
   state_set TXEVENTQ_TOPIC_NAME "${TXEVENTQ_TOPIC}"

workshops/txeventq-kafka/cloud-setup/cmd/txeventq-dequeue

@@ -40,6 +40,17 @@ TXEVENTQ_SUBSCRIBER=${TXEVENTQ_TOPIC}_SUBS
 # DB Connection Setup
 export TNS_ADMIN=$LAB_HOME/wallet
 
+# Validate User/Password
+user_is_valid=$(sqlplus -S /nolog <<!
+  connect $LAB_DB_USER/"$ORACLE_DB_PASSWORD"@$LAB_DB_SVC
+!
+)
+
+if [[ "$user_is_valid" == *"ORA-01017"* ]]; then
+  echo "ERROR: invalid username/password."
+  exit 2
+fi
+
 # DEQUEUE TxEventQ Message
 sqlplus -S /nolog <<!
   connect $LAB_DB_USER/"$ORACLE_DB_PASSWORD"@$LAB_DB_SVC

workshops/txeventq-kafka/cloud-setup/confluent-kafka/kafka-setup.sh

@@ -38,15 +38,20 @@ while ! state_done KAFKA_SETUP; do
   cd "$LAB_HOME"/cloud-setup/confluent-kafka
   ./docker-compose up --no-start
 
-  cd "$LAB_HOME"
-  state_set_done KAFKA_SETUP
-done
-
-if state_get KAFKA_SETUP; then
   echo "$(date): Create Containers Network"
   LAB_KAFKA_NETWORK="$(state_get RUN_NAME)_net"
   docker network create "${LAB_KAFKA_NETWORK}"
   state_set LAB_KAFKA_NETWORK "$LAB_KAFKA_NETWORK"
-fi
+
+  cd "$LAB_HOME"
+  state_set_done KAFKA_SETUP
+done
+
+#if state_get KAFKA_SETUP; then
+#  echo "$(date): Create Containers Network"
+#  LAB_KAFKA_NETWORK="$(state_get RUN_NAME)_net"
+#  docker network create "${LAB_KAFKA_NETWORK}"
+#  state_set LAB_KAFKA_NETWORK "$LAB_KAFKA_NETWORK"
+#fi
 
 

workshops/txeventq-kafka/cloud-setup/utils/main-setup.sh

@@ -301,7 +301,7 @@ while ! state_done SETUP_VERIFIED; do
   if test "$NOT_DONE" -gt 0; then
     # echo "Log files are located in $LAB_LOG"
     bgs=$bg_not_done
-    echo -ne r"\033[2K\r$bgs still running "
+    echo -ne r"\033[2K\r$bgs still executing... \n"
     sleep 10
   else
     state_set_done SETUP_VERIFIED

workshops/txeventq-kafka/kafka-connect-txeventq/setup-kafka2txeventq-connect.sh

@@ -7,61 +7,71 @@ set -e
 
 CONF_FILE="${LAB_HOME}"/kafka-connect-txeventq/kafka2txeventq-connect-configuration.json
 
-# Collect the DB password
-read -s -r -p "Please enter Oracle DB Password: " ORACLE_DB_PASSWORD
-#seq  -f "*" -s '' -t '\n' "${#ORACLE_DB_PASSWORD}"
-
-# Collect the Kafka Topic to be consumed by Connect
-# read -r -p "Please enter Kafka Topic: " KAFKA_TOPIC
-
-# Collect the KAFKA Topic (Source)
-if state_get KAFKA_TOPIC_NAME; then
-  KAFKA_TOPIC="$(state_get KAFKA_TOPIC_NAME)"
-
-  # Set the KAFKA TOPIC produced by Connect sync
-  sed -i 's/LAB_KAFKA_TOPIC/'"${KAFKA_TOPIC}"'/g' "$CONF_FILE"
+# Collect Oracle Database Service
+if state_done LAB_DB_NAME; then
+  LAB_DB_SVC="$(state_get LAB_DB_NAME)_tp"
 else
-  echo "ERROR: KAFKA Topic is missing!"
-  exit
+  echo "ERROR: Oracle DB Service is missing!"
+  exit 2
 fi
 
-
 # Collect the DB USER
-if state_get LAB_DB_USER; then
+if state_done LAB_DB_USER; then
   LAB_DB_USER="$(state_get LAB_DB_USER)"
-
-  # Set the Oracle Database User used by Connect Sync
-  sed -i 's/LAB_DB_USER/'"${LAB_DB_USER}"'/g' "$CONF_FILE"
 else
   echo "ERROR: Oracle DB user is missing!"
-  exit
-fi
-
-# Collect Oracle Database Service
-if state_get LAB_DB_NAME; then
-  LAB_DB_SVC="$(state_get LAB_DB_NAME)_tp"
-
-  # Set the Oracle Database URL used by Connect Sync
-  sed -i 's/LAB_DB_SVC/'"${LAB_DB_SVC}"'/g' "$CONF_FILE"
-else
-  echo "ERROR: Oracle DB Service is missing!"
-  exit
+  exit 2
 fi
 
 # Collect the Oracle TxEventQ Topic (Destination)
 if state_get TXEVENTQ_TOPIC_NAME; then
   TXEVENTQ_TOPIC="$(state_get TXEVENTQ_TOPIC_NAME)"
-
-  # Set the Oracle TxEventQ TOPIC produced by Connect sync
-  sed -i 's/LAB_TXEVENTQ_TOPIC/'"${TXEVENTQ_TOPIC}"'/g' "$CONF_FILE"
 else
   echo "ERROR: Oracle TxEventQ Topic is missing!"
-  exit
+  exit 2
+fi
+
+# Collect the KAFKA Topic (Source)
+if state_get KAFKA_TOPIC_NAME; then
+  KAFKA_TOPIC="$(state_get KAFKA_TOPIC_NAME)"
+else
+  echo "ERROR: KAFKA Topic is missing!"
+  exit 2
+fi
+
+# Collect the DB password
+read -s -r -p "Please enter Oracle DB Password: " ORACLE_DB_PASSWORD
+echo "***********"
+
+# DB Connection Setup
+export TNS_ADMIN=$LAB_HOME/wallet
+
+# Validate User/Password
+user_is_valid=$(sqlplus -S /nolog <<!
+  connect $LAB_DB_USER/"$ORACLE_DB_PASSWORD"@$LAB_DB_SVC
+!
+)
+
+if [[ "$user_is_valid" == *"ORA-01017"* ]]; then
+  echo "ERROR: invalid username/password."
+  exit 2
 fi
 
+# Set the KAFKA TOPIC produced by Connect sync
+sed -i 's/LAB_KAFKA_TOPIC/'"${KAFKA_TOPIC}"'/g' "$CONF_FILE"
+
+# Set the Oracle Database User used by Connect Sync
+sed -i 's/LAB_DB_USER/'"${LAB_DB_USER}"'/g' "$CONF_FILE"
+
 # Setup the Oracle DB User Password
 sed -i 's/LAB_DB_PASSWORD/'"${ORACLE_DB_PASSWORD}"'/g' "$CONF_FILE"
 
+# Set the Oracle Database URL used by Connect Sync
+sed -i 's/LAB_DB_SVC/'"${LAB_DB_SVC}"'/g' "$CONF_FILE"
+
+# Set the Oracle TxEventQ TOPIC produced by Connect sync
+sed -i 's/LAB_TXEVENTQ_TOPIC/'"${TXEVENTQ_TOPIC}"'/g' "$CONF_FILE"
+
 # Configure the Kafka Connect Sync with Oracle Database
 curl -S -s -o /dev/null \
      -i -X PUT -H "Accept:application/json" \