Create Helm based Certificates for Clients

[aaf/authz.git] / auth / sample / bin / client.sh

diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
index b69646d..42fe4d9 100755 (executable)
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -49,17 +49,18 @@ JAVA_AAFCLI="$JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar -Dcadi_prop_files=$LO
 if [ ! -d $LOCAL ]; then
     mkdir -p $LOCAL
     for D in bin logs; do
-        rsync -avzh --exclude=.gitignore $CONFIG/$D/* /opt/app/osaaf/$D
+        mkdir -p $OSAAF/$D
+        cp $CONFIG/$D/* $OSAAF/$D
     done
 fi
 
 # Setup Bash, first time only
-if [ ! -e "$HOME/.bash_aliases" ] || [ -z "$(grep agent $HOME/.bash_aliases)" ]; then
-  echo "alias cadi='$JAVA_CADI \$*'" >>$HOME/.bash_aliases
-  echo "alias agent='$OSAAF/bin/agent.sh EMPTY \$*'" >>$HOME/.bash_aliases
-  echo "alias aafcli='$JAVA_AAFCLI \$*'" >>$HOME/.bash_aliases
-  chmod a+x $OSAAF/bin/agent.sh
-  . $HOME/.bash_aliases
+if [ ! -e "$HOME/.bashrc" ] || [ -z "$(grep cadi $HOME/.bashrc)" ]; then
+  echo "alias cadi='$JAVA_CADI \$*'" >>$HOME/.bashrc
+  echo "alias agent='$CONFIG/bin/agent.sh agent \$*'" >>$HOME/.bashrc
+  echo "alias aafcli='$JAVA_AAFCLI \$*'" >>$HOME/.bashrc
+  chmod a+x $CONFIG/bin/agent.sh
+  . $HOME/.bashrc
 fi
 
 # Setup SSO info for Deploy ID
@@ -79,6 +80,12 @@ if [ ! -e "$DOT_AAF/keyfile" ]; then
     if [ ! "${DEPLOY_PASSWORD}" = "" ]; then
        echo aaf_password=enc:$(sso_encrypt ${DEPLOY_PASSWORD}) >> ${SSO}
     fi
+    if [ ! -z "${CONTAINER_NS}" ]; then
+       echo "aaf_locator_container_ns=${CONTAINER_NS}" >> ${SSO}
+    fi
+    if [ ! -z "${AAF_ENV}" ]; then
+       echo "aaf_env=${AAF_ENV}" >> ${SSO}
+    fi
     echo aaf_locate_url=https://${AAF_FQDN}:8095 >> ${SSO}
     echo aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:${AAF_INTERFACE_VERSION} >> ${SSO}
 
@@ -152,26 +159,26 @@ else
             fi
         fi
         ;;
-    update)
-        for D in bin logs; do
-            rsync -uh --exclude=.gitignore $CONFIG/$D/* /opt/app/osaaf/$D
-        done
-        ;;
     showpass)
         echo "## Show Passwords"
         $JAVA_AGENT showpass ${APP_FQI} ${APP_FQDN}
         ;;
     check)
+        echo "## Check Certificate"
         $JAVA_AGENT check ${APP_FQI} ${APP_FQDN}
         ;;
     validate)
         echo "## validate requested"
         $JAVA_AGENT_SELF validate 
         ;;
+    renew)
+        echo "## Renew Certificate"
+        $JAVA_AGENT place ${APP_FQI} ${APP_FQDN}
+        ;;
     bash)
         shift
         cd $LOCAL || exit
-        /bin/bash "$@"
+        exec bash "$@"
         ;;
     setProp)
         cd $LOCAL || exit
@@ -227,6 +234,10 @@ else
     taillog) 
        sh /opt/app/osaaf/logs/taillog
        ;;
+    testConnectivity|testconnectivity)
+        echo "--- Test Connectivity ---"
+        $JAVA -cp $CONFIG/bin/aaf-auth-cmd-*-full.jar org.onap.aaf.cadi.aaf.TestConnectivity $LOCAL/org.osaaf.aaf.props 
+       ;;
     --help | -?)
         case "$1" in
         "")