🌱 Part 4: Reduce number of variable sources. Required packages #500
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
do-not-merge/work-in-progress
This was referenced Oct 31, 2023
m1kola
force-pushed
the
shrink_variable_sources_p4
branch
from
1ba218a
to
764afee
Compare
m1kola
changed the title
m1kola
force-pushed
the
shrink_variable_sources_p4
branch
3 times, most recently
from
9e70605
to
fb7fc7d
Compare
m1kola
force-pushed
the
shrink_variable_sources_p4
branch
3 times, most recently
from
90de92a
to
dfee29b
Compare
ncdc
changed the title
openshift-merge-robot
added
the
needs-rebase
m1kola
force-pushed
the
shrink_variable_sources_p4
branch
from
dfee29b
to
7fc644a
Compare
openshift-merge-robot
removed
the
needs-rebase
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #500 +/- ##
==========================================
+ Coverage 84.45% 85.21% +0.76%
==========================================
Files 23 23
Lines 907 893 -14
==========================================
- Hits 766 761 -5
+ Misses 96 91 -5
+ Partials 45 41 -4
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
m1kola
force-pushed
the
shrink_variable_sources_p4
branch
2 times, most recently
from
1e883c2
to
1a29986
Compare
Signed-off-by: Mikalai Radchuk <mradchuk@redhat.com>
m1kola
force-pushed
the
shrink_variable_sources_p4
branch
from
1a29986
to
6585f6e
Compare
m1kola
commented
Nov 7, 2023
| @@ -83,7 +83,7 @@ var _ = Describe("Operator Controller Test", func() { | |||
| By("running reconcile") | |||
| res, err := reconciler.Reconcile(ctx, ctrl.Request{NamespacedName: opKey}) | |||
| Expect(res).To(Equal(ctrl.Result{})) | |||
| Expect(err).To(MatchError(fmt.Sprintf("no package '%s' found", pkgName))) | |||
There was a problem hiding this comment.
Since I had similar comments on previous parts of this refactoring & most of our errors use double quotation marks I updated the format here.
I'm happy to revert this and move into a separate PR if this is too distracting
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
joelanford
reviewed
Nov 8, 2023
Comment on lines
+45
to
+53
| if versionRange != "" && channelName != "" { | ||
| return nil, fmt.Errorf("no package %q matching version %q found in channel %q", packageName, versionRange, channelName) | ||
| } | ||
| if versionRange != "" { | ||
| return nil, fmt.Errorf("no package %q matching version %q found", packageName, versionRange) | ||
| } | ||
| if channelName != "" { | ||
| return nil, fmt.Errorf("no package %q found in channel %q", packageName, channelName) | ||
| } |
There was a problem hiding this comment.
What do you think about building up the error message as we're building the predicates (since we're already making the necessary conditional checks as we go)?
There was a problem hiding this comment.
I think I'm not in favour of this approach because:
- There are more combinations of errors than we have conditions for predicates. Unless I'm missing something, we will have to add more
ifs under existing predicateifs to get equivalent behaviour - Might be just me, but when I debug an error or read code I appreicate when codebase has unique errors and it is clear which condition yields the error. I found it quite hard to follow what was going on with errors in this PoC which had similar approach.
There was a problem hiding this comment.
I agree with the emphasis on readability here.
awgreene
approved these changes
Nov 10, 2023
|
For some reasons jobs in the merge queue did not get triggered. Probably will have to wait for it to timeout and requeue again. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Spliting #460 into smaller chunks. Related to #437
In this part I extract code related to creating required package variables from
RequiredPackageVariableSourceandOperatorVariableSourceinto a separate function.RequiredPackageVariableSourcegets removed in this PR.OperatorVariableSourcewill be removed later in #501Reviewer Checklist