Merge pull request #1801 from deads2k/by-gate-14-filter-iou

tighten up the useCRD interface
openshift · Mar 12, 2024 · ad26456 · ad26456
2 parents 16eec10 + 98c5970
commit ad26456
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/tools/codegen/pkg/manifestmerge/filters.go b/tools/codegen/pkg/manifestmerge/filters.go
@@ -150,8 +150,8 @@ func (f *ClusterProfileFilter) UseManifest(data []byte) (bool, error) {
 	return forThisProfile, nil
 }
 
-func (f *ClusterProfileFilter) UseCRD(metadata crdForFeatureSet) (bool, error) {
-	return metadata.clusterProfile == f.clusterProfile, nil
+func (f *ClusterProfileFilter) UseCRD(metadata crdForFeatureSet) bool {
+	return metadata.clusterProfile == f.clusterProfile
 }
 
 func (f *ClusterProfileFilter) String() string {
@@ -185,25 +185,22 @@ func (f *AndManifestFilter) String() string {
 }
 
 type CRDFilter interface {
-	UseCRD(metadata crdForFeatureSet) (bool, error)
+	UseCRD(metadata crdForFeatureSet) bool
 }
 
 type AndCRDFilter struct {
 	filters []CRDFilter
 }
 
-func (f *AndCRDFilter) UseCRD(metadata crdForFeatureSet) (bool, error) {
+func (f *AndCRDFilter) UseCRD(metadata crdForFeatureSet) bool {
 	for _, curr := range f.filters {
-		ret, err := curr.UseCRD(metadata)
-		if err != nil {
-			return false, err
-		}
+		ret := curr.UseCRD(metadata)
 		if !ret {
-			return false, nil
+			return false
 		}
 	}
 
-	return true, nil
+	return true
 }
 
 func (f *AndCRDFilter) String() string {
@@ -228,8 +225,8 @@ func (f *FeatureSetFilter) UseManifest(data []byte) (bool, error) {
 	return forThisFeatureSet, nil
 }
 
-func (f *FeatureSetFilter) UseCRD(metadata crdForFeatureSet) (bool, error) {
-	return metadata.featureSet == f.featureSetName, nil
+func (f *FeatureSetFilter) UseCRD(metadata crdForFeatureSet) bool {
+	return metadata.featureSet == f.featureSetName
 }
 
 func (f *FeatureSetFilter) String() string {
@@ -239,8 +236,8 @@ func (f *FeatureSetFilter) String() string {
 type HasData struct {
 }
 
-func (f *HasData) UseCRD(metadata crdForFeatureSet) (bool, error) {
-	return metadata.noData == false, nil
+func (f *HasData) UseCRD(metadata crdForFeatureSet) bool {
+	return metadata.noData == false
 }
 
 func (f *HasData) String() string {
@@ -254,8 +251,8 @@ func (f *Everything) UseManifest(data []byte) (bool, error) {
 	return true, nil
 }
 
-func (f *Everything) UseCRD(metadata crdForFeatureSet) (bool, error) {
-	return true, nil
+func (f *Everything) UseCRD(metadata crdForFeatureSet) bool {
+	return true
 }
 
 func (f *Everything) String() string {

diff --git a/tools/codegen/pkg/manifestmerge/generator.go b/tools/codegen/pkg/manifestmerge/generator.go
@@ -465,7 +465,7 @@ func featureSetsFromCRDs(resultingCRDs []crdForFeatureSet) sets.String {
 func filterCRDs(resultingCRDs []crdForFeatureSet, filter CRDFilter) []crdForFeatureSet {
 	ret := []crdForFeatureSet{}
 	for i, currCRD := range resultingCRDs {
-		if ok, _ := filter.UseCRD(currCRD); ok {
+		if ok := filter.UseCRD(currCRD); ok {
 			ret = append(ret, resultingCRDs[i])
 		}
 	}