From 9f33e661a9f78147ac222338b5771bf73f8fd426 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Mon, 31 Jan 2022 09:59:12 +0100 Subject: [PATCH 1/2] crypto/tls: Categorize advanced configuration parameters Signed-off-by: Arve Knudsen --- crypto/tls/tls.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/tls/tls.go b/crypto/tls/tls.go index a6fa46f07..1588edc89 100644 --- a/crypto/tls/tls.go +++ b/crypto/tls/tls.go @@ -13,11 +13,11 @@ import ( // ClientConfig is the config for client TLS. type ClientConfig struct { - CertPath string `yaml:"tls_cert_path"` - KeyPath string `yaml:"tls_key_path"` - CAPath string `yaml:"tls_ca_path"` - ServerName string `yaml:"tls_server_name"` - InsecureSkipVerify bool `yaml:"tls_insecure_skip_verify"` + CertPath string `yaml:"tls_cert_path" category:"advanced"` + KeyPath string `yaml:"tls_key_path" category:"advanced"` + CAPath string `yaml:"tls_ca_path" category:"advanced"` + ServerName string `yaml:"tls_server_name" category:"advanced"` + InsecureSkipVerify bool `yaml:"tls_insecure_skip_verify" category:"advanced"` } var ( From 8fb75196862936f3035201ecf86f31c2eb2b44be Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Mon, 31 Jan 2022 14:53:40 +0100 Subject: [PATCH 2/2] Categorize tls_enabled as advanced Signed-off-by: Arve Knudsen --- grpcclient/grpcclient.go | 2 +- kv/etcd/etcd.go | 2 +- kv/memberlist/tcp_transport.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grpcclient/grpcclient.go b/grpcclient/grpcclient.go index 094337f5d..ba7b74cfd 100644 --- a/grpcclient/grpcclient.go +++ b/grpcclient/grpcclient.go @@ -27,7 +27,7 @@ type Config struct { BackoffOnRatelimits bool `yaml:"backoff_on_ratelimits"` BackoffConfig backoff.Config `yaml:"backoff_config"` - TLSEnabled bool `yaml:"tls_enabled"` + TLSEnabled bool `yaml:"tls_enabled" category:"advanced"` TLS tls.ClientConfig `yaml:",inline"` } diff --git a/kv/etcd/etcd.go b/kv/etcd/etcd.go index 260ac910c..0661fc5da 100644 --- a/kv/etcd/etcd.go +++ b/kv/etcd/etcd.go @@ -24,7 +24,7 @@ type Config struct { Endpoints []string `yaml:"endpoints"` DialTimeout time.Duration `yaml:"dial_timeout" category:"advanced"` MaxRetries int `yaml:"max_retries" category:"advanced"` - EnableTLS bool `yaml:"tls_enabled"` + EnableTLS bool `yaml:"tls_enabled" category:"advanced"` TLS dstls.ClientConfig `yaml:",inline"` UserName string `yaml:"username"` diff --git a/kv/memberlist/tcp_transport.go b/kv/memberlist/tcp_transport.go index 4265a3b22..b367b1358 100644 --- a/kv/memberlist/tcp_transport.go +++ b/kv/memberlist/tcp_transport.go @@ -57,7 +57,7 @@ type TCPTransportConfig struct { MetricsRegisterer prometheus.Registerer `yaml:"-"` MetricsNamespace string `yaml:"-"` - TLSEnabled bool `yaml:"tls_enabled"` + TLSEnabled bool `yaml:"tls_enabled" category:"advanced"` TLS dstls.ClientConfig `yaml:",inline"` }