Add ACME client counts to vault operator usage #26525
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
|
CI Results: |
|
Build Results: |
miagilepner
reviewed
Apr 25, 2024
command/operator_usage.go
Outdated
| @@ -245,6 +246,11 @@ func (c *OperatorUsageCommand) parseNamespaceCount(rawVal interface{}) (UsageRes | |||
| // don't error if the secret syncs key is missing | |||
| ret.secretSyncs, _ = jsonNumberOK(counts, "secret_syncs") | |||
|
|
|||
| ret.acmeCount, ok = jsonNumberOK(counts, "acme_clients") | |||
| if !ok { | |||
| return ret, errors.New("missing acme_clients") | |||
There was a problem hiding this comment.
I don't think we should error here - if the vault client version is greater than the vault server version, then acme_clients might be missing from the response
miagilepner
reviewed
Apr 25, 2024
command/operator_usage.go
Outdated
| @@ -321,13 +327,19 @@ func (c *OperatorUsageCommand) totalOutput(data map[string]interface{}) []string | |||
| // don't error if secret syncs key is missing | |||
| secretSyncs, _ := jsonNumberOK(total, "secret_syncs") | |||
|
|
|||
| acmeCount, ok := jsonNumberOK(total, "acme_clients") | |||
| if !ok { | |||
| c.UI.Error("missing acme_clients in total") | |||
There was a problem hiding this comment.
same here, this probably doesn't require an error
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.
https://hashicorp.atlassian.net/browse/VAULT-24578