credentials: pick cloudflare auth mode once and switch on it#80
Merged
Conversation
setCloudflareCredentials called validCFSecret to decide if a secret was acceptable, then re-derived the same token-vs-key choice further down via len(secret.Data[tokenKey]) > 0. Two checks of the same condition, two chances to drift. Replace validCFSecret with cfSecretMode that returns the chosen auth mode (token / key+email / invalid). The caller switches on it and sets the right env vars. Closes a class of "what if the key is present but the bytes are empty" inconsistencies between the two checks. Signed-off-by: Tamal Saha <tamal@appscode.com>
![kodiakhq[bot]](https://avatars.githubusercontent.com/in/29196?s=60&v=4){kind=small}
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
`setCloudflareCredentials` used `validCFSecret` to decide if the secret was acceptable, then re-derived the same token-vs-key/email decision via a separate `len(...) > 0` check. Two checks of the same condition, two chances to drift.
Replace `validCFSecret` with `cfSecretMode` that returns the chosen auth mode (token / key+email / invalid). The caller switches on it and sets the right env vars. Closes the "key present but empty" inconsistency between the old checks.
Test plan