Allow Vault variables provider to retry #2376
Closed
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
Signed-off-by: itowlson <ivan.towlson@fermyon.com>
itowlson
force-pushed
the
retry-vault-variables-test
branch
from
2e876f1
to
cc90d8d
Compare
rylev
reviewed
Mar 19, 2024
| @@ -24,12 +25,14 @@ impl VaultProvider { | |||
| token: impl Into<String>, | |||
| mount: impl Into<String>, | |||
| prefix: Option<impl Into<String>>, | |||
| retry_limit: Option<u8>, | |||
There was a problem hiding this comment.
Is there a meaningful semantic difference between None and Some(0)? Seems like we could just pass a u8 no?
| Err(e) => Err(e).context("Failed to check Vault for config"), | ||
|
|
||
| let mut retry_count = 0; | ||
| loop { |
There was a problem hiding this comment.
Might be clear to use a for _ in 0..=self.retry_limit {
| Err(ClientError::APIError { code: 404, .. }) => return Ok(None), | ||
| // Other Vault error so retry, or if at retry limit bail rather than looking elsewhere | ||
| Err(e) => { | ||
| if retry_count >= self.retry_limit { |
There was a problem hiding this comment.
I wonder if we should only retry on 5xx errors as other errors are unlikely to be recoverable.
| @@ -70,6 +70,8 @@ pub struct VaultVariablesProviderOpts { | |||
| pub mount: String, | |||
| #[serde(default)] | |||
| pub prefix: Option<String>, | |||
| #[serde(default)] | |||
| pub retry_limit: Option<u8>, | |||
There was a problem hiding this comment.
#[serde(default)] should allow us to just have this be a u8, no?
It looks like testing-framework supports Docker |
|
This seems to work: |
|
Closing in favour of #2382 |
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.
Maybe it will mitigate that flaky integration test. Please let it mitigate that flaky integration test.