[v1.14] Only enable groups params if secrets are present (google oidc) #1233
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
pkg/render/dex_config.go
Outdated
| @@ -458,7 +458,7 @@ func (d *dexConfig) Connector() map[string]interface{} { | |||
| } | |||
|
|
|||
| //Google specific. | |||
| if d.idpSecret.Data[serviceAccountSecretField] != nil || d.idpSecret.Data[adminEmailSecretField] == nil { | |||
| if d.idpSecret.Data[serviceAccountSecretField] != nil && d.idpSecret.Data[adminEmailSecretField] != nil { | |||
| config["serviceAccountFilePath"] = serviceAccountSecretLocation | |||
There was a problem hiding this comment.
Minor: Any reason "serviceAccountFilePath" is hard-coded string instead of a constant like the other values?
The string is only used once, so there's that. But, it still feels more consistent to have it defined in a const like the others.
rene-dekker
force-pushed
the
saas-1352-v1.14
branch
from
ada7784
to
1f1762b
Compare
tmjd
reviewed
Mar 19, 2021
tmjd
added
docs-not-required
enterprise
tmjd
pushed a commit
that referenced
this pull request
Mar 19, 2021
…are present (google (#1236) * Only enable groups params if secrets are present (google oidc) * PR suggestion * Add google sa + path test
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.
Cannot be picked.
Only enable groups params if secrets are present (google oidc)