-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
This PR adds support for redis URL schema when configuring the hosts. Each url can have it's own password, overwriting the outputs password setting. The URL scheme used can enable or disable TLS support as well. Using `redis` we always disable TLS, but when using `rediss` TLS will be enabled. (cherry picked from commit 0d31ea2) Co-authored-by: Rodrigo Villablanca Vásquez <villa061004@gmail.com>
- Loading branch information
1 parent
7adb858
commit bb95fa9
Showing
4 changed files
with
213 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package redis | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "github.com/elastic/beats/libbeat/beat" | ||
| "github.com/elastic/beats/libbeat/common" | ||
| "github.com/elastic/beats/libbeat/outputs" | ||
| _ "github.com/elastic/beats/libbeat/outputs/codec/json" | ||
| ) | ||
|
|
||
| type checker func(*testing.T, outputs.Group) | ||
|
|
||
| func checks(cs ...checker) checker { | ||
| return func(t *testing.T, g outputs.Group) { | ||
| for _, c := range cs { | ||
| c(t, g) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func clientsLen(required int) checker { | ||
| return func(t *testing.T, group outputs.Group) { | ||
| assert.Len(t, group.Clients, required) | ||
| } | ||
| } | ||
|
|
||
| func clientPassword(index int, pass string) checker { | ||
| return func(t *testing.T, group outputs.Group) { | ||
| redisClient := group.Clients[index].(*backoffClient) | ||
| assert.Equal(t, redisClient.client.password, pass) | ||
| } | ||
| } | ||
|
|
||
| func TestMakeRedis(t *testing.T) { | ||
| tests := map[string]struct { | ||
| config map[string]interface{} | ||
| valid bool | ||
| checks checker | ||
| }{ | ||
| "no host": { | ||
| config: map[string]interface{}{ | ||
| "hosts": []string{}, | ||
| }, | ||
| }, | ||
| "invald scheme": { | ||
| config: map[string]interface{}{ | ||
| "hosts": []string{"redisss://localhost:6379"}, | ||
| }, | ||
| }, | ||
| "Single host": { | ||
| config: map[string]interface{}{ | ||
| "hosts": []string{"localhost:6379"}, | ||
| }, | ||
| valid: true, | ||
| checks: checks(clientsLen(1), clientPassword(0, "")), | ||
| }, | ||
| "Multiple hosts": { | ||
| config: map[string]interface{}{ | ||
| "hosts": []string{"redis://localhost:6379", "rediss://localhost:6380"}, | ||
| }, | ||
| valid: true, | ||
| checks: clientsLen(2), | ||
| }, | ||
| "Default password": { | ||
| config: map[string]interface{}{ | ||
| "hosts": []string{"redis://localhost:6379"}, | ||
| "password": "defaultPassword", | ||
| }, | ||
| valid: true, | ||
| checks: checks(clientsLen(1), clientPassword(0, "defaultPassword")), | ||
| }, | ||
| "Specific and default password": { | ||
| config: map[string]interface{}{ | ||
| "hosts": []string{"redis://localhost:6379", "rediss://:mypassword@localhost:6380"}, | ||
| "password": "defaultPassword", | ||
| }, | ||
| valid: true, | ||
| checks: checks( | ||
| clientsLen(2), | ||
| clientPassword(0, "defaultPassword"), | ||
| clientPassword(1, "mypassword"), | ||
| ), | ||
| }, | ||
| } | ||
| beatInfo := beat.Info{Beat: "libbeat", Version: "1.2.3"} | ||
| for name, test := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| cfg, err := common.NewConfigFrom(test.config) | ||
| assert.NoError(t, err) | ||
| groups, err := makeRedis(nil, beatInfo, outputs.NewNilObserver(), cfg) | ||
| assert.Equal(t, err == nil, test.valid) | ||
| if err != nil && test.valid { | ||
| t.Log(err) | ||
| } | ||
| if test.checks != nil { | ||
| test.checks(t, groups) | ||
| } | ||
| }) | ||
| } | ||
| } |