Skip to content

[telemetry.sh] Fix string null check with special characters by adding quotes #3810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 3 commits into from
Nov 23, 2019
Merged

[telemetry.sh] Fix string null check with special characters by adding quotes #3810

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38aa60b
adding quotes for string comparison with special characters
pra-moh Nov 23, 2019
42f98e7
Update dockers/docker-sonic-telemetry/telemetry.sh
pra-moh Nov 23, 2019
1953af0
Update dockers/docker-sonic-telemetry/telemetry.sh
pra-moh Nov 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions dockers/docker-sonic-telemetry/telemetry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -47,5 +47,3 @@ else
fi

exec /usr/sbin/telemetry ${TELEMETRY_ARGS}