From 77f411b2ec5acf53c85883f3d63e178dd00743c7 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Wed, 20 Oct 2021 23:10:18 +0200 Subject: [PATCH] Enable tls_config in oauth2 (#9550) * Enable tls_config in oauth2 Signed-off-by: Julien Pivotto --- config/config_test.go | 4 ++++ config/testdata/conf.good.yml | 3 +++ docs/configuration/configuration.md | 4 ++++ go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/config/config_test.go b/config/config_test.go index a6c30b3e5e..a2efaa6768 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -103,6 +103,10 @@ var expectedConf = &Config{ ClientID: "123", ClientSecret: "456", TokenURL: "http://remote1/auth", + TLSConfig: config.TLSConfig{ + CertFile: filepath.FromSlash("testdata/valid_cert_file"), + KeyFile: filepath.FromSlash("testdata/valid_key_file"), + }, }, FollowRedirects: true, }, diff --git a/config/testdata/conf.good.yml b/config/testdata/conf.good.yml index cdd0c0b306..bfe0228be9 100644 --- a/config/testdata/conf.good.yml +++ b/config/testdata/conf.good.yml @@ -23,6 +23,9 @@ remote_write: client_id: "123" client_secret: "456" token_url: "http://remote1/auth" + tls_config: + cert_file: valid_cert_file + key_file: valid_key_file - url: http://remote2/push name: rw_tls diff --git a/docs/configuration/configuration.md b/docs/configuration/configuration.md index 291b9fe035..e3d1f76b81 100644 --- a/docs/configuration/configuration.md +++ b/docs/configuration/configuration.md @@ -383,6 +383,10 @@ token_url: # Optional parameters to append to the token URL. endpoint_params: [ : ... ] + +# Configures the token request's TLS settings. +tls_config: + [ ] ``` ### `` diff --git a/go.mod b/go.mod index 82de9c1fe1..5daa9bfd91 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/prometheus/alertmanager v0.23.0 github.com/prometheus/client_golang v1.11.0 github.com/prometheus/client_model v0.2.0 - github.com/prometheus/common v0.31.1 + github.com/prometheus/common v0.32.1 github.com/prometheus/common/sigv4 v0.1.0 github.com/prometheus/exporter-toolkit v0.7.0 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44 diff --git a/go.sum b/go.sum index 4fda1999c0..3f544a07f6 100644 --- a/go.sum +++ b/go.sum @@ -1143,8 +1143,8 @@ github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB8 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.31.1 h1:d18hG4PkHnNAKNMOmFuXFaiY8Us0nird/2m60uS1AMs= -github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=