fix: argocd-dex now merges existing dex.config.oauth2 block instead of overwriting #7583
Conversation
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
…generated block Signed-off-by: Joshua Helton <jdoghelton@gmail.com> Signed-off-by: jphelton <jdoghelton@gmail.com>
wtam2018
reviewed
Oct 31, 2021
| }else { | ||
| dexCfg["oauth2"] = map[string]interface{}{ | ||
| "skipApprovalScreen": true, | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
It looks good. I would slightly simplify it as follow.
if oauth2Cfg, found := dexCfg["oauth2"].(map[string]interface{}); found {
if _, found := oauth2Cfg["skipApprovalScreen"].(bool); !found {
oauth2Cfg["skipApprovalScreen"] = true
}
} else {
dexCfg["oauth2"] = map[string]interface{}{
"skipApprovalScreen": true,
}
}
There was a problem hiding this comment.
Thanks for the advice. I'm new to Go and not used to variable declaration inside of an if-statement.
Signed-off-by: Joshua Helton <jdoghelton@gmail.com>
wtam2018
approved these changes
Nov 1, 2021
alexmt
approved these changes
Nov 1, 2021
Codecov Report
@@ Coverage Diff @@
## master #7583 +/- ##
==========================================
+ Coverage 41.37% 41.39% +0.02%
==========================================
Files 161 161
Lines 21680 21684 +4
==========================================
+ Hits 8970 8976 +6
+ Misses 11444 11443 -1
+ Partials 1266 1265 -1
Continue to review full report at Codecov.
|
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.
Fixes #7275
Signed-off-by: Joshua Helton jdoghelton@gmail.com
Note on DCO:
If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.
Checklist: