Make regexp backwards compatible

README.md

@@ -80,21 +80,22 @@ 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.
 
-You can pattern match registry strings with the regexp field instead of matching
-whole strings with 'old':
+You can pattern match and replace registry strings with the regexp field instead
+of matching whole strings.  Both `old` and `new` will be evalutated as regexes
+when `regexp` is set to `True`.  If `regexp` is missing it defaults to `False`.
+Here's an example:
 ```
 "replace_registry": [
     {
-        "old": "",
+        "old": "quay.io$",
         "new": "example.com",
-        "regexp": "quay.io$",
+        "regexp": "True",
     },
 ]
 ```

omps/quay.py

@@ -257,13 +257,17 @@ def replace_registries(self, text):
             return text
 
         for conf in self._replace_registry_conf:
-            old = conf['old']
             new = conf['new']
-            regexp = conf['regexp']
+            old = conf['old']
+            regexp = False
+
+            if 'regexp' in conf.keys():
+                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)
+            if regexp:
+                if re.search(old, text, flags=re.MULTILINE):
+                    self.logger.info("Replacing registries with regexp '%s'", regexp)
+                    text = re.sub(old, 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/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', 'regexp': ''}]
+            replace_conf = [{'old': 'reg_old', 'new': 'reg_new'}]
         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', 'regexp': ''}]
+        replace_conf = [{'old': 'reg_old', 'new': 'reg_new'}]
         org = 'testorg'
         qo = QuayOrganization(org, TOKEN, replace_registry_conf=replace_conf)
         assert qo.replace_registries(text) == expected
@@ -490,12 +490,13 @@ def test_replace_registries_unconfigured(self):
         )
     ])
     def test_regexp_replace_registries(self, text, expected):
-        """Test if registries are replaced properly"""
-        replace_conf = [{'old': '', 'new': 'reg_new', 'regexp': 'reg_old$'}]
+        """Test if registries are replaced properly with regexp"""
+        replace_conf = [{'old': 'reg_old$', 'new': 'reg_new', 'regexp': 'True'}]
         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,7 +118,6 @@ def test_organizations():
                 {
                     'old': 'quay.io',
                     'new': 'example.com',
-                    'regexp': '',
                 },
             ]
         }
@@ -131,17 +130,17 @@ class ConfClass(DefaultConfig):
     assert conf.organizations == expected
 
 
-def test_regexp():
-    """Regexp Test"""
+def test_organziation_regexp():
+    """Organziation with regexp Test"""
     expected = {
         'myorg': {
             'public': False,
             'oauth_token': 'token',
             'replace_registry': [
                 {
-                    'old': 'quay.io/',
+                    'old': 'quay.io/$',
                     'new': 'example.com',
-                    'regexp': 'quay.io$',
+                    'regexp': 'True',
                 },
             ]
         }
@@ -188,7 +187,7 @@ class ConfClass(DefaultConfig):
     }, {
         'organization': {
             'replace_registry': [
-                {'regexp': 'expected regexp too'}
+                {'regexp': 'False'}
             ]
         }
     }