From 1d7946091c897cd583d5e36faf20730a4995fc48 Mon Sep 17 00:00:00 2001 From: tdviet Date: Sun, 5 Nov 2023 14:13:32 +0100 Subject: [PATCH] Replacing envvar by CONF.get() --- fedcloudclient/decorators.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fedcloudclient/decorators.py b/fedcloudclient/decorators.py index 238ece3..b08cb4a 100644 --- a/fedcloudclient/decorators.py +++ b/fedcloudclient/decorators.py @@ -6,8 +6,7 @@ import click from click_option_group import ( RequiredAnyOptionGroup, - RequiredMutuallyExclusiveOptionGroup, - optgroup, + optgroup, MutuallyExclusiveOptionGroup, ) from fedcloudclient.conf import CONF @@ -29,7 +28,6 @@ site_params = click.option( "--site", help="Name of the site", - required=True, default=CONF.get("site"), metavar="site-name", ) @@ -51,7 +49,7 @@ def all_site_params(func): @optgroup.group( "Site", - cls=RequiredMutuallyExclusiveOptionGroup, + cls=MutuallyExclusiveOptionGroup, help="Single Openstack site or all sites", ) @optgroup.option( @@ -77,7 +75,6 @@ def wrapper(*args, **kwargs): project_id_params = click.option( "--project-id", help="Project ID", - required=True, default=CONF.get("project_id"), metavar="project-id", ) @@ -95,7 +92,6 @@ def wrapper(*args, **kwargs): vo_params = click.option( "--vo", help="Name of the VO", - required=True, default=CONF.get("vo"), metavar="vo-name", )