874c147 · typeable/oauth2-proxy

git.iko.soy/typeable/oauth2-proxy

Fix tls-key-file and tls-cert-file consistency

commit874c147e04210662f80c533fe09e22cea47498ad authorJoel Speed <Joel.speed@hotmail.co.uk> dateFri 21 Jun 2019, 15:44 (7 years ago) parentbdcdfb7

2 files changed+8−3

unifiedsplit

CHANGELOG.md+6−1

@@ -5,9 +5,14 @@

55- [#186](https://github.com/pusher/oauth2_proxy/pull/186) Make config consistent

66 - This PR changes configuration options so that all flags have a config counterpart

77 of the same name but with underscores (`_`) in place of hyphens (`-`).

8+ This change affects the following flags:

9+ - The `--tls-key` flag is now `--tls-key-file` to be consistent with existing

10+ file flags and the existing config and environment settings

11+ - The `--tls-cert` flag is now `--tls-cert-file` to be consistent with existing

12+ file flags and the existing config and environment settings

813 This change affects the following existing configuration options:

914 - The `proxy-prefix` option is now `proxy_prefix`.

10− - This PR changes environment variables so that all flags have an environment

15+ This PR changes environment variables so that all flags have an environment

1116 counterpart of the same name but capitalised, with underscores (`_`) in place

1217 of hyphens (`-`) and with the prefix `OAUTH2_PROXY_`.

1318 This change affects the following existing environment variables:

options.go+2−2

@@ -36,8 +36,8 @@ type Options struct {

3636 RedirectURL string `flag:"redirect-url" cfg:"redirect_url" env:"OAUTH2_PROXY_REDIRECT_URL"`

3737 ClientID string `flag:"client-id" cfg:"client_id" env:"OAUTH2_PROXY_CLIENT_ID"`

3838 ClientSecret string `flag:"client-secret" cfg:"client_secret" env:"OAUTH2_PROXY_CLIENT_SECRET"`

39− TLSCertFile string `flag:"tls-cert" cfg:"tls_cert_file" env:"OAUTH2_PROXY_TLS_CERT_FILE"`

40− TLSKeyFile string `flag:"tls-key" cfg:"tls_key_file" env:"OAUTH2_PROXY_TLS_KEY_FILE"`

39+ TLSCertFile string `flag:"tls-cert-file" cfg:"tls_cert_file" env:"OAUTH2_PROXY_TLS_CERT_FILE"`

40+ TLSKeyFile string `flag:"tls-key-file" cfg:"tls_key_file" env:"OAUTH2_PROXY_TLS_KEY_FILE"`

4141

4242 AuthenticatedEmailsFile string `flag:"authenticated-emails-file" cfg:"authenticated_emails_file" env:"OAUTH2_PROXY_AUTHENTICATED_EMAILS_FILE"`

4343 AzureTenant string `flag:"azure-tenant" cfg:"azure_tenant" env:"OAUTH2_PROXY_AZURE_TENANT"`