Skip to content

Commit 877d757

Browse files
authored
Environment handling of empty vars (#159)
This change adds the correct type to a few command line arguments with env defaults.
1 parent 79ce53b commit 877d757

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

python_transport/wirepas_gateway/utils/argument_tools.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ def add_deprecated_args(self):
388388
"-s",
389389
"--host",
390390
default=None,
391-
type=self.str2none,
391+
type=str,
392392
help=ParserHelper._deprecated_message("mqtt_hostname"),
393393
)
394394

@@ -404,22 +404,23 @@ def add_deprecated_args(self):
404404
"-u",
405405
"--username",
406406
default=None,
407-
type=self.str2none,
407+
type=str,
408408
help=ParserHelper._deprecated_message("mqtt_username"),
409409
)
410410

411411
self.deprecated.add_argument(
412412
"-pw",
413413
"--password",
414414
default=None,
415-
type=self.str2none,
415+
type=str,
416416
help=ParserHelper._deprecated_message("mqtt_password"),
417417
)
418418

419419
self.deprecated.add_argument(
420420
"-t",
421421
"--tlsfile",
422422
default=None,
423+
type=str,
423424
help=ParserHelper._deprecated_message("mqtt_certfile"),
424425
)
425426

@@ -462,13 +463,15 @@ def add_gateway_config(self):
462463
self.gateway.add_argument(
463464
"-gm",
464465
"--gateway_model",
466+
type=self.str2none,
465467
default=os.environ.get("WM_GW_MODEL", None),
466468
help=("Model name of the gateway."),
467469
)
468470

469471
self.gateway.add_argument(
470472
"-gv",
471473
"--gateway_version",
474+
type=self.str2none,
472475
default=os.environ.get("WM_GW_VERSION", None),
473476
help=("Version of the gateway."),
474477
)
@@ -477,13 +480,15 @@ def add_filtering_config(self):
477480
self.filtering.add_argument(
478481
"-iepf",
479482
"--ignored_endpoints_filter",
483+
type=self.str2none,
480484
default=os.environ.get("WM_GW_IGNORED_ENDPOINTS_FILTER", None),
481485
help=("Destination endpoints list to ignore (not published)."),
482486
)
483487

484488
self.filtering.add_argument(
485489
"-wepf",
486490
"--whitened_endpoints_filter",
491+
type=self.str2none,
487492
default=os.environ.get("WM_GW_WHITENED_ENDPOINTS_FILTER", None),
488493
help=(
489494
"Destination endpoints list to whiten "

0 commit comments

Comments
 (0)