Skip to content

Commit 620eb41

Browse files
committed
test fix
1 parent e4f11c2 commit 620eb41

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

pkg/sdk/model/output/logdna.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (l *LogDNAOutput) ToDirective(secretLoader secret.SecretLoader, id string)
102102
logdna.Params = params
103103
}
104104
if l.Buffer != nil {
105-
if buffer, err := l.Buffer.ToDirective(secretLoader, id); err != nil {
105+
if buffer, err := l.Buffer.ToDirective(secretLoader, pluginID); err != nil {
106106
return nil, err
107107
} else {
108108
logdna.SubDirectives = append(logdna.SubDirectives, buffer)

pkg/sdk/model/output/logdna_test.go

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,41 @@ func TestLogDNAOutput(t *testing.T) {
2727
api_key: xxxxxxxxxxxxxxxxxxxxxxxxxxy
2828
hostname: logging-operator
2929
app: myapp
30-
tags web,dev
31-
request_timeout 30000 ms
32-
ingester_domain https://logs.logdna.com
33-
ingester_endpoint /logs/ingest
30+
tags: web,dev
31+
request_timeout: 30000 ms
32+
ingester_domain: https://logs.logdna.com
33+
ingester_endpoint: /logs/ingest
3434
buffer:
3535
timekey: 1m
3636
timekey_wait: 30s
3737
timekey_use_utc: true
3838
`)
3939
expected := `
4040
<match **>
41-
@type logdna
42-
@id test_logdna
43-
api_key xxxxxxxxxxxxxxxxxxxxxxxxxxy
44-
hostname logging-operator
45-
app myapp
46-
tags web,dev
47-
request_timeout 30000 ms
48-
ingester_domain https://logs.logdna.com
49-
ingester_endpoint /logs/ingest
50-
<buffer tag,time>
51-
@type file
52-
path /buffers/test.*.buffer
53-
retry_forever true
54-
timekey 1m
55-
timekey_use_utc true
56-
timekey_wait 30s
57-
</buffer>
41+
@type logdna
42+
@id test_logdna
43+
api_key xxxxxxxxxxxxxxxxxxxxxxxxxxy
44+
app myapp
45+
hostname logging-operator
46+
ingester_domain https://logs.logdna.com
47+
ingester_endpoint /logs/ingest
48+
request_timeout 30000 ms
49+
tags web,dev
50+
<buffer tag,time>
51+
@type file
52+
path /buffers/test_logdna.*.buffer
53+
retry_forever true
54+
timekey 1m
55+
timekey_use_utc true
56+
timekey_wait 30s
57+
</buffer>
5858
</match>
5959
`
6060
logdna := &output.LogDNAOutput{}
61-
yaml.Unmarshal(CONFIG, logdna)
61+
err := yaml.Unmarshal(CONFIG, logdna)
62+
if err != nil {
63+
t.Fatalf(err.Error())
64+
}
6265
test := render.NewOutputPluginTest(t, logdna)
6366
test.DiffResult(expected)
6467
}

0 commit comments

Comments
 (0)