Skip to content

🌱 Improve installed package error when bundle can not be found - #514

Merged
m1kola merged 1 commit into
operator-framework:mainfrom
m1kola:improve_installed_package_error
Nov 7, 2023
Merged

🌱 Improve installed package error when bundle can not be found#514
m1kola merged 1 commit into
operator-framework:mainfrom
m1kola:improve_installed_package_error

Conversation

@m1kola

@m1kolam1kola commented Nov 6, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Description

Follow up for #499 (comment)

Reviewer Checklist

  • API Go Documentation
  • Tests: Unit Tests (and E2E Tests, if appropriate)
  • Comprehensive Commit Messages
  • Links to related GitHub Issue(s)

@openshift-ciopenshift-ciBot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 6, 2023
m1kola
m1kola commented Nov 6, 2023
View reviewed changes
Comment threadinternal/resolution/variablesources/installed_package.go
resultSet := catalogfilter.Filter(allBundles, catalogfilter.WithBundleImage(bundleImage))
if len(resultSet) == 0 {
return nil, fmt.Errorf("bundleImage %q not found", bundleImage)
return nil, fmt.Errorf("bundle with image %q not found in available catalogs but is currently installed via BundleDeployment %q", bundleImage, bundleDeployment.Name)

@m1kolam1kolaNov 6, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

@everettraven this is basically what you suggested here but with a slighlty modified message.

I'm trying to make an emphasis on the fact that the bundle is not fund in the currently available catalogs.

Let me know what you think.

P.S.: this PR will need a rebase after we merge #499.

@m1kolam1kola mentioned this pull request Nov 6, 2023
Merged
4 tasks
@codecov

codecovBot commented Nov 6, 2023

Copy link
Copy Markdown

Codecov Report

Attention: 9 lines in your changes are missing coverage. Please review.

Comparison is base (aca6451) 84.41% compared to head (dd5eb77) 84.43%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #514 +/- ##
==========================================
+ Coverage 84.41% 84.43% +0.01% 
==========================================
Files 23 23 Lines 892 893 +1 ==========================================
+ Hits 753 754 +1 
Misses 95 95 Partials 44 44
FlagCoverage Δ
e2e65.84% <61.76%> (-0.08%)⬇️
unit79.33% <67.64%> (-0.22%)⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
...al/resolution/variablesources/bundle_deployment.go100.00% <100.00%> (+21.05%)⬆️
...al/resolution/variablesources/installed_package.go68.00% <64.00%> (-5.92%)⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ncdcncdc changed the title Improve installed package error🌱 Improve installed package errorNov 6, 2023
@openshift-merge-robotopenshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2023
@m1kola
m1kolaforce-pushed the improve_installed_package_error branch from dd5eb77 to 004a748CompareNovember 7, 2023 13:17
@openshift-merge-robotopenshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2023
@m1kola
m1kolaforce-pushed the improve_installed_package_error branch from 004a748 to 0844b97CompareNovember 7, 2023 13:51
@m1kola
m1kola marked this pull request as ready for review November 7, 2023 13:53
@m1kola
m1kola requested a review from a team as a code ownerNovember 7, 2023 13:53
@openshift-ciopenshift-ciBot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 7, 2023
@m1kolam1kola changed the title 🌱 Improve installed package error🌱 Improve installed package error when bundle can not be foundNov 7, 2023
grokspawn
grokspawn previously approved these changes Nov 7, 2023
View reviewed changes
@m1kola
m1kola added this pull request to the merge queue Nov 7, 2023
@github-merge-queue
github-merge-queueBot removed this pull request from the merge queue due to failed status checks Nov 7, 2023
Mikalai Radchuk
Improve error about a missing installed bundle
4a94bc3
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
@m1kola
m1kolaforce-pushed the improve_installed_package_error branch from 0844b97 to 4a94bc3CompareNovember 7, 2023 14:44
@m1kola
m1kola enabled auto-merge November 7, 2023 14:44
@m1kola

m1kola commented Nov 7, 2023

Copy link
Copy Markdown
MemberAuthor

@grokspawn could you please take another look? PR got removed from a merge queue becuase #520 got merged and variablesources/installed_package_test.go needed an update.

@grokspawn

grokspawn commented Nov 7, 2023

Copy link
Copy Markdown
Contributor

@grokspawn could you please take another look? PR got removed from a merge queue becuase #520 got merged and variablesources/installed_package_test.go needed an update.

Checking CI signal, and then I'll approve again if green.

@m1kola
m1kola added this pull request to the merge queue Nov 7, 2023
Merged via the queue into operator-framework:main with commit e07bea0Nov 7, 2023
@m1kola
m1kola deleted the improve_installed_package_error branch November 7, 2023 15:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@grokspawngrokspawngrokspawn approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@m1kola@grokspawn@openshift-merge-robot