From 38ba7df094ff534e4fce0d7a7e33ca8123f210a1 Mon Sep 17 00:00:00 2001 From: Ben Courliss Date: Wed, 18 Aug 2021 15:03:14 -0400 Subject: [PATCH 1/3] Added setup_secrets.sh to test-remote and test-remote-prebuilt targets for Vault enabled environments Signed-off-by: Ben Courliss --- test/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Makefile b/test/Makefile index 047f3b1b2..02abcfc1f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -359,12 +359,16 @@ test: clean $(ANAX_SOURCE)/anax run-dockerreg run-mgmthub run-vault run-test test-remote: clean $(ANAX_SOURCE)/anax run-dockerreg run-test copy-cert @echo -e "\nBootstrapping the exchange" docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/init_exchange.sh" + @echo -e "\nSetting up secrets in the vault" + docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) DOCKER_VAULT_CNAME=$(DOCKER_VAULT_CNAME); /root/setup_secrets.sh" @echo -e "\nStarting tests" docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/gov-combined.sh" test-remote-prebuilt: clean run-dockerreg download-agbot-image run-test copy-cert @echo -e "\nBootstrapping the exchange" docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/init_exchange.sh" + @echo -e "\nSetting up secrets in the vault" + docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS) DOCKER_VAULT_CNAME=$(DOCKER_VAULT_CNAME); /root/setup_secrets.sh" @echo -e "\nStarting tests" docker exec $(DOCKER_TEST_CNAME) bash -c "export $(TEST_VARS); /root/gov-combined.sh" From ad45435c401fb47b59128cd68fa83c2207cc5611 Mon Sep 17 00:00:00 2001 From: Ben Courliss Date: Wed, 18 Aug 2021 16:38:00 -0400 Subject: [PATCH 2/3] Removed unneeded check for EXCH_APP_HOST Signed-off-by: Ben Courliss --- test/gov/setup_secrets.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/gov/setup_secrets.sh b/test/gov/setup_secrets.sh index f31ce6fd1..e442e8793 100755 --- a/test/gov/setup_secrets.sh +++ b/test/gov/setup_secrets.sh @@ -1,9 +1,9 @@ #!/bin/bash # First create the secret that the service will need -if [ "${EXCH_APP_HOST}" != "http://exchange-api:8081/v1" ]; then - exit 0 -fi +# if [ "${EXCH_APP_HOST}" != "http://exchange-api:8081/v1" ]; then +# exit 0 +# fi if [ "${NOVAULT}" == "1" ] then From d80725b419d62339021722b80e405698f1f06a1a Mon Sep 17 00:00:00 2001 From: Ben Courliss Date: Wed, 18 Aug 2021 17:19:55 -0400 Subject: [PATCH 3/3] Added -O to overwrite secret creation. Added conditional around testing agbot status for only local tests Signed-off-by: Ben Courliss --- test/gov/agbot_apitest.sh | 15 +++++++++------ test/gov/setup_secrets.sh | 36 ++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/test/gov/agbot_apitest.sh b/test/gov/agbot_apitest.sh index eb826f7cb..bc495ea8c 100755 --- a/test/gov/agbot_apitest.sh +++ b/test/gov/agbot_apitest.sh @@ -585,11 +585,14 @@ echo "$CMD" RES=$($CMD) results "$RES" "200" "exists" "false" -# Check agbot <-> vault health status using AGBOT_API -echo -e "\n${PREFIX} Check agbot-vault health status" -CMD="curl -sLX GET -w %{http_code} ${AGBOT_API}/health" -echo "$CMD" -RES=$($CMD) -results "$RES" "200" "lastVaultInteraction" +# skip if not local e2edev test +if [ "${EXCH_APP_HOST}" == "http://exchange-api:8081/v1" ]; then + # Check agbot <-> vault health status using AGBOT_API + echo -e "\n${PREFIX} Check agbot-vault health status" + CMD="curl -sLX GET -w %{http_code} ${AGBOT_API}/health" + echo "$CMD" + RES=$($CMD) + results "$RES" "200" "lastVaultInteraction" +fi echo -e "\n${PREFIX} complete test\n" diff --git a/test/gov/setup_secrets.sh b/test/gov/setup_secrets.sh index e442e8793..214b78f56 100755 --- a/test/gov/setup_secrets.sh +++ b/test/gov/setup_secrets.sh @@ -1,10 +1,6 @@ #!/bin/bash # First create the secret that the service will need -# if [ "${EXCH_APP_HOST}" != "http://exchange-api:8081/v1" ]; then -# exit 0 -# fi - if [ "${NOVAULT}" == "1" ] then echo -e "Skipping secret setup" @@ -42,9 +38,9 @@ export HZN_AGBOT_URL=${AGBOT_SAPI_URL} # Create secrets in userdev org echo -e "Create netspeed secret1" -CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1}" +CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1}) +RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1} -O) # check for erroneous return if [ $? -ne 0 ]; then @@ -55,9 +51,9 @@ fi echo "$RES" echo -e "Create netspeed secret2" -CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2}" +CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2}) +RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2} -O) # check for erroneous return if [ $? -ne 0 ]; then @@ -68,15 +64,15 @@ fi echo "$RES" echo -e "Create netspeed secret3" -CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3}" +CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3}) +RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3} -O) # creating secrets for compcheck tests echo -e "Create org secret sqltoken" -CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey sqltoken -d mysqltoken ${CREATE_ORG_SECRET4}" +CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey sqltoken -d mysqltoken ${CREATE_ORG_SECRET4} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey sqltoken -d mysqltoken ${CREATE_ORG_SECRET4}) +RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey sqltoken -d mysqltoken ${CREATE_ORG_SECRET4} -O) # check for erroneous return if [ $? -ne 0 ]; then @@ -92,14 +88,14 @@ E2EDEV_ORG="e2edev@somecomp.com" E2EDEV_ADMIN_AUTH="e2edev@somecomp.com/e2edevadmin:e2edevadminpw" echo -e "Create netspeed secret1" -CMD="hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1}" +CMD="hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1}) +RES=$(hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE1} ${CREATE_ORG_SECRET1} -O) echo -e "Create user secret aitoken" -CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey aitoken -d myaitoken ${CREATE_USER_SECRET5}" +CMD="hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey aitoken -d myaitoken ${CREATE_USER_SECRET5} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey aitoken -d myaitoken ${CREATE_USER_SECRET5}) +RES=$(hzn secretsmanager secret add -o ${USERDEV_ORG} -u ${USERDEV_ADMIN_AUTH} --secretKey aitoken -d myaitoken ${CREATE_USER_SECRET5} -O) # check for erroneous return if [ $? -ne 0 ]; then @@ -110,9 +106,9 @@ fi echo "$RES" echo -e "Create netspeed secret2" -CMD="hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2}" +CMD="hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2}) +RES=$(hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET2} -O) # check for erroneous return if [ $? -ne 0 ]; then @@ -123,9 +119,9 @@ fi echo "$RES" echo -e "Create netspeed secret3" -CMD="hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3}" +CMD="hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3} -O" echo "$CMD" -RES=$(hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3}) +RES=$(hzn secretsmanager secret add -o ${E2EDEV_ORG} -u ${E2EDEV_ADMIN_AUTH} --secretKey ${ORG_SECRET_KEY} -d ${ORG_SECRET_VALUE2} ${CREATE_ORG_SECRET3} -O) # check for erroneous return if [ $? -ne 0 ]; then