Skip to content

Discover private CatalogSource only if no catalog cluster permission exists #1099

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

Merged
ibm-ci-bot merged 4 commits into from
Nov 29, 2024
Merged

Discover private CatalogSource only if no catalog cluster permission exists #1099

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1bcfa6
read catalogsource permission only for non-private ctrsource
Nov 27, 2024
c8a5f6b
add test case for checkResAuth function in manager.go
Nov 28, 2024
6c7c574
add create mock test or ODLMoperator
Nov 28, 2024
8a0208b
update test case
Nov 29, 2024
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
Prev Previous commit
Next Next commit
add create mock test or ODLMoperator 
Signed-off-by: YuChen <[email protected]>
  • Loading branch information
YuChen committed Nov 28, 2024
commit 6c7c574d5595233e48ef4d71d1a6bf61535bd6a3
15 changes: 15 additions & 0 deletions controllers/operator/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ func TestGetFirstAvailableSemverChannelFromCatalog(t *testing.T) {
type MockReader struct {
PackageManifestList *operatorsv1.PackageManifestList
CatalogSourceList *olmv1alpha1.CatalogSourceList
CreatedObjects map[string]client.Object
}

func (m *MockReader) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
Expand All @@ -248,6 +249,20 @@ func (m *MockReader) List(ctx context.Context, list client.ObjectList, opts ...c
return nil
}

func (m *MockReader) Create(ctx context.Context, obj client.Object, opts ...client.CreateOption) error {
if m.CreatedObjects == nil {
m.CreatedObjects = make(map[string]client.Object)
}

// Generate a unique key based on the object's name and namespace
key := fmt.Sprintf("%s/%s", obj.GetNamespace(), obj.GetName())

// Store the object in the map
m.CreatedObjects[key] = obj

return nil
}

func TestGetCatalogSourceAndChannelFromPackage(t *testing.T) {
ctx := context.TODO()

Expand Down