Skip to content

Commit 75740e5

Browse files
committed
Use radas_config validate instead of is_radas_config_enable option
1 parent d2e86c9 commit 75740e5

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

charon/config.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,10 @@ def __init__(self, data: Dict):
122122
self.__ignore_signature_suffix: Dict = data.get("ignore_signature_suffix", None)
123123
self.__signature_command: str = data.get("detach_signature_command", None)
124124
self.__aws_cf_enable: bool = data.get("aws_cf_enable", False)
125-
self.__radas_config_enable: bool = data.get("radas_config_enable", False)
125+
self.__radas_config__: Optional[RadasConfig] = None
126126
radas_config: Dict = data.get("radas", None)
127127
if radas_config:
128-
self.__radas_config_enable = True
129-
self.__radas_config__: RadasConfig = RadasConfig(radas_config)
128+
self.__radas_config__ = RadasConfig(radas_config)
130129

131130
def get_ignore_patterns(self) -> List[str]:
132131
return self.__ignore_patterns
@@ -155,10 +154,7 @@ def get_detach_signature_command(self) -> str:
155154
def is_aws_cf_enable(self) -> bool:
156155
return self.__aws_cf_enable
157156

158-
def is_radas_config_enable(self) -> bool:
159-
return self.__radas_config_enable
160-
161-
def get_radas_config(self) -> RadasConfig:
157+
def get_radas_config(self) -> Optional[RadasConfig]:
162158
return self.__radas_config__
163159

164160

charon/pkgs/maven.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ def handle_maven_uploading(
416416
if not conf:
417417
sys.exit(1)
418418

419-
if conf.is_radas_config_enable():
419+
rconf = conf.get_radas_config()
420+
if rconf and rconf.validate():
420421
logger.info("Start generating radas signature files for s3 bucket %s\n", bucket_name)
421422
(_failed_metas, _generated_signs) = radas_signature.generate_radas_sign(
422423
top_level=top_level, sign_result_loc=sign_result_loc

0 commit comments

Comments
 (0)