git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #1168 from oauth2-proxy/metrics-tls-flag-fix

Fix Metrics cfg option naming typo

commitd6de11aa98105f3ebac884dc7f8182e573740eb8 authorNick Meves <nick.meves@greenhouse.io> dateTue 27 Apr 2021, 10:15 (6 years ago) parent7eeaea0544ba2a
2 files changed+3−2
compare with master
unifiedsplit
CHANGELOG.md+1 pkg/apis/options/legacy_options.go+2−2
CHANGELOG.md+1
@@ -11,6 +11,7 @@
1111
1212## Changes since v7.1.2
1313
14+- [#1168](https://github.com/oauth2-proxy/oauth2-proxy/pull/1168) Fix incorrect `cfg` name in Metrics TLS flags (@NickMeves)
1415- [#967](https://github.com/oauth2-proxy/oauth2-proxy/pull/967) Set & verify a nonce with OIDC providers (@NickMeves)
1516- [#1136](https://github.com/oauth2-proxy/oauth2-proxy/pull/1136) Add clock package for better time mocking in tests (@NickMeves)
1617- [#947](https://github.com/oauth2-proxy/oauth2-proxy/pull/947) Multiple provider ingestion and validation in alpha options (first stage: [#926](https://github.com/oauth2-proxy/oauth2-proxy/issues/926)) (@yanasega)
pkg/apis/options/legacy_options.go+2−2
@@ -442,8 +442,8 @@ func getXAuthRequestAccessTokenHeader() Header {
442442type LegacyServer struct {
443443 MetricsAddress string `flag:"metrics-address" cfg:"metrics_address"`
444444 MetricsSecureAddress string `flag:"metrics-secure-address" cfg:"metrics_secure_address"`
445− MetricsTLSCertFile string `flag:"metrics-tls-cert-file" cfg:"tls_cert_file"`
446− MetricsTLSKeyFile string `flag:"metrics-tls-key-file" cfg:"tls_key_file"`
445+ MetricsTLSCertFile string `flag:"metrics-tls-cert-file" cfg:"metrics_tls_cert_file"`
446+ MetricsTLSKeyFile string `flag:"metrics-tls-key-file" cfg:"metrics_tls_key_file"`
447447 HTTPAddress string `flag:"http-address" cfg:"http_address"`
448448 HTTPSAddress string `flag:"https-address" cfg:"https_address"`
449449 TLSCertFile string `flag:"tls-cert-file" cfg:"tls_cert_file"`