Merge pull request #310 from ligangty/radas-umb

RADAS: add default ignore patterns for signing

Author: ligangty

charon.spec

@@ -1,7 +1,7 @@
 %global owner Commonjava
 %global modulename charon
 
-%global charon_version 1.3.3
+%global charon_version 1.4.0
 %global sdist_tar_name %{modulename}-%{charon_version}
 
 %global python3_pkgversion 3

charon/cmd/cmd_sign.py

@@ -18,6 +18,7 @@
 from charon.config import get_config
 from charon.pkgs.radas_sign import sign_in_radas
 from charon.cmd.internal import _decide_mode
+from charon.constants import DEFAULT_RADAS_SIGN_IGNORES
 
 from click import command, option, argument
 
@@ -98,8 +99,7 @@ def sign(
     ignore_patterns: List[str] = None,
     config: str = None,
     debug=False,
-    quiet=False,
-    dryrun=False
+    quiet=False
 ):
     """Do signing against files in the repo zip in repo_url through
     radas service. The repo_url points to the maven zip repository
@@ -119,8 +119,10 @@ def sign(
             sys.exit(1)
         # All ignore files in global config should also be ignored in signing.
         ig_patterns = conf.get_ignore_patterns()
+        ig_patterns.extend(DEFAULT_RADAS_SIGN_IGNORES)
         if ignore_patterns:
             ig_patterns.extend(ignore_patterns)
+        ig_patterns = list(set(ig_patterns))
         args = {
             "repo_url": repo_url,
             "requester": requester,

charon/constants.py

@@ -177,3 +177,8 @@
 DEFAULT_REGISTRY = "localhost"
 DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_COUNT = 10
 DEFAULT_RADAS_SIGN_TIMEOUT_RETRY_INTERVAL = 60
+
+DEFAULT_RADAS_SIGN_IGNORES = [
+    r".*\.md5$", r".*\.sha1$", r".*\.sha128$", r".*\.sha256$",
+    r".*\.sha512$", r".*\.asc$"
+]

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["setuptools", "setuptools-scm"]
 
 [project]
 name = "charon"
-version = "1.3.3"
+version = "1.4.0"
 authors = [
   {name = "RedHat EXD SPMM"},
 ]
@@ -107,4 +107,4 @@ ignore = [
 ]
 per-file-ignores = [
   "tests/*:D101,D102,D103", # missing docstring in public class, method, function
-]
+]

setup.py

@@ -15,7 +15,7 @@
 """
 from setuptools import setup, find_packages
 
-version = "1.3.3"
+version = "1.4.0"
 
 long_description = """
 This charon is a tool to synchronize several types of