Merge pull request #166 from dinhxuanvu/validate-bundle-test-2

openshift-merge-robot · web-flow · commit e517d18867cf · 2020-01-29T06:35:02.000-08:00
Add validate bundle test cases
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle/etcdbackups.etcd.database.coreos.com.crd.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle/etcdbackups.etcd.database.coreos.com.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: etcdbackups.etcd.database.coreos.com
+spec:
+  group: etcd.database.coreos.com
+  names:
+    kind: EtcdBackup
+    listKind: EtcdBackupList
+    plural: etcdbackups
+    singular: etcdbackup
+  scope: Namespaced
+  version: v1beta2
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle/etcdoperator.v0.9.4.clusterserviceversion.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle/etcdoperator.v0.9.4.clusterserviceversion.yaml
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle/etcdrestores.etcd.database.coreos.com.crd.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle/etcdrestores.etcd.database.coreos.com.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: etcdrestores.etcd.database.coreos.com
+spec:
+  group: etcd.database.coreos.com
+  names:
+    kind: EtcdRestore
+    listKind: EtcdRestoreList
+    plural: etcdrestores
+    singular: etcdrestore
+  scope: Namespaced
+  version: v1beta2
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdbackups.etcd.database.coreos.com.crd.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdbackups.etcd.database.coreos.com.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: etcdbackups.etcd.database.coreos.com
+spec:
+  group: etcd.database.coreos.com
+  names:
+    kind: EtcdBackup
+    listKind: EtcdBackupList
+    plural: etcdbackups
+    singular: etcdbackup
+  scope: Namespaced
+  version: v1beta2
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdclusters.etcd.database.coreos.com.crd.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdclusters.etcd.database.coreos.com.crd.yaml
@@ -0,0 +1,16 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: etcdclusters.etcd.database.coreos.com
+spec:
+  group: etcd.database.coreos.com
+  names:
+    kind: EtcdCluster
+    listKind: EtcdClusterList
+    plural: etcdclusters
+    shortNames:
+    - etcdclus
+    - etcd
+    singular: etcdcluster
+  scope: Namespaced
+  version: v1beta2
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdoperator.v0.9.4.clusterserviceversion.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdoperator.v0.9.4.clusterserviceversion.yaml
diff --git a/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdrestores.etcd.database.coreos.com.crd.yaml b/pkg/lib/bundle/testdata/validate/invalid_manifests_bundle/invalid_bundle_2/etcdrestores.etcd.database.coreos.com.crd.yaml
@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: etcdrestores.etcd.database.coreos.com
+spec:
+  group: etcd.database.coreos.com
+  names:
+    kind: EtcdRestore
+    listKind: EtcdRestoreList
+    plural: etcdrestores
+    singular: etcdrestore
+  scope: Namespaced
+  version: v1beta2
diff --git a/pkg/lib/bundle/validate_test.go b/pkg/lib/bundle/validate_test.go
@@ -129,6 +129,20 @@ func TestValidateBundleContent(t *testing.T) {
 			directory:   "./testdata/validate/valid_bundle/manifests/",
 			numErrors:   0,
 		},
+		{
+			description: "invalid registryv1 bundle/missing crd",
+			mediaType:   RegistryV1Type,
+			directory:   "./testdata/validate/invalid_manifests_bundle/invalid_bundle/",
+			numErrors:   1,
+			errString:   `owned CRD "etcdclusters.etcd.database.coreos.com" not found in bundle`,
+		},
+		{
+			description: "invalid registryv1 bundle/extra crd",
+			mediaType:   RegistryV1Type,
+			directory:   "./testdata/validate/invalid_manifests_bundle/invalid_bundle_2/",
+			numErrors:   1,
+			errString:   `owned CRD "etcdclusters.etcd.database.coreos.com" is present in bundle "etcdoperator.v0.9.4" but not defined in CSV`,
+		},
 	}
 
 	for i, tt := range table {
