Merge b098826 into f5b2244

README.md

@@ -80,13 +80,25 @@ organization:
     {
         "old": "quay.io",
         "new": "example.com",
+        "regexp": "",
     },
 ]
 ```
-all specified `old` registries will be replaced by `new` in all manifests yaml
-files for that organization. Replacement happen during pushing manifests into
-application registry.
+All specified `old` registries will be replaced by `new` in all manifests yaml
+files for that organization.
 
+You can pattern match registry strings with the regexp field instead of matching
+whole strings with 'old':
+```
+"replace_registry": [
+    {
+        "old": "",
+        "new": "example.com",
+        "regexp": "quay.io$",
+    },
+]
+```
+Replacements occur when pushing manifests into the application registry.
 
 ### Greenwave integration
 

example.test.env.yaml

@@ -42,6 +42,7 @@ private_org:
 replace_registry:
   - old: registry.stage.redhat.io
     new: registry.redhat.io
+    regex: ""
 # Config of the instance tested to check if Greenwave policies are met for the
 # NVR
 greenwave:

omps/quay.py

@@ -259,7 +259,12 @@ def replace_registries(self, text):
         for conf in self._replace_registry_conf:
             old = conf['old']
             new = conf['new']
-            if old in text:
+            regexp = conf['regexp']
+
+            if regexp is not "":
+                self.logger.info("Replacing registries with regexp '%s'", regexp)
+                text = re.sub(regexp, new, text, flags=re.MULTILINE)
+            elif old in text:
                 self.logger.info("Replacing registry '%s' with '%s'", old, new)
                 text = text.replace(old, new)
 

tests/api/test_common.py

@@ -22,7 +22,7 @@ def _yield_yaml_files(dir_path):
     old = 'quay.io'
     new = 'example.com'
     qo = QuayOrganization('testorg', 'random token', replace_registry_conf=[
-        {'old': old, 'new': new}
+        {'old': old, 'new': new, 'regexp': ""}
     ])
 
     should_be_replaced = set()

tests/integration/replace_registry/replace_registry_test.py

@@ -41,7 +41,7 @@ def koji_registries(replace_conf, path):
         the manifest at 'path'
 
         Args:
-            replace_conf: List of {'old': ..., 'new': ...} dictionaries.
+            replace_conf: List of {'old': ..., 'new': ..., 'regexp': ...} dictionaries.
             path: Path of the manifest.
 
         Returns:

tests/test_quay.py

@@ -446,7 +446,7 @@ def test_publish_repo_error(self):
     def test_registry_replacing_enabled(self, enabled):
         """Test if property returns correct value"""
         if enabled:
-            replace_conf = [{'old': 'reg_old', 'new': 'reg_new'}]
+            replace_conf = [{'old': 'reg_old', 'new': 'reg_new', 'regexp': ''}]
         else:
             replace_conf = None
 
@@ -468,7 +468,7 @@ def test_registry_replacing_enabled(self, enabled):
     ])
     def test_replace_registries(self, text, expected):
         """Test if registries are replaced properly"""
-        replace_conf = [{'old': 'reg_old', 'new': 'reg_new'}]
+        replace_conf = [{'old': 'reg_old', 'new': 'reg_new', 'regexp': ''}]
         org = 'testorg'
         qo = QuayOrganization(org, TOKEN, replace_registry_conf=replace_conf)
         assert qo.replace_registries(text) == expected
@@ -483,6 +483,18 @@ def test_replace_registries_unconfigured(self):
         assert res == text
         assert id(res) == id(text)
 
+    @pytest.mark.parametrize('text,expected', [
+        (
+            'Registry reg_old will be replaced using a regexp: reg_old',
+            'Registry reg_old will be replaced using a regexp: reg_new',
+        )
+    ])
+    def test_regexp_replace_registries(self, text, expected):
+        """Test if registries are replaced properly"""
+        replace_conf = [{'old': '', 'new': 'reg_new', 'regexp': 'reg_old$'}]
+        org = 'testorg'
+        qo = QuayOrganization(org, TOKEN, replace_registry_conf=replace_conf)
+        assert qo.replace_registries(text) == expected
 
 class TestOrgManager:
     """Tets for OrgManager class"""

tests/test_settings.py

@@ -118,6 +118,30 @@ def test_organizations():
                 {
                     'old': 'quay.io',
                     'new': 'example.com',
+                    'regexp': '',
+                },
+            ]
+        }
+    }
+
+    class ConfClass(DefaultConfig):
+        ORGANIZATIONS = expected
+
+    conf = Config(ConfClass)
+    assert conf.organizations == expected
+
+
+def test_regexp():
+    """Regexp Test"""
+    expected = {
+        'myorg': {
+            'public': False,
+            'oauth_token': 'token',
+            'replace_registry': [
+                {
+                    'old': 'quay.io/',
+                    'new': 'example.com',
+                    'regexp': 'quay.io$',
                 },
             ]
         }
@@ -161,6 +185,12 @@ class ConfClass(DefaultConfig):
                 {'old': 'expected new too'}
             ]
         }
+    }, {
+        'organization': {
+            'replace_registry': [
+                {'regexp': 'expected regexp too'}
+            ]
+        }
     }
 
 ])