Skip to content

chore: improve merge test #5861

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.

Sign up for GitHub

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

Merged
shawnh2 merged 5 commits into from
May 4, 2025
Merged

chore: improve merge test #5861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
123352b
refactor merge UT
zirain Apr 30, 2025
a0ff64f
refactor OverrideTestData
zirain Apr 30, 2025
c4ea07c
revert
zirain Apr 30, 2025
5d26cb5
fix lint
zirain Apr 30, 2025
b8348fb
refactor
zirain May 1, 2025
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
5 changes: 3 additions & 2 deletions internal/cmd/egctl/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
kube "github.com/envoyproxy/gateway/internal/kubernetes"
"github.com/envoyproxy/gateway/internal/utils/file"
netutil "github.com/envoyproxy/gateway/internal/utils/net"
"github.com/envoyproxy/gateway/internal/utils/test"
)

const (
Expand Down Expand Up @@ -118,7 +119,7 @@ func TestExtractAllConfigDump(t *testing.T) {
aggregated := sampleAggregatedConfigDump(configDump)
got, err := marshalEnvoyProxyConfig(aggregated, tc.output)
require.NoError(t, err)
if *overrideTestData {
if test.OverrideTestData() {
require.NoError(t, file.Write(string(got), filepath.Join("testdata", "config", "out", tc.expected)))
}
out, err := readOutputConfig(tc.expected)
Expand Down Expand Up @@ -206,7 +207,7 @@ func TestExtractSubResourcesConfigDump(t *testing.T) {
aggregated := sampleAggregatedConfigDump(configDump)
got, err := marshalEnvoyProxyConfig(aggregated, tc.output)
require.NoError(t, err)
if *overrideTestData {
if test.OverrideTestData() {
require.NoError(t, file.Write(string(got), filepath.Join("testdata", "config", "out", tc.expected)))
}
out, err := readOutputConfig(tc.expected)
Expand Down
5 changes: 2 additions & 3 deletions internal/cmd/egctl/translate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ import (
"github.com/envoyproxy/gateway/internal/gatewayapi/resource"
"github.com/envoyproxy/gateway/internal/utils/field"
"github.com/envoyproxy/gateway/internal/utils/file"
"github.com/envoyproxy/gateway/internal/utils/test"
)

var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")

func TestTranslate(t *testing.T) {
testCases := []struct {
name string
Expand Down Expand Up @@ -363,7 +362,7 @@ func TestTranslate(t *testing.T) {
out, err = yaml.Marshal(got)
require.NoError(t, err)
}
if *overrideTestData {
if test.OverrideTestData() {
require.NoError(t, file.Write(string(out), filepath.Join("testdata", "translate", "out", fn)))
}
want := &TranslationResult{}
Expand Down
6 changes: 2 additions & 4 deletions internal/gatewayapi/resource/load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package resource

import (
"flag"
"fmt"
"os"
"path/filepath"
Expand All @@ -18,10 +17,9 @@ import (
"sigs.k8s.io/yaml"

"github.com/envoyproxy/gateway/internal/utils/file"
"github.com/envoyproxy/gateway/internal/utils/test"
)

var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")

func TestIterYAMLBytes(t *testing.T) {
inputs := `test: foo1
---
Expand Down Expand Up @@ -53,7 +51,7 @@ func TestLoadAllSupportedResourcesFromYAMLBytes(t *testing.T) {
got, err := LoadResourcesFromYAMLBytes(inFile, true)
require.NoError(t, err)

if *overrideTestData {
if test.OverrideTestData() {
out, err := yaml.Marshal(got)
require.NoError(t, err)
require.NoError(t, file.Write(string(out), filepath.Join("testdata", "all-resources.out.yaml")))
Expand Down
8 changes: 3 additions & 5 deletions internal/gatewayapi/translator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"context"
"crypto/sha256"
"encoding/hex"
"flag"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -38,11 +37,10 @@ import (
"github.com/envoyproxy/gateway/internal/ir"
"github.com/envoyproxy/gateway/internal/utils/field"
"github.com/envoyproxy/gateway/internal/utils/file"
"github.com/envoyproxy/gateway/internal/utils/test"
"github.com/envoyproxy/gateway/internal/wasm"
)

var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")

func mustUnmarshal(t *testing.T, val []byte, out interface{}) {
require.NoError(t, yaml.UnmarshalStrict(val, out, yaml.DisallowUnknownFields))
}
Expand Down Expand Up @@ -326,7 +324,7 @@ func TestTranslate(t *testing.T) {
out, err := yaml.Marshal(got)
require.NoError(t, err)

if *overrideTestData {
if test.OverrideTestData() {
overrideOutputConfig(t, string(out), outputFilePath)
}

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

if *overrideTestData {
if test.OverrideTestData() {
require.NoError(t, file.Write(string(out), outputFilePath))
}

Expand Down
8 changes: 3 additions & 5 deletions internal/infrastructure/kubernetes/proxy/resource_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package proxy

import (
"flag"
"fmt"
"os"
"sort"
Expand All @@ -30,10 +29,9 @@ import (
"github.com/envoyproxy/gateway/internal/envoygateway/config"
"github.com/envoyproxy/gateway/internal/gatewayapi"
"github.com/envoyproxy/gateway/internal/ir"
"github.com/envoyproxy/gateway/internal/utils/test"
)

var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")

const (
// envoyHTTPPort is the container port number of Envoy's HTTP endpoint.
envoyHTTPPort = int32(8080)
Expand Down Expand Up @@ -634,7 +632,7 @@ func TestDeployment(t *testing.T) {
dp, err := r.Deployment()
require.NoError(t, err)

if *overrideTestData {
if test.OverrideTestData() {
deploymentYAML, err := yaml.Marshal(dp)
require.NoError(t, err)
// nolint: gosec
Expand Down Expand Up @@ -1072,7 +1070,7 @@ func TestDaemonSet(t *testing.T) {
})
}

if *overrideTestData {
if test.OverrideTestData() {
deploymentYAML, err := yaml.Marshal(ds)
require.NoError(t, err)
// nolint: gosec
Expand Down
10 changes: 4 additions & 6 deletions internal/infrastructure/kubernetes/ratelimit/resource_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package ratelimit

import (
"flag"
"fmt"
"os"
"strconv"
Expand All @@ -27,10 +26,9 @@ import (

egv1a1 "github.com/envoyproxy/gateway/api/v1alpha1"
"github.com/envoyproxy/gateway/internal/envoygateway/config"
"github.com/envoyproxy/gateway/internal/utils/test"
)

var overrideTestData = flag.Bool("override-testdata", false, "if override the test output data.")

const (
// RedisAuthEnvVar is the redis auth.
RedisAuthEnvVar = "REDIS_AUTH"
Expand Down Expand Up @@ -200,7 +198,7 @@ func TestConfigmap(t *testing.T) {
cm, err := r.ConfigMap("")
require.NoError(t, err)

if *overrideTestData {
if test.OverrideTestData() {
cmYAML, err := yaml.Marshal(cm)
require.NoError(t, err)
// nolint:gosec
Expand Down Expand Up @@ -770,7 +768,7 @@ func TestDeployment(t *testing.T) {
dp, err := r.Deployment()
require.NoError(t, err)

if *overrideTestData {
if test.OverrideTestData() {
deploymentYAML, err := yaml.Marshal(dp)
require.NoError(t, err)
// nolint:gosec
Expand Down Expand Up @@ -886,7 +884,7 @@ func TestHorizontalPodAutoscaler(t *testing.T) {
hpa, err := r.HorizontalPodAutoscaler()
require.NoError(t, err)

if *overrideTestData {
if test.OverrideTestData() {
hpaYAML, err := yaml.Marshal(hpa)
require.NoError(t, err)
// nolint:gosec
Expand Down
9 changes: 4 additions & 5 deletions internal/metrics/metrics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"context"
"encoding/json"
"errors"
"flag"
"fmt"
"io"
"os"
Expand All @@ -28,9 +27,9 @@ import (
"go.opentelemetry.io/otel/sdk/metric/metricdata"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.17.0"
)

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

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

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

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

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

// nolint:gosec
Expand Down
Loading