From 38aa60b4da8c20c127d3c4680ab27e3bacbe23e7 Mon Sep 17 00:00:00 2001 From: Pradnya Mohite Date: Fri, 22 Nov 2019 16:43:18 -0800 Subject: [PATCH 1/3] adding quotes for string comparison with special characters --- dockers/docker-sonic-telemetry/telemetry.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh index 053b1dae6ea..14f4f5b325f 100755 --- a/dockers/docker-sonic-telemetry/telemetry.sh +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -7,7 +7,7 @@ TELEMETRY=`sonic-cfggen -d -v 'TELEMETRY.keys() | join(" ") if TELEMETRY'` TELEMETRY_ARGS=" -logtostderr" -if [ ! -z $X509 ]; then +if [ ! -z "$X509" ]; then SERVER_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']"` SERVER_KEY=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_key']"` if [ -z $SERVER_CRT ] || [ -z $SERVER_KEY ]; then @@ -19,7 +19,7 @@ else TELEMETRY_ARGS+=" --insecure" fi -if [ ! -z $X509 ]; then +if [ ! -z "$X509" ]; then CA_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['ca_crt']"` if [ ! -z $CA_CRT ]; then TELEMETRY_ARGS+=" --ca_crt $CA_CRT" From 42f98e7fe7b118c79dbcf4ce840573b66696e772 Mon Sep 17 00:00:00 2001 From: pra-moh <49077256+pra-moh@users.noreply.github.com> Date: Fri, 22 Nov 2019 17:58:52 -0800 Subject: [PATCH 2/3] Update dockers/docker-sonic-telemetry/telemetry.sh Co-Authored-By: Joe LeVeque --- dockers/docker-sonic-telemetry/telemetry.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh index 14f4f5b325f..dd10e2d8fc1 100755 --- a/dockers/docker-sonic-telemetry/telemetry.sh +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -19,7 +19,7 @@ else TELEMETRY_ARGS+=" --insecure" fi -if [ ! -z "$X509" ]; then +if [ -n "$X509" ]; then CA_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['ca_crt']"` if [ ! -z $CA_CRT ]; then TELEMETRY_ARGS+=" --ca_crt $CA_CRT" @@ -48,4 +48,3 @@ fi exec /usr/sbin/telemetry ${TELEMETRY_ARGS} - From 1953af0e490608e37b29722bfc12cce5af7deae3 Mon Sep 17 00:00:00 2001 From: pra-moh <49077256+pra-moh@users.noreply.github.com> Date: Fri, 22 Nov 2019 17:58:59 -0800 Subject: [PATCH 3/3] Update dockers/docker-sonic-telemetry/telemetry.sh Co-Authored-By: Joe LeVeque --- dockers/docker-sonic-telemetry/telemetry.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dockers/docker-sonic-telemetry/telemetry.sh b/dockers/docker-sonic-telemetry/telemetry.sh index dd10e2d8fc1..8cfd8a531cc 100755 --- a/dockers/docker-sonic-telemetry/telemetry.sh +++ b/dockers/docker-sonic-telemetry/telemetry.sh @@ -7,7 +7,7 @@ TELEMETRY=`sonic-cfggen -d -v 'TELEMETRY.keys() | join(" ") if TELEMETRY'` TELEMETRY_ARGS=" -logtostderr" -if [ ! -z "$X509" ]; then +if [ -n "$X509" ]; then SERVER_CRT=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_crt']"` SERVER_KEY=`sonic-cfggen -d -v "DEVICE_METADATA['x509']['server_key']"` if [ -z $SERVER_CRT ] || [ -z $SERVER_KEY ]; then @@ -47,4 +47,3 @@ else fi exec /usr/sbin/telemetry ${TELEMETRY_ARGS} -