Skip to content

Commit 6e347dc

Browse files
zirainarkodg
zirain
authored and
arkodg
committed
chore: improve merge test (envoyproxy#5861)
Signed-off-by: Arko Dasgupta <[email protected]>
1 parent ed4d4cc commit 6e347dc

18 files changed

+155
-173
lines changed

‎internal/cmd/egctl/config_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
kube "github.com/envoyproxy/gateway/internal/kubernetes"
3030
"github.com/envoyproxy/gateway/internal/utils/file"
3131
netutil "github.com/envoyproxy/gateway/internal/utils/net"
32+
"github.com/envoyproxy/gateway/internal/utils/test"
3233
)
3334

3435
const (
@@ -118,7 +119,7 @@ func TestExtractAllConfigDump(t *testing.T) {
118119
aggregated := sampleAggregatedConfigDump(configDump)
119120
got, err := marshalEnvoyProxyConfig(aggregated, tc.output)
120121
require.NoError(t, err)
121-
if *overrideTestData {
122+
if test.OverrideTestData() {
122123
require.NoError(t, file.Write(string(got), filepath.Join("testdata", "config", "out", tc.expected)))
123124
}
124125
out, err := readOutputConfig(tc.expected)
@@ -206,7 +207,7 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
206207
aggregated := sampleAggregatedConfigDump(configDump)
207208
got, err := marshalEnvoyProxyConfig(aggregated, tc.output)
208209
require.NoError(t, err)
209-
if *overrideTestData {
210+
if test.OverrideTestData() {
210211
require.NoError(t, file.Write(string(got), filepath.Join("testdata", "config", "out", tc.expected)))
211212
}
212213
out, err := readOutputConfig(tc.expected)

‎internal/cmd/egctl/translate_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ import (
2525
"github.com/envoyproxy/gateway/internal/gatewayapi/resource"
2626
"github.com/envoyproxy/gateway/internal/utils/field"
2727
"github.com/envoyproxy/gateway/internal/utils/file"
28+
"github.com/envoyproxy/gateway/internal/utils/test"
2829
)
2930

30-
var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")
31-
3231
func TestTranslate(t *testing.T) {
3332
testCases := []struct {
3433
name string
@@ -363,7 +362,7 @@ func TestTranslate(t *testing.T) {
363362
out, err = yaml.Marshal(got)
364363
require.NoError(t, err)
365364
}
366-
if *overrideTestData {
365+
if test.OverrideTestData() {
367366
require.NoError(t, file.Write(string(out), filepath.Join("testdata", "translate", "out", fn)))
368367
}
369368
want := &TranslationResult{}

‎internal/gatewayapi/resource/load_test.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package resource
77

88
import (
9-
"flag"
109
"fmt"
1110
"os"
1211
"path/filepath"
@@ -18,10 +17,9 @@ import (
1817
"sigs.k8s.io/yaml"
1918

2019
"github.com/envoyproxy/gateway/internal/utils/file"
20+
"github.com/envoyproxy/gateway/internal/utils/test"
2121
)
2222

23-
var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")
24-
2523
func TestIterYAMLBytes(t *testing.T) {
2624
inputs := `test: foo1
2725
---
@@ -53,7 +51,7 @@ func TestLoadAllSupportedResourcesFromYAMLBytes(t *testing.T) {
5351
got, err := LoadResourcesFromYAMLBytes(inFile, true)
5452
require.NoError(t, err)
5553

56-
if *overrideTestData {
54+
if test.OverrideTestData() {
5755
out, err := yaml.Marshal(got)
5856
require.NoError(t, err)
5957
require.NoError(t, file.Write(string(out), filepath.Join("testdata", "all-resources.out.yaml")))

‎internal/gatewayapi/translator_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"context"
1111
"crypto/sha256"
1212
"encoding/hex"
13-
"flag"
1413
"fmt"
1514
"os"
1615
"path/filepath"
@@ -38,11 +37,10 @@ import (
3837
"github.com/envoyproxy/gateway/internal/ir"
3938
"github.com/envoyproxy/gateway/internal/utils/field"
4039
"github.com/envoyproxy/gateway/internal/utils/file"
40+
"github.com/envoyproxy/gateway/internal/utils/test"
4141
"github.com/envoyproxy/gateway/internal/wasm"
4242
)
4343

44-
var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")
45-
4644
func mustUnmarshal(t *testing.T, val []byte, out interface{}) {
4745
require.NoError(t, yaml.UnmarshalStrict(val, out, yaml.DisallowUnknownFields))
4846
}
@@ -326,7 +324,7 @@ func TestTranslate(t *testing.T) {
326324
out, err := yaml.Marshal(got)
327325
require.NoError(t, err)
328326

329-
if *overrideTestData {
327+
if test.OverrideTestData() {
330328
overrideOutputConfig(t, string(out), outputFilePath)
331329
}
332330

@@ -527,7 +525,7 @@ func TestTranslateWithExtensionKinds(t *testing.T) {
527525
out, err := yaml.Marshal(got)
528526
require.NoError(t, err)
529527

530-
if *overrideTestData {
528+
if test.OverrideTestData() {
531529
require.NoError(t, file.Write(string(out), outputFilePath))
532530
}
533531

‎internal/infrastructure/kubernetes/proxy/resource_provider_test.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package proxy
77

88
import (
9-
"flag"
109
"fmt"
1110
"os"
1211
"sort"
@@ -30,10 +29,9 @@ import (
3029
"github.com/envoyproxy/gateway/internal/envoygateway/config"
3130
"github.com/envoyproxy/gateway/internal/gatewayapi"
3231
"github.com/envoyproxy/gateway/internal/ir"
32+
"github.com/envoyproxy/gateway/internal/utils/test"
3333
)
3434

35-
var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")
36-
3735
const (
3836
// envoyHTTPPort is the container port number of Envoy's HTTP endpoint.
3937
envoyHTTPPort = int32(8080)
@@ -634,7 +632,7 @@ func TestDeployment(t *testing.T) {
634632
dp, err := r.Deployment()
635633
require.NoError(t, err)
636634

637-
if *overrideTestData {
635+
if test.OverrideTestData() {
638636
deploymentYAML, err := yaml.Marshal(dp)
639637
require.NoError(t, err)
640638
// nolint: gosec
@@ -1072,7 +1070,7 @@ func TestDaemonSet(t *testing.T) {
10721070
})
10731071
}
10741072

1075-
if *overrideTestData {
1073+
if test.OverrideTestData() {
10761074
deploymentYAML, err := yaml.Marshal(ds)
10771075
require.NoError(t, err)
10781076
// nolint: gosec

‎internal/infrastructure/kubernetes/ratelimit/resource_provider_test.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
package ratelimit
77

88
import (
9-
"flag"
109
"fmt"
1110
"os"
1211
"strconv"
@@ -27,10 +26,9 @@ import (
2726

2827
egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
2928
"github.com/envoyproxy/gateway/internal/envoygateway/config"
29+
"github.com/envoyproxy/gateway/internal/utils/test"
3030
)
3131

32-
var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")
33-
3432
const (
3533
// RedisAuthEnvVar is the redis auth.
3634
RedisAuthEnvVar = "REDIS_AUTH"
@@ -200,7 +198,7 @@ func TestConfigmap(t *testing.T) {
200198
cm, err := r.ConfigMap("")
201199
require.NoError(t, err)
202200

203-
if *overrideTestData {
201+
if test.OverrideTestData() {
204202
cmYAML, err := yaml.Marshal(cm)
205203
require.NoError(t, err)
206204
// nolint:gosec
@@ -770,7 +768,7 @@ func TestDeployment(t *testing.T) {
770768
dp, err := r.Deployment()
771769
require.NoError(t, err)
772770

773-
if *overrideTestData {
771+
if test.OverrideTestData() {
774772
deploymentYAML, err := yaml.Marshal(dp)
775773
require.NoError(t, err)
776774
// nolint:gosec
@@ -886,7 +884,7 @@ func TestHorizontalPodAutoscaler(t *testing.T) {
886884
hpa, err := r.HorizontalPodAutoscaler()
887885
require.NoError(t, err)
888886

889-
if *overrideTestData {
887+
if test.OverrideTestData() {
890888
hpaYAML, err := yaml.Marshal(hpa)
891889
require.NoError(t, err)
892890
// nolint:gosec

‎internal/metrics/metrics_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"context"
1111
"encoding/json"
1212
"errors"
13-
"flag"
1413
"fmt"
1514
"io"
1615
"os"
@@ -28,9 +27,9 @@ import (
2827
"go.opentelemetry.io/otel/sdk/metric/metricdata"
2928
"go.opentelemetry.io/otel/sdk/resource"
3029
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
31-
)
3230

33-
var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")
31+
"github.com/envoyproxy/gateway/internal/utils/test"
32+
)
3433

3534
func TestCounter(t *testing.T) {
3635
name := "counter_metric"
@@ -213,7 +212,7 @@ func newTestMetricsProvider(metricType string, writer io.Writer) (*metric.MeterP
213212
}
214213

215214
func loadMetricsFile(t *testing.T, name string, reader io.Reader) {
216-
if !*overrideTestData {
215+
if !test.OverrideTestData() {
217216
fname := fmt.Sprintf("testdata/%s.json", name)
218217

219218
// nolint:gosec
@@ -229,7 +228,7 @@ func loadMetricsFile(t *testing.T, name string, reader io.Reader) {
229228
}
230229

231230
func exporterWriter(name string, origin io.ReadWriter) (io.ReadWriter, error) {
232-
if *overrideTestData {
231+
if test.OverrideTestData() {
233232
fname := fmt.Sprintf("testdata/%s.json", name)
234233

235234
// nolint:gosec

0 commit comments

Comments
 (0)