Skip to content
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

Remove import of operators.coreos.com lister package from resolver. #2661

Merged
merged 1 commit into from
Feb 21, 2022
Merged

Remove import of operators.coreos.com lister package from resolver. #2661

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
78 changes: 8 additions & 70 deletions pkg/controller/registry/resolver/resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

"github.com/operator-framework/api/pkg/constraints"
"github.com/operator-framework/api/pkg/operators/v1alpha1"
listersv1alpha1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache"
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/solver"
"github.com/operator-framework/operator-registry/pkg/api"
Expand Down Expand Up @@ -409,38 +405,10 @@ func TestSolveOperators_FindLatestVersionWithNestedDependencies(t *testing.T) {
assert.ElementsMatch(t, expected, operators)
}

type stubCatalogSourceLister struct {
catsrcs []*v1alpha1.CatalogSource
namespace string
}
type stubSourcePriorityProvider map[cache.SourceKey]int

func (l *stubCatalogSourceLister) List(labels.Selector) ([]*v1alpha1.CatalogSource, error) {
if l.namespace == "" {
return l.catsrcs, nil
}
var result []*v1alpha1.CatalogSource
for _, cs := range l.catsrcs {
if cs.Namespace == l.namespace {
result = append(result, cs)
}
}
return result, nil
}

func (l *stubCatalogSourceLister) Get(name string) (*v1alpha1.CatalogSource, error) {
for _, cs := range l.catsrcs {
if cs.Name == name {
return cs, nil
}
}
return nil, errors.New("stub not found")
}

func (l *stubCatalogSourceLister) CatalogSources(namespace string) listersv1alpha1.CatalogSourceNamespaceLister {
return &stubCatalogSourceLister{
catsrcs: l.catsrcs,
namespace: namespace,
}
func (spp stubSourcePriorityProvider) Priority(k cache.SourceKey) int {
return spp[k]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to null check this $somewhere to avoid a panic?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, disregard - I think this is fine as it should just return 0 when indexing on a key that doesn't exist.

/lgtm

}

func TestSolveOperators_CatsrcPrioritySorting(t *testing.T) {
Expand Down Expand Up @@ -478,19 +446,7 @@ func TestSolveOperators_CatsrcPrioritySorting(t *testing.T) {
}

resolver := Resolver{
cache: cache.New(ssp, cache.WithSourcePriorityProvider(catsrcPriorityProvider{lister: &stubCatalogSourceLister{
catsrcs: []*v1alpha1.CatalogSource{
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "olm",
Name: "high-priority-operator",
},
Spec: v1alpha1.CatalogSourceSpec{
Priority: 100,
},
},
},
}})),
cache: cache.New(ssp, cache.WithSourcePriorityProvider(stubSourcePriorityProvider{cache.SourceKey{Namespace: "olm", Name: "high-priority-operator"}: 100})),
}

operators, err := resolver.Resolve([]string{"olm"}, subs)
Expand All @@ -515,28 +471,10 @@ func TestSolveOperators_CatsrcPrioritySorting(t *testing.T) {
}

resolver = Resolver{
cache: cache.New(ssp, cache.WithSourcePriorityProvider(catsrcPriorityProvider{lister: &stubCatalogSourceLister{
catsrcs: []*v1alpha1.CatalogSource{
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "olm",
Name: "high-priority-operator",
},
Spec: v1alpha1.CatalogSourceSpec{
Priority: 100,
},
},
{
ObjectMeta: metav1.ObjectMeta{
Namespace: "olm",
Name: "community-operator",
},
Spec: v1alpha1.CatalogSourceSpec{
Priority: 100,
},
},
},
}})),
cache: cache.New(ssp, cache.WithSourcePriorityProvider(stubSourcePriorityProvider{
cache.SourceKey{Namespace: "olm", Name: "high-priority-operator"}: 100,
cache.SourceKey{Namespace: "olm", Name: "community-operator"}: 100,
})),
}

operators, err = resolver.Resolve([]string{"olm"}, subs)
Expand Down