Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add bool support for convertTemplate func #216

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/sinks/tmpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"
"text/template"

"github.com/resmoio/kubernetes-event-exporter/pkg/kube"
"github.com/Masterminds/sprig/v3"
"github.com/resmoio/kubernetes-event-exporter/pkg/kube"
)

func GetString(event *kube.EnhancedEvent, text string) (string, error) {
Expand Down Expand Up @@ -40,6 +40,8 @@ func convertLayoutTemplate(layout map[string]interface{}, ev *kube.EnhancedEvent

func convertTemplate(value interface{}, ev *kube.EnhancedEvent) (interface{}, error) {
switch v := value.(type) {
case bool:
return v, nil
case string:
rendered, err := GetString(ev, v)
if err != nil {
Expand Down
77 changes: 75 additions & 2 deletions pkg/sinks/tmpl_test.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package sinks

import (
"testing"
"time"

"github.com/resmoio/kubernetes-event-exporter/pkg/kube"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"testing"
"time"
)

func TestLayoutConvert(t *testing.T) {
Expand Down Expand Up @@ -50,3 +53,73 @@ func TestLayoutConvert(t *testing.T) {

require.Equal(t, val2, ev.Message)
}

func Test_convertTemplate(t *testing.T) {
event := &kube.EnhancedEvent{
Event: corev1.Event{Message: "foovar"},
}

tests := []struct {
name string
value interface{}
ev *kube.EnhancedEvent
expected interface{}
}{
{
name: "nil",
value: nil,
ev: event,
expected: nil,
},
{
name: "bool",
value: true,
ev: event,
expected: true,
},
{
name: "string",
value: "{{ .Message }}",
ev: event,
expected: "foovar",
},
{
name: "map with interface{} keys",
value: map[interface{}]interface{}{
"message": "{{ .Message }}",
},
ev: event,
expected: map[string]interface{}{
"message": "foovar",
},
},
{
name: "map",
value: map[string]interface{}{
"message": "{{ .Message }}",
},
ev: event,
expected: map[string]interface{}{
"message": "foovar",
},
},
{
name: "slice",
value: []interface{}{
"{{ .Message }}",
},
ev: event,
expected: []interface{}{
"foovar",
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actual, err := convertTemplate(tt.value, tt.ev)
require.NoError(t, err)

assert.Equal(t, tt.expected, actual)
})
}
}