Skip to content

OCPBUGS-66410: fix: return only requested version #1323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aguidirh wants to merge 1 commit into
base: release-4.19
Choose a base branch
from
Open

OCPBUGS-66410: fix: return only requested version #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion v2/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ require (
github.com/openshift/api v0.0.0-20240529192326-16d44e6d3e7d
github.com/operator-framework/operator-registry v1.47.0
github.com/otiai10/copy v1.14.0
github.com/sherine-k/catalog-filter v0.0.4
github.com/sherine-k/catalog-filter v0.0.5
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.9.1
github.com/spf13/pflag v1.0.6
Expand Down
4 changes: 2 additions & 2 deletions v2/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3
github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/sherine-k/catalog-filter v0.0.4 h1:UWM3XaktjbvKw5ktC2NoxQLP+6KNbvaplwiAaVV411g=
github.com/sherine-k/catalog-filter v0.0.4/go.mod h1:NQ667IgdlOYYHeLwppvrtm5TtYIn7b3CCyYKGT2e3rI=
github.com/sherine-k/catalog-filter v0.0.5 h1:RExES+TRnkIcK6GwMBXGbku1X5C11Wr03FHQj38f060=
github.com/sherine-k/catalog-filter v0.0.5/go.mod h1:NQ667IgdlOYYHeLwppvrtm5TtYIn7b3CCyYKGT2e3rI=
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
github.com/sigstore/fulcio v1.6.6 h1:XaMYX6TNT+8n7Npe8D94nyZ7/ERjEsNGFC+REdi/wzw=
Expand Down
7 changes: 4 additions & 3 deletions v2/internal/pkg/operator/catalog_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import (
"slices"
"testing"

"github.com/operator-framework/operator-registry/alpha/declcfg"
"github.com/stretchr/testify/assert"

"github.com/openshift/oc-mirror/v2/internal/pkg/api/v2alpha1"
"github.com/openshift/oc-mirror/v2/internal/pkg/common"
clog "github.com/openshift/oc-mirror/v2/internal/pkg/log"
"github.com/operator-framework/operator-registry/alpha/declcfg"
"github.com/stretchr/testify/assert"
)

func TestFilterRelatedImagesFromCatalog(t *testing.T) {
Expand Down Expand Up @@ -1144,7 +1145,7 @@ func TestFilterCatalog(t *testing.T) {
},

expectedBundles: []string{},
expectedError: errors.New("package \"3scale-operator\" channel \"threescale-mas\" has version range \">=77.77.77 <=77.77.77\" that results in an empty channel"),
expectedError: errors.New("error finding specific bundle: specific version 77.77.77 not found in bundles"),
expectedWarning: ""},
}

Expand Down