From 45b5c0b459f0bec6a1b9e280d6bf66bbd0f65023 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Tue, 7 Nov 2023 16:00:06 -0500 Subject: [PATCH] Stop setting removed field EnvoyExtensions in test The field was intentionally removed in https://github.com/hashicorp/consul/pull/19186 --- .../v2beta1/proxy_configuration_types_test.go | 57 ------------------- 1 file changed, 57 deletions(-) diff --git a/control-plane/api/mesh/v2beta1/proxy_configuration_types_test.go b/control-plane/api/mesh/v2beta1/proxy_configuration_types_test.go index 5e432175f4..67ad339697 100644 --- a/control-plane/api/mesh/v2beta1/proxy_configuration_types_test.go +++ b/control-plane/api/mesh/v2beta1/proxy_configuration_types_test.go @@ -14,7 +14,6 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/protobuf/testing/protocmp" "google.golang.org/protobuf/types/known/durationpb" - "google.golang.org/protobuf/types/known/structpb" "google.golang.org/protobuf/types/known/timestamppb" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -109,20 +108,6 @@ func TestProxyConfiguration_MatchesConsul(t *testing.T) { JsonFormat: "jsonFormat", TextFormat: "text format.", }, - EnvoyExtensions: []*pbmesh.EnvoyExtension{ - { - Name: "extension-1", - Required: true, - Arguments: &structpb.Struct{ - Fields: map[string]*structpb.Value{ - "field-1": {}, - "field-2": {}, - }, - }, - ConsulVersion: "1.22.3-beta1", - EnvoyVersion: "1.33.4", - }, - }, PublicListenerJson: "publicListenerJson{}", ListenerTracingJson: "listenerTracingJson{}", LocalClusterJson: "localClusterJson{}", @@ -196,20 +181,6 @@ func TestProxyConfiguration_MatchesConsul(t *testing.T) { JsonFormat: "jsonFormat", TextFormat: "text format.", }, - EnvoyExtensions: []*pbmesh.EnvoyExtension{ - { - Name: "extension-1", - Required: true, - Arguments: &structpb.Struct{ - Fields: map[string]*structpb.Value{ - "field-1": {}, - "field-2": {}, - }, - }, - ConsulVersion: "1.22.3-beta1", - EnvoyVersion: "1.33.4", - }, - }, PublicListenerJson: "publicListenerJson{}", ListenerTracingJson: "listenerTracingJson{}", LocalClusterJson: "localClusterJson{}", @@ -347,20 +318,6 @@ func TestProxyConfiguration_Resource(t *testing.T) { JsonFormat: "jsonFormat", TextFormat: "text format.", }, - EnvoyExtensions: []*pbmesh.EnvoyExtension{ - { - Name: "extension-1", - Required: true, - Arguments: &structpb.Struct{ - Fields: map[string]*structpb.Value{ - "field-1": {}, - "field-2": {}, - }, - }, - ConsulVersion: "1.22.3-beta1", - EnvoyVersion: "1.33.4", - }, - }, PublicListenerJson: "publicListenerJson{}", ListenerTracingJson: "listenerTracingJson{}", LocalClusterJson: "localClusterJson{}", @@ -434,20 +391,6 @@ func TestProxyConfiguration_Resource(t *testing.T) { JsonFormat: "jsonFormat", TextFormat: "text format.", }, - EnvoyExtensions: []*pbmesh.EnvoyExtension{ - { - Name: "extension-1", - Required: true, - Arguments: &structpb.Struct{ - Fields: map[string]*structpb.Value{ - "field-1": {}, - "field-2": {}, - }, - }, - ConsulVersion: "1.22.3-beta1", - EnvoyVersion: "1.33.4", - }, - }, PublicListenerJson: "publicListenerJson{}", ListenerTracingJson: "listenerTracingJson{}", LocalClusterJson: "localClusterJson{}",