ACM-5068: Set consolidateManifests=false when orderManifests=true #128
Conversation
This file contains hidden or 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
|
There were some unrelated unit tests failing when I was testing, will check back to see if this is consistent. |
JustinKuli
reviewed
Sep 11, 2023
internal/ordering_test.go
Outdated
| wantErr: "extraDependencies may not be set in policy one manifest[0] because orderManifests is set", | ||
| }, | ||
| "orderManifests and consolidateManifests is false": { | ||
| "orderManifests is true and consolidateManifests is unset": { |
There was a problem hiding this comment.
Nit: can we add a tiny bit more context to these tests?
Suggested change
| "orderManifests is true and consolidateManifests is unset": { | |
| "orderManifests is true in policyDefaults, and consolidateManifests is unset": { |
internal/ordering_test.go
Outdated
| wantFile: "testdata/ordering/three-ordered-manifests.yaml", | ||
| wantErr: "", | ||
| }, | ||
| "orderManifests in policy and consolidateManifests is false": { |
There was a problem hiding this comment.
If we can update this description as well, something like
Suggested change
| "orderManifests in policy and consolidateManifests is false": { | |
| "orderManifests is true in policy and consolidateManifests is unset": { |
Simple checks added on conditionals for both default and actual values to change consolidateManifests=false Signed-off-by: Jeffrey Luo <[email protected]>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: JeffeyL, JustinKuli The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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: (Copied from issue) When using the Policy Generator, when
orderManifestsistrue, it's a signal that the user wants to have dependencies set for the manifests within. However,consolidateManifestsdefaults totrue, soorderManifestswon't really do anything unlessconsolidateManifestsis also set to false. As a convenience, we should setconsolidateManifestsaccordingly so that this implementation detail is abstracted for the user.Solution: Conditionals were added where
consolidateManifestswas being set (both default and actual values) to set tofalsewhen the correspondingorderManifestsvalue istrue.Ref: https://issues.redhat.com/browse/ACM-5068