Review comments addressed

Author: vinaybyrappa

src/pluginops/pluginops.py

@@ -572,7 +572,7 @@ def configure(virtual_source, snapshot, repository):
     std_err=result.stderr.strip()
     exit_code = result.exit_code
     if exit_code == 0:
-        logger.debug("Pre-Snapshot/Restore_DB successful"+output)
+        logger.debug("Pre-Snapshot/Restore_DB successful")
     else:
         err = utils.process_exit_codes(exit_code,"PROVISION",std_err)
         logger.debug("There was an error while provisioning.Check error.log for details.")

src/resources/provision.sh

@@ -216,13 +216,6 @@ outputJSON=$($DLPX_BIN_JQ ".baseDir = $(jqQuote "$CONFIG_BASEDIR")" <<< "$output
 outputJSON=$($DLPX_BIN_JQ ".dbName = $(jqQuote "$prettyName")" <<< "$outputJSON")
 
 printf "$outputJSON" > "$DLPX_OUTPUT_FILE"
-#log "Output: $outputJSON"
 echo "${prettyName}"
-#log "Environment: "
-#export DLPX_LIBRARY_SOURCE=""
-#export REPLICATION_PASS=""
-#export SNAPSHOT_METADATA=""
-#export STAGINGPASS=""
-#env | sort  >>$DEBUG_LOG
 log "End"
 exit 0

src/resources/restore_stage.sh

@@ -109,7 +109,6 @@ masklog "Staging Connection: ${STAGINGCONN}"
 RESULTS=$( buildConnectionString "${STAGINGCONN}" "${TMP_PWD}" "${STAGINGPORT}" "${STAGINGHOSTIP}" )
 STAGING_CONN=`echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"`
 masklog "Staging Connection: ${STAGING_CONN}"
-log "Creation Results: ${RESULTS}"
 
 ############################################################
 log "Creating Staging Directories on NFS Mounted Path from Delphix"
@@ -584,6 +583,6 @@ export DLPX_LIBRARY_SOURCE=""
 export REPLICATION_PASS=""
 export STAGINGPASS=""
 export SOURCEPASS=""
-env | sort  >>$DEBUG_LOG
+env | grep -v 'SOURCEPASS' | sort >>$DEBUG_LOG
 log " <<<End"
 exit 0

src/resources/restore_stage_bi.sh

@@ -73,8 +73,6 @@ log "${MYSQLD}/mysqld --initialize --user=mysql --datadir=${NEW_DATA_DIR} --log-
 ${MYSQLD}/mysqld --initialize --user=mysql --datadir=${NEW_DATA_DIR} --log-error=${NEW_DATA_DIR}/mysqld.log 1>>${DEBUG_LOG} 2>&1
 
 PWD_LINE=`cat ${NEW_DATA_DIR}/mysqld.log | grep 'temporary password'`
-# sudo grep 'temporary password' ${NEW_DATA_DIR}/mysqld.log`
-# log "init temporary password: ${PWD_LINE}"
 TMP_PWD=`echo "${PWD_LINE}" | ${AWK} -F": " '{print $2}' | xargs`
 
 # These temporary passwords contain special characters so need to wrap in single / literal quotes ...
@@ -83,7 +81,6 @@ masklog "Staging Connection: ${STAGINGCONN}"
 RESULTS=$( buildConnectionString "${STAGINGCONN}" "${TMP_PWD}" "${STAGINGPORT}" "${STAGINGHOSTIP}" )
 STAGING_CONN=`echo "${RESULTS}" | $DLPX_BIN_JQ --raw-output ".string"`
 masklog "Staging Connection: ${STAGING_CONN}"
-masklog "Creation Results: ${RESULTS}"
 
 ############################################################
 ##
@@ -361,7 +358,6 @@ masklog "Granting privileges command: ${CMD}"
 return_msg=$(eval ${CMD} 2>&1 1>&2 > /dev/null)
 return_code=$?
 log "Return Status: ${return_code}"
-log "Return message:${return_msg}"
 if [ $return_code != 0 ]; then
   errorlog "Unable to grant required permissions to delphix database user. This may have to be done manually"
 fi
@@ -471,7 +467,7 @@ command_runner "${CMD}" 11
 log "Environment:"
 export DLPX_LIBRARY_SOURCE=""
 export STAGINGPASS=""
-env | sort  >>$DEBUG_LOG
+env | grep -v 'STAGINGPASS' | sort >>$DEBUG_LOG
 log "End"
 echo "Staging Started"
 exit 0

src/resources/restore_stage_si.sh

@@ -92,16 +92,13 @@ ${MYSQLD}/mysqld --initialize --user=mysql --datadir=${NEW_DATA_DIR} --log-error
 PWD_LINE=`cat ${NEW_DATA_DIR}/mysqld.log | grep 'temporary password'`
 # sudo grep 'temporary password' ${NEW_DATA_DIR}/mysqld.log`
 # 2019-04-11T14:40:34.032576Z 1 [Note] A temporary password is generated for root@localhost: L0qXNZ8?C3Us
-log "init temporary password: ${PWD_LINE}"
 
 TMP_PWD=`echo "${PWD_LINE}" | ${AWK} -F": " '{print $2}' | xargs`
 #
 # These temporary passwords contain special characters so need to wrap in single / literal quotes ...
 #
 TMP_PWD=`echo "'"$TMP_PWD"'"`
-log "Temporary Password: ${TMP_PWD}"
 
-##log "Creation Results: ${RESULTS}"
 
 log "Staging Connection: ${STAGINGCONN}"
 RESULTS=$( buildConnectionString "${STAGINGCONN}" "${TMP_PWD}" "${STAGINGPORT}" )
@@ -264,8 +261,6 @@ eval ${CMD} 1>>${DEBUG_LOG} 2>&1
 
 log "Environment: "
 export DLPX_LIBRARY_SOURCE=""
-#export REPLICATION_PASS=""
-#export STAGINGPASS=""
-env | sort  >>$DEBUG_LOG
+env | grep -v 'STAGINGPASS' | sort >>$DEBUG_LOG
 log "------------------------- End"
 exit 0