Skip to content

Commit d3da664

Browse files
pmalekpmalek
authored
ci: add testifylint to golangci-lint config (#1550)
1 parent 1f1cfe4 commit d3da664

9 files changed

+114
-107
lines changed

‎.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ linters:
3232
- staticcheck
3333
- stylecheck
3434
- unconvert
35+
- testifylint
3536
- unparam
3637
- unused
3738
- wastedassign

‎convert/convert_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/kong/go-database-reconciler/pkg/utils"
99
"github.com/kong/go-kong/kong"
1010
"github.com/stretchr/testify/assert"
11+
"github.com/stretchr/testify/require"
1112
)
1213

1314
func TestParseFormat(t *testing.T) {
@@ -561,7 +562,7 @@ func Test_convertAutoFields(t *testing.T) {
561562
}
562563

563564
got, err := convertKongGateway2xTo3x(content, "-")
564-
assert.NoError(t, err)
565+
require.NoError(t, err)
565566

566567
globalPluginConfig := got.Plugins[0].Config
567568
assert.NotEmpty(t, globalPluginConfig["namespace"])

‎tests/integration/diff_test.go

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/kong/go-database-reconciler/pkg/utils"
1010
"github.com/stretchr/testify/assert"
11+
"github.com/stretchr/testify/require"
1112
)
1213

1314
var (
@@ -484,7 +485,7 @@ func Test_Diff_Workspace_OlderThan3x(t *testing.T) {
484485
setup(t)
485486

486487
_, err := diff(tc.stateFile)
487-
assert.NoError(t, err)
488+
require.NoError(t, err)
488489
})
489490
}
490491
}
@@ -508,7 +509,7 @@ func Test_Diff_Workspace_NewerThan3x(t *testing.T) {
508509
setup(t)
509510

510511
_, err := diff(tc.stateFile)
511-
assert.NoError(t, err)
512+
require.NoError(t, err)
512513
})
513514
}
514515
}
@@ -539,10 +540,10 @@ func Test_Diff_Masked_OlderThan3x(t *testing.T) {
539540
setup(t)
540541

541542
// initialize state
542-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
543+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
543544

544545
out, err := diff(tc.stateFile)
545-
assert.NoError(t, err)
546+
require.NoError(t, err)
546547
assert.Equal(t, expectedOutputMasked, out)
547548
})
548549
}
@@ -556,11 +557,11 @@ func Test_Diff_Masked_OlderThan3x(t *testing.T) {
556557
setup(t)
557558

558559
// initialize state
559-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
560+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
560561

561562
out, err := diff(tc.stateFile, "--json-output")
562-
assert.NoError(t, err)
563-
assert.Equal(t, expectedOutputMaskedJSON, out)
563+
require.NoError(t, err)
564+
assert.JSONEq(t, expectedOutputMaskedJSON, out)
564565
})
565566
}
566567
}
@@ -591,10 +592,10 @@ func Test_Diff_Masked_NewerThan3x(t *testing.T) {
591592
setup(t)
592593

593594
// initialize state
594-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
595+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
595596

596597
out, err := diff(tc.stateFile)
597-
assert.NoError(t, err)
598+
require.NoError(t, err)
598599
assert.Equal(t, expectedOutputMasked, out)
599600
})
600601
}
@@ -607,11 +608,11 @@ func Test_Diff_Masked_NewerThan3x(t *testing.T) {
607608
setup(t)
608609

609610
// initialize state
610-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
611+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
611612

612613
out, err := diff(tc.stateFile, "--json-output")
613-
assert.NoError(t, err)
614-
assert.Equal(t, expectedOutputMaskedJSON30x, out)
614+
require.NoError(t, err)
615+
assert.JSONEq(t, expectedOutputMaskedJSON30x, out)
615616
})
616617
}
617618
for _, tc := range tests {
@@ -623,11 +624,11 @@ func Test_Diff_Masked_NewerThan3x(t *testing.T) {
623624
setup(t)
624625

625626
// initialize state
626-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
627+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
627628

628629
out, err := diff(tc.stateFile, "--json-output")
629-
assert.NoError(t, err)
630-
assert.Equal(t, expectedOutputMaskedJSON, out)
630+
require.NoError(t, err)
631+
assert.JSONEq(t, expectedOutputMaskedJSON, out)
631632
})
632633
}
633634
}
@@ -658,10 +659,10 @@ func Test_Diff_Unmasked_OlderThan3x(t *testing.T) {
658659
setup(t)
659660

660661
// initialize state
661-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
662+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
662663

663664
out, err := diff(tc.stateFile, "--no-mask-deck-env-vars-value")
664-
assert.NoError(t, err)
665+
require.NoError(t, err)
665666
assert.Equal(t, expectedOutputUnMasked, out)
666667
})
667668
}
@@ -674,11 +675,11 @@ func Test_Diff_Unmasked_OlderThan3x(t *testing.T) {
674675
setup(t)
675676

676677
// initialize state
677-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
678+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
678679

679680
out, err := diff(tc.stateFile, "--no-mask-deck-env-vars-value", "--json-output")
680-
assert.NoError(t, err)
681-
assert.Equal(t, expectedOutputUnMaskedJSON, out)
681+
require.NoError(t, err)
682+
assert.JSONEq(t, expectedOutputUnMaskedJSON, out)
682683
})
683684
}
684685
}
@@ -709,10 +710,10 @@ func Test_Diff_Unmasked_NewerThan3x(t *testing.T) {
709710
setup(t)
710711

711712
// initialize state
712-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
713+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
713714

714715
out, err := diff(tc.stateFile, "--no-mask-deck-env-vars-value")
715-
assert.NoError(t, err)
716+
require.NoError(t, err)
716717
assert.Equal(t, expectedOutputUnMasked, out)
717718
})
718719
}
@@ -725,11 +726,11 @@ func Test_Diff_Unmasked_NewerThan3x(t *testing.T) {
725726
setup(t)
726727

727728
// initialize state
728-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
729+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
729730

730731
out, err := diff(tc.stateFile, "--no-mask-deck-env-vars-value", "--json-output")
731-
assert.NoError(t, err)
732-
assert.Equal(t, expectedOutputUnMaskedJSON30x, out)
732+
require.NoError(t, err)
733+
assert.JSONEq(t, expectedOutputUnMaskedJSON30x, out)
733734
})
734735
}
735736
for _, tc := range tests {
@@ -741,11 +742,11 @@ func Test_Diff_Unmasked_NewerThan3x(t *testing.T) {
741742
setup(t)
742743

743744
// initialize state
744-
assert.NoError(t, sync(context.Background(), tc.initialStateFile))
745+
require.NoError(t, sync(context.Background(), tc.initialStateFile))
745746

746747
out, err := diff(tc.stateFile, "--no-mask-deck-env-vars-value", "--json-output")
747-
assert.NoError(t, err)
748-
assert.Equal(t, expectedOutputUnMaskedJSON, out)
748+
require.NoError(t, err)
749+
assert.JSONEq(t, expectedOutputUnMaskedJSON, out)
749750
})
750751
}
751752
}
@@ -776,10 +777,10 @@ func Test_Diff_NoDiffUnorderedArray(t *testing.T) {
776777

777778
// test that the diff command does not return any changes when
778779
// array fields are not sorted.
779-
assert.NoError(t, sync(context.Background(), tc.stateFile, "--timeout", "60"))
780+
require.NoError(t, sync(context.Background(), tc.stateFile, "--timeout", "60"))
780781

781782
out, err := diff(tc.stateFile)
782-
assert.NoError(t, err)
783+
require.NoError(t, err)
783784
assert.Equal(t, emptyOutput, out)
784785
reset(t)
785786
})
@@ -795,10 +796,10 @@ func Test_Diff_NoDiffCompressedTarget(t *testing.T) {
795796
// test that the diff command does not return any changes when
796797
// target is a compressed IPv6.
797798
stateFile := "testdata/diff/005-no-diff-target/kong.yaml"
798-
assert.NoError(t, sync(context.Background(), stateFile))
799+
require.NoError(t, sync(context.Background(), stateFile))
799800

800801
out, err := diff(stateFile)
801-
assert.NoError(t, err)
802+
require.NoError(t, err)
802803
assert.Equal(t, emptyOutput, out)
803804
reset(t)
804805
}

‎tests/integration/dump_test.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ func Test_Dump_SelectTags_30(t *testing.T) {
2727
runWhen(t, "kong", ">=3.0.0 <3.1.0")
2828
setup(t)
2929

30-
assert.NoError(t, sync(context.Background(), tc.stateFile))
30+
require.NoError(t, sync(context.Background(), tc.stateFile))
3131

3232
output, err := dump(
3333
"--select-tag", "managed-by-deck",
3434
"--select-tag", "org-unit-42",
3535
"-o", "-",
3636
)
37-
assert.NoError(t, err)
37+
require.NoError(t, err)
3838

3939
expected, err := readFile(tc.expectedFile)
40-
assert.NoError(t, err)
41-
assert.Equal(t, output, expected)
40+
require.NoError(t, err)
41+
assert.Equal(t, expected, output)
4242
})
4343
}
4444
}
@@ -74,18 +74,18 @@ func Test_Dump_SelectTags_3x(t *testing.T) {
7474
runWhen(t, "kong", tc.runWhen)
7575
setup(t)
7676

77-
assert.NoError(t, sync(context.Background(), tc.stateFile))
77+
require.NoError(t, sync(context.Background(), tc.stateFile))
7878

7979
output, err := dump(
8080
"--select-tag", "managed-by-deck",
8181
"--select-tag", "org-unit-42",
8282
"-o", "-",
8383
)
84-
assert.NoError(t, err)
84+
require.NoError(t, err)
8585

8686
expected, err := readFile(tc.expectedFile)
87-
assert.NoError(t, err)
88-
assert.Equal(t, output, expected)
87+
require.NoError(t, err)
88+
assert.Equal(t, expected, output)
8989
})
9090
}
9191
}
@@ -160,7 +160,7 @@ func Test_Dump_SkipConsumers(t *testing.T) {
160160
tc.runWhen(t)
161161
setup(t)
162162

163-
assert.NoError(t, sync(context.Background(), tc.stateFile))
163+
require.NoError(t, sync(context.Background(), tc.stateFile))
164164

165165
var (
166166
output string
@@ -176,10 +176,10 @@ func Test_Dump_SkipConsumers(t *testing.T) {
176176
"-o", "-",
177177
)
178178
}
179-
assert.NoError(t, err)
179+
require.NoError(t, err)
180180

181181
expected, err := readFile(tc.expectedFile)
182-
assert.NoError(t, err)
182+
require.NoError(t, err)
183183
assert.Equal(t, expected, output)
184184
})
185185
}
@@ -210,7 +210,7 @@ func Test_Dump_SkipConsumers_Konnect(t *testing.T) {
210210
runWhenKonnect(t)
211211
setup(t)
212212

213-
assert.NoError(t, sync(context.Background(), tc.stateFile))
213+
require.NoError(t, sync(context.Background(), tc.stateFile))
214214

215215
var (
216216
output string
@@ -226,10 +226,10 @@ func Test_Dump_SkipConsumers_Konnect(t *testing.T) {
226226
"-o", "-",
227227
)
228228
}
229-
assert.NoError(t, err)
229+
require.NoError(t, err)
230230

231231
expected, err := readFile(tc.expectedFile)
232-
assert.NoError(t, err)
232+
require.NoError(t, err)
233233
assert.Equal(t, expected, output)
234234
})
235235
}
@@ -263,7 +263,7 @@ func Test_Dump_KonnectRename(t *testing.T) {
263263
runWhenKonnect(t)
264264
setup(t)
265265

266-
assert.NoError(t, sync(context.Background(), tc.stateFile))
266+
require.NoError(t, sync(context.Background(), tc.stateFile))
267267

268268
var (
269269
output string
@@ -273,10 +273,10 @@ func Test_Dump_KonnectRename(t *testing.T) {
273273
flags = append(flags, tc.flags...)
274274
output, err = dump(flags...)
275275

276-
assert.NoError(t, err)
276+
require.NoError(t, err)
277277

278278
expected, err := readFile(tc.expectedFile)
279-
assert.NoError(t, err)
279+
require.NoError(t, err)
280280
assert.Equal(t, expected, output)
281281
})
282282
}
@@ -291,10 +291,10 @@ func Test_Dump_ConsumerGroupConsumersWithCustomID(t *testing.T) {
291291
var output string
292292
flags := []string{"-o", "-", "--with-id"}
293293
output, err := dump(flags...)
294-
assert.NoError(t, err)
294+
require.NoError(t, err)
295295

296296
expected, err := readFile("testdata/sync/028-consumer-group-consumers-custom_id/kong.yaml")
297-
assert.NoError(t, err)
297+
require.NoError(t, err)
298298
assert.Equal(t, expected, output)
299299
}
300300

@@ -307,10 +307,10 @@ func Test_Dump_ConsumerGroupConsumersWithCustomID_Konnect(t *testing.T) {
307307
var output string
308308
flags := []string{"-o", "-", "--with-id"}
309309
output, err := dump(flags...)
310-
assert.NoError(t, err)
310+
require.NoError(t, err)
311311

312312
expected, err := readFile("testdata/dump/003-consumer-group-consumers-custom_id/konnect.yaml")
313-
assert.NoError(t, err)
313+
require.NoError(t, err)
314314
assert.Equal(t, expected, output)
315315
}
316316

@@ -343,10 +343,10 @@ func Test_Dump_FilterChains(t *testing.T) {
343343
var output string
344344
flags := []string{"-o", "-"}
345345
output, err := dump(flags...)
346-
assert.NoError(t, err)
346+
require.NoError(t, err)
347347

348348
expected, err := readFile(tc.expected)
349-
assert.NoError(t, err)
349+
require.NoError(t, err)
350350
assert.Equal(t, expected, output)
351351
})
352352
}
@@ -426,7 +426,7 @@ func Test_SkipConsumersWithConsumerGroups(t *testing.T) {
426426
tc.runWhen(t)
427427
setup(t)
428428

429-
assert.NoError(t, sync(context.Background(), tc.stateFile))
429+
require.NoError(t, sync(context.Background(), tc.stateFile))
430430

431431
var (
432432
output string
@@ -448,10 +448,10 @@ func Test_SkipConsumersWithConsumerGroups(t *testing.T) {
448448
return
449449
}
450450

451-
assert.NoError(t, err)
451+
require.NoError(t, err)
452452

453453
expected, err := readFile(tc.expectedFile)
454-
assert.NoError(t, err)
454+
require.NoError(t, err)
455455
assert.Equal(t, expected, output)
456456
})
457457
}

0 commit comments

Comments
 (0)