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

Jump to bottom

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

Merged
merged 1 commit into from
Nov 7, 2023
Merged

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

merged 1 commit into from
Nov 7, 2023

Conversation

m1kola
Copy link
Member

@m1kola m1kola commented Nov 6, 2023 •
edited
Loading

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-ci openshift-ci bot 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
internal/resolution/variablesources/installed_package.go
@@ -47,7 +47,7 @@ func MakeInstalledPackageVariables(
// find corresponding bundle for the installed content
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)
Copy link
Member Author

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.

@m1kola m1kola mentioned this pull request Nov 6, 2023
Merged
4 tasks
@codecov Codecov
Copy link

codecov bot commented Nov 6, 2023

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
Flag Coverage Δ
e2e 65.84% <61.76%> (-0.08%) ⬇️
unit 79.33% <67.64%> (-0.22%) ⬇️

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

Files Coverage Δ
...al/resolution/variablesources/bundle_deployment.go 100.00% <100.00%> (+21.05%) ⬆️
...al/resolution/variablesources/installed_package.go 68.00% <64.00%> (-5.92%) ⬇️

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

@ncdc ncdc changed the title Improve installed package error 🌱 Improve installed package error Nov 6, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2023
@m1kola m1kola force-pushed the improve_installed_package_error branch from dd5eb77 to 004a748 Compare November 7, 2023 13:17
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 7, 2023
@m1kola m1kola force-pushed the improve_installed_package_error branch from 004a748 to 0844b97 Compare November 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 owner November 7, 2023 13:53
@openshift-ci openshift-ci bot 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
@m1kola m1kola changed the title 🌱 Improve installed package error 🌱 Improve installed package error when bundle can not be found Nov 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-queue bot removed this pull request from the merge queue due to failed status checks Nov 7, 2023
@m1kola
Improve error about a missing installed bundle
4a94bc3 
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
@m1kola m1kola force-pushed the improve_installed_package_error branch from 0844b97 to 4a94bc3 Compare November 7, 2023 14:44
@m1kola m1kola enabled auto-merge November 7, 2023 14:44
@m1kola
Copy link
Member Author

m1kola commented Nov 7, 2023

@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
Copy link
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 e07bea0 Nov 7, 2023
13 checks passed
@m1kola m1kola deleted the improve_installed_package_error branch November 7, 2023 15:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grokspawn grokspawn grokspawn 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.

None yet
3 participants
@m1kola @grokspawn @openshift-merge-robot