Remove CE-only warning from shared tests #26052
Merged
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
github-actions
bot
added
the
hashicorp-contributed-pr
|
Changes incoming: I realise we already have a mechanism for this so will update the PR to use it. |
|
CI Results: |
|
Build Results: |
banks
commented
Mar 20, 2024
| @@ -238,7 +238,7 @@ func parseRaftBackendConfig(conf map[string]string, logger log.Logger) (*RaftBac | |||
| } | |||
|
|
|||
| c.AutopilotRedundancyZone = conf["autopilot_redundancy_zone"] | |||
| if c.AutopilotRedundancyZone == "" { | |||
| if c.AutopilotRedundancyZone != "" { | |||
There was a problem hiding this comment.
An actual bug that not testing warnings missed!
banks
commented
Mar 20, 2024
| @@ -14,5 +14,5 @@ func (b *RaftBackend) entrySizeLimitForPath(path string) uint64 { | |||
| } | |||
|
|
|||
| func emitEntWarning(logger hclog.Logger, field string) { | |||
| logger.Warn("%s is configuration for a Vault Enterprise feature and has been ignored.", field) | |||
| logger.Warn("configuration for a Vault Enterprise feature has been ignored", "field", field) | |||
There was a problem hiding this comment.
Another bug! I used hclog like fmt 🤦
banks
commented
Mar 20, 2024
Comment on lines
+128
to
+129
| }, | ||
|
|
There was a problem hiding this comment.
We didn't have a test case for this before so I added one while I'm here!
miagilepner
reviewed
Mar 20, 2024
physical/raft/config_test.go
Outdated
| @@ -50,6 +58,7 @@ func TestRaft_ParseConfig(t *testing.T) { | |||
| cfg.RaftLogVerifierEnabled = true | |||
| cfg.RaftLogVerificationInterval = defaultRaftLogVerificationInterval | |||
| }, | |||
| wantWarns: ceOnlyWarnings("raft_log_verification_interval is less than the minimum allowed"), | |||
There was a problem hiding this comment.
is this warning not present in enterprise?
There was a problem hiding this comment.
Oh great catch. Will remove this wrapper.
miagilepner
approved these changes
Mar 20, 2024
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.
I added this while developing #25992 as a quick check that the warnings were omitted (and that this test functionality worked) but didn't intend to commit it since it will conflict with Enterprise code.
Perhaps later it would be nice to have a clean way to be able to encode these warnings here but only for CE but that is a bigger change that is a bit gross so want to just get this mergeable in Ent for now while we discuss the cleanest pattern for that.