priority of decrypt: kms > arn > use dd_api_key #478
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
|
Great catch |
duncanista
reviewed
Nov 25, 2024
duncanista
reviewed
Nov 25, 2024
duncanista
reviewed
Nov 25, 2024
bottlecap/src/secrets/decrypt.rs
Outdated
| @@ -43,7 +40,7 @@ pub async fn resolve_secrets(config: Arc<Config>, aws_config: &AwsConfig) -> Opt | |||
| } | |||
| } | |||
| } else { | |||
| return None; | |||
| Some(config.api_key.clone()) | |||
There was a problem hiding this comment.
Will this resolve to None since the API key wouldn't be set either?
There was a problem hiding this comment.
Not sure what you mean.
Why shouldn't it be set? And how would it resolve to None?
I moved the cleanup code inside, so maybe it's less confusing
There was a problem hiding this comment.
If it's empty, we should send None
alexgallotta
force-pushed
the
kms-priority
branch
from
1cc631e
to
0370d64
Compare
duncanista
approved these changes
Nov 25, 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.
Current logic was ignoring kms/secret arn when dd_api was set, but from the docs and goagent behavior it should be the other way around
https://docs.datadoghq.com/serverless/libraries_integrations/cli/
Also remove the 32 char hex validation