Add is_radas_enabled unified method to check radas enablement

Author: yma955

charon/config.py

@@ -158,6 +158,9 @@ def get_detach_signature_command(self) -> str:
     def is_aws_cf_enable(self) -> bool:
         return self.__aws_cf_enable
 
+    def is_radas_enabled(self) -> bool:
+        return bool(self.__radas_config__ and self.__radas_config__.validate())
+
     def get_radas_config(self) -> Optional[RadasConfig]:
         return self.__radas_config__
 

charon/pkgs/maven.py

@@ -416,8 +416,7 @@ def handle_maven_uploading(
         if not conf:
             sys.exit(1)
 
-        rconf = conf.get_radas_config()
-        if rconf and rconf.validate():
+        if conf.is_radas_enabled():
             logger.info("Start generating radas signature files for s3 bucket %s\n", bucket_name)
             (_failed_metas, _generated_signs) = radas_signature.generate_radas_sign(
                 top_level=top_level, sign_result_loc=sign_result_loc

charon/pkgs/radas_signature_handler.py

@@ -49,8 +49,11 @@ def on_start(self, event: Event) -> None:
         On start callback
         """
         conf = get_config()
-        rconf = conf.get_radas_config() if conf else None
-        if not rconf:
+        if not (conf and conf.is_radas_enabled()):
+            sys.exit(1)
+
+        rconf = conf.get_radas_config()
+        if rconf is None:
             sys.exit(1)
         conn = event.container.connect(rconf.umb_target())
         event.container.create_receiver(conn, rconf.result_queue())