git.iko.soy/typeable/oauth2-proxy
on master help sign in
fix: added conditional so default is not always set and env vars are honored #3303 (#3304)
3c37312Drew Foehn
CHANGELOG.md+1
compare with master
unifiedsplit
@@ -10,6 +10,7 @@
10
10
11- [#3197](https://github.com/oauth2-proxy/oauth2-proxy/pull/3197) fix: NewRemoteKeySet is not using DefaultHTTPClient (@rsrdesarrollo / @tuunit)
11- [#3197](https://github.com/oauth2-proxy/oauth2-proxy/pull/3197) fix: NewRemoteKeySet is not using DefaultHTTPClient (@rsrdesarrollo / @tuunit)
12- [#3292](https://github.com/oauth2-proxy/oauth2-proxy/pull/3292) chore(deps): upgrade gomod and bump to golang v1.25.5 (@tuunit)
12- [#3292](https://github.com/oauth2-proxy/oauth2-proxy/pull/3292) chore(deps): upgrade gomod and bump to golang v1.25.5 (@tuunit)
13+- [#3304](https://github.com/oauth2-proxy/oauth2-proxy/pull/3304) fix: added conditional so default is not always set and env vars are honored fixes 3303 (@pixeldrew)
13
14
14# V7.13.0
15# V7.13.0
15
16
pkg/apis/options/providers.go+3−1
@@ -416,7 +416,9 @@ func (a *ADFSOptions) EnsureDefaults() {
416
416
417// EnsureDefaults sets any default values for GoogleOptions fields.
417// EnsureDefaults sets any default values for GoogleOptions fields.
418func (g *GoogleOptions) EnsureDefaults() {
418func (g *GoogleOptions) EnsureDefaults() {
419+ if g.UseOrganizationID == nil {
419− g.UseOrganizationID = ptr.To(DefaultGoogleUseOrganizationID)
420+ g.UseOrganizationID = ptr.To(DefaultGoogleUseOrganizationID)
421+ }
420
422
421 if g.UseApplicationDefaultCredentials == nil {
423 if g.UseApplicationDefaultCredentials == nil {
422 g.UseApplicationDefaultCredentials = ptr.To(DefaultUseApplicationDefaultCredentials)
424 g.UseApplicationDefaultCredentials = ptr.To(DefaultUseApplicationDefaultCredentials)