From 9bca40c8781e79fb80837a9b256c2ec1c76fae98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Millet?= Date: Fri, 26 Apr 2024 11:59:09 +0200 Subject: [PATCH] Fix configuration test and remove unused expiration field --- README.md | 1 - config.yaml | 1 - config/config_test.go | 10 ++++++++++ config/configtest/sample_full_config.yaml | 1 - 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 27872a09..eea1accb 100644 --- a/README.md +++ b/README.md @@ -264,7 +264,6 @@ Prebid Cache makes use of a Redis Go client compatible with Redis Sentinel. Full | master_name | string | Name of the Sentinel master (as declared in the `sentinel monitor` line of your Sentinel configurations) | | password | string | Redis password | | db | integer | Database to be selected after connecting to the server | -| expiration | integer | Availability in the Redis system in Minutes | | tls | field | Subfields:
`enabled`: whether or not pass the InsecureSkipVerify value to the Redis client's TLS config
`insecure_skip_verify`: In Redis, InsecureSkipVerify controls whether a client verifies the server's certificate chain and host name. If InsecureSkipVerify is true, crypto/t | diff --git a/config.yaml b/config.yaml index 635a87cd..93a815b9 100644 --- a/config.yaml +++ b/config.yaml @@ -37,7 +37,6 @@ backend: # master_name: "mymaster" # password: "" # db: 1 -# expiration: 10 # in Minutes # tls: # enabled: false # insecure_skip_verify: false diff --git a/config/config_test.go b/config/config_test.go index 8ab6da94..a6957c10 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1277,6 +1277,16 @@ func getExpectedFullConfigForTestFile() Configuration { InsecureSkipVerify: false, }, }, + RedisSentinel: RedisSentinel{ + SentinelAddrs: []string{"127.0.0.1:26379", "127.0.0.1:26380", "127.0.0.1:26381"}, + MasterName: "mymaster", + Password: "", + Db: 1, + TLS: RedisTLS{ + Enabled: false, + InsecureSkipVerify: false, + }, + }, Ignite: Ignite{ Scheme: "http", Host: "127.0.0.1", diff --git a/config/configtest/sample_full_config.yaml b/config/configtest/sample_full_config.yaml index c51726f8..3fe41b87 100644 --- a/config/configtest/sample_full_config.yaml +++ b/config/configtest/sample_full_config.yaml @@ -42,7 +42,6 @@ backend: master_name: "mymaster" password: "" db: 1 - expiration: 10 # in Minutes tls: enabled: false insecure_skip_verify: false