Bump istio/api and use protobufs defined there (istio#35498)

* Bump istio/api and use protobufs defined there

* gen

pilot/pkg/security/authn/v1beta1/policy_applier.go

@@ -28,6 +28,8 @@ import (
 	duration "github.com/golang/protobuf/ptypes/duration"
 	"github.com/golang/protobuf/ptypes/empty"
 
+	authn_alpha "istio.io/api/authentication/v1alpha1"
+	authn_filter "istio.io/api/envoy/config/filter/http/authn/v2alpha1"
 	"istio.io/api/security/v1beta1"
 	"istio.io/istio/pilot/pkg/extensionproviders"
 	"istio.io/istio/pilot/pkg/features"
@@ -39,8 +41,6 @@ import (
 	authn_utils "istio.io/istio/pilot/pkg/security/authn/utils"
 	authn_model "istio.io/istio/pilot/pkg/security/model"
 	"istio.io/istio/pkg/config"
-	authn_alpha "istio.io/istio/pkg/envoy/config/authentication/v1alpha1"
-	authn_filter "istio.io/istio/pkg/envoy/config/filter/http/authn/v2alpha1"
 	"istio.io/pkg/log"
 )
 

pilot/pkg/security/authn/v1beta1/policy_applier_test.go

@@ -33,6 +33,8 @@ import (
 	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/durationpb"
 
+	authn_alpha "istio.io/api/authentication/v1alpha1"
+	authn_filter "istio.io/api/envoy/config/filter/http/authn/v2alpha1"
 	"istio.io/api/security/v1beta1"
 	type_beta "istio.io/api/type/v1beta1"
 	"istio.io/istio/pilot/pkg/features"
@@ -42,8 +44,6 @@ import (
 	pilotutil "istio.io/istio/pilot/pkg/networking/util"
 	"istio.io/istio/pkg/config"
 	"istio.io/istio/pkg/config/host"
-	authn_alpha "istio.io/istio/pkg/envoy/config/authentication/v1alpha1"
-	authn_filter "istio.io/istio/pkg/envoy/config/filter/http/authn/v2alpha1"
 	protovalue "istio.io/istio/pkg/proto"
 )
 
@@ -1024,7 +1024,7 @@ func humanReadableAuthnFilterDump(filter *http_conn.HttpFilter) string {
 	config := &authn_filter.FilterConfig{}
 	// nolint: staticcheck
 	ptypes.UnmarshalAny(filter.GetTypedConfig(), config)
-	return spew.Sdump(*config)
+	return spew.Sdump(config)
 }
 
 func TestAuthnFilterConfig(t *testing.T) {

pilot/pkg/xds/filters/filters.go

@@ -15,7 +15,6 @@
 package filters
 
 import (
-	udpa "github.com/cncf/udpa/go/udpa/type/v1"
 	cluster "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
 	core "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	listener "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
@@ -32,13 +31,12 @@ import (
 	hcm "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
 	wasm "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3"
 	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
-	protobuf "github.com/gogo/protobuf/types"
-	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/wrapperspb"
 
+	alpn "istio.io/api/envoy/config/filter/http/alpn/v2alpha1"
+	"istio.io/api/envoy/config/filter/network/metadata_exchange"
 	"istio.io/istio/pilot/pkg/features"
 	"istio.io/istio/pilot/pkg/networking/util"
-	alpn "istio.io/istio/pkg/envoy/config/filter/http/alpn/v2alpha1"
 )
 
 const (
@@ -138,17 +136,7 @@ var (
 		},
 	}
 
-	tcpMx = util.MessageToAny(&udpa.TypedStruct{
-		// TODO(https://github.com/istio/istio/issues/35210) make this in API
-		TypeUrl: "type.googleapis.com/envoy.tcp.metadataexchange.config.MetadataExchange",
-		Value: &structpb.Struct{
-			Fields: map[string]*structpb.Value{
-				"protocol": {
-					Kind: &structpb.Value_StringValue{StringValue: "istio-peer-exchange"},
-				},
-			},
-		},
-	})
+	tcpMx = util.MessageToAny(&metadata_exchange.MetadataExchange{Protocol: "istio-peer-exchange"})
 
 	TCPListenerMx = &listener.Filter{
 		Name:       MxFilterName,
@@ -194,7 +182,7 @@ func buildHTTPMxFilter() *hcm.HttpFilter {
 	httpMxConfigProto := &httpwasm.Wasm{
 		Config: &wasm.PluginConfig{
 			Vm:            constructVMConfig("/etc/istio/extensions/metadata-exchange-filter.compiled.wasm", "envoy.wasm.metadata_exchange"),
-			Configuration: util.MessageToAny(&protobuf.StringValue{Value: "{}"}),
+			Configuration: util.MessageToAny(&metadata_exchange.MetadataExchange{}),
 		},
 	}
 

pkg/config/xds/filter_types.go

@@ -31,7 +31,7 @@
 //go:generate sh -c "echo 'package xds\n\nimport (' >> filter_types.gen.go"
 //go:generate sh -c "go list github.com/envoyproxy/go-control-plane/... | grep 'v[2-9]' | grep -v /pkg/ | xargs -n1 -I{} echo '\t_ \"{}\"' >> filter_types.gen.go"
 //go:generate sh -c "echo '\n\t// Istio-specific Envoy filters' >> filter_types.gen.go"
-//go:generate sh -c "go list istio.io/istio/pkg/envoy/config/filter/... | grep 'v[2-9]' | xargs -n1 -I{} echo '\t_ \"{}\"' >> filter_types.gen.go"
+//go:generate sh -c "go list istio.io/api/envoy/config/filter/... | grep 'v[2-9]' | xargs -n1 -I{} echo '\t_ \"{}\"' >> filter_types.gen.go"
 //go:generate sh -c "echo ')' >> filter_types.gen.go"
 package xds