Merge pull request #165 from kevinrizza/versions-field

Support crd.versions field

operatorcourier/validate.py

@@ -156,9 +156,10 @@ def _crd_validation(self, bundle):
                 if "group" not in crd['spec']:
                     self._log_error("crd spec.group not defined.")
                     valid = False
-                if "version" not in crd['spec']:
-                    self._log_error("crd spec.version not defined.")
-                    valid = False
+                if "versions" not in crd['spec']:
+                    if "version" not in crd['spec']:
+                        self._log_error("crd spec.version or spec.versions not defined")
+                        valid = False
 
         return valid
 
@@ -271,6 +272,11 @@ def _csv_spec_validation(self, spec, bundleData):
 
                     if 'version' in csvOwnedCrd:
                         if 'spec' in crd:
+                            if 'versions' in crd['spec']:
+                                if csvOwnedCrd['version'] not in crd['spec']['versions']:
+                                    self._log_error('CSV.spec.crd.owned.version is'
+                                                    'not in CRD.spec.versions list')
+                                    valid = False
                             if 'version' in crd['spec']:
                                 if csvOwnedCrd['version'] != crd['spec']['version']:
                                     self._log_error('CRD.spec.version does not match '

tests/test_validate.py

@@ -160,3 +160,27 @@ def _test_invalid_bundle(bundleFile):
         unformatted_bundle = unformat_bundle(bundle)
         valid, _ = ValidateCmd().validate(unformatted_bundle)
         assert not valid
+
+
+@pytest.mark.parametrize('file_name', [
+    "tests/test_files/bundles/verification/crdversions.invalid.bundle.yaml",
+])
+def test_invalid_crd_versions_field(file_name):
+    with open(file_name) as f:
+        bundle = yaml.safe_load(f)
+        bundle = unformat_bundle(bundle)
+        valid, _ = ValidateCmd().validate(bundle)
+
+    assert not valid
+
+
+@pytest.mark.parametrize('file_name', [
+    "tests/test_files/bundles/verification/crdversions.valid.bundle.yaml",
+])
+def test_valid_crd_versions_field(file_name):
+    with open(file_name) as f:
+        bundle = yaml.safe_load(f)
+        bundle = unformat_bundle(bundle)
+        valid, _ = ValidateCmd().validate(bundle)
+
+    assert valid