From 7bdca907bbc37e14ce20f58d973cefb3630c2c7e Mon Sep 17 00:00:00 2001 From: jhh Date: Fri, 7 May 2021 17:39:06 -0500 Subject: support no https or authentication in telemetry Issue-ID: POLICY-3230 Signed-off-by: jhh Change-Id: I86a5f1081293a6b3d5f52c4462b947facbd9ee88 Signed-off-by: jhh (cherry picked from commit 02b765a3c9b854a24b85611f4950f9a57362b462) --- policy-management/src/main/server-gen/bin/telemetry | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/policy-management/src/main/server-gen/bin/telemetry b/policy-management/src/main/server-gen/bin/telemetry index cead3d3a..721ae5c2 100644 --- a/policy-management/src/main/server-gen/bin/telemetry +++ b/policy-management/src/main/server-gen/bin/telemetry @@ -33,13 +33,24 @@ if ! "${POLICY_HOME}"/bin/policy-management-controller status >/dev/null 2>&1; t exit 2 fi +CREDENTIALS= +if [ -n "${TELEMETRY_USER}" ]; then + CREDENTIALS="--auth ${TELEMETRY_USER}:${TELEMETRY_PASSWORD}" +fi + +PROTOCOL="http" +if egrep "^http\.server\.services\..*CONFIG\.https.*=.*true" ${POLICY_HOME}/config/engine.properties; then + PROTOCOL="https" +fi + if [ ! -r "${TELEMETRY_SPEC}" ]; then echo "generating new spec .." - if ! http --verify=no -a "${TELEMETRY_USER}:${TELEMETRY_PASSWORD}" https://localhost:9696/swagger.json >${TELEMETRY_SPEC} 2>/dev/null; then + if ! http --verify=no ${CREDENTIALS} "${PROTOCOL}"://localhost:9696/swagger.json >${TELEMETRY_SPEC} 2>/dev/null; then echo "error: cannot generate telemetry spec" rm -f ${TELEMETRY_SPEC} 2>/dev/null exit 3 fi fi -exec http-prompt https://localhost:9696/policy/pdp/engine --verify=no --auth "${TELEMETRY_USER}:${TELEMETRY_PASSWORD}" --spec ${TELEMETRY_SPEC} +exec http-prompt "${PROTOCOL}"://localhost:9696/policy/pdp/engine --verify=no ${CREDENTIALS} --spec ${TELEMETRY_SPEC} + -- cgit 1.2.3-korg