From 712883b0f4a0b5bf64a655d52675cef7da94ea7f Mon Sep 17 00:00:00 2001
From: Miti Mazmudar <mitimazmudar@gmail.com>
Date: Wed, 4 Oct 2023 19:28:06 -0400
Subject: [PATCH] feat(envoy-filter): match target go api version to istio
 envoy version

---
 docker/istio-proxyv2.Dockerfile                             | 6 ++++--
 .../cmd/envoy-filter/envoy-filter-config.go                 | 2 +-
 privacy-profile-composer/go.mod                             | 3 +--
 privacy-profile-composer/go.sum                             | 4 ++--
 privacy-profile-composer/pkg/proto/privacy_profiles.pb.go   | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker/istio-proxyv2.Dockerfile b/docker/istio-proxyv2.Dockerfile
index 4814667d..e15e324d 100644
--- a/docker/istio-proxyv2.Dockerfile
+++ b/docker/istio-proxyv2.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.18 as builder
 
 RUN apt-get update \
     && apt-get install -y protobuf-compiler \
@@ -10,6 +10,8 @@ WORKDIR /app
 COPY ./privacy-profile-composer/ ./
 RUN make build-envoy-filter
 
-FROM istio/proxyv2:1.18.3
+FROM istio/proxyv2:1.19.1@sha256:a521ab45c2a8f9356ee5b47790ad575968d663b705c194ad3053a4fca87dcce9
+
+ENV GODEBUG="cgocheck=0"
 
 COPY --from=builder /app/dist/simple.so /etc/envoy/simple.so
diff --git a/privacy-profile-composer/cmd/envoy-filter/envoy-filter-config.go b/privacy-profile-composer/cmd/envoy-filter/envoy-filter-config.go
index 22d9e9d0..b0fe72f4 100644
--- a/privacy-profile-composer/cmd/envoy-filter/envoy-filter-config.go
+++ b/privacy-profile-composer/cmd/envoy-filter/envoy-filter-config.go
@@ -26,7 +26,7 @@ type parser struct {
 	api.StreamFilterConfigParser
 }
 
-func (p *parser) Parse(any *anypb.Any, callbacks api.ConfigCallbackHandler) (interface{}, error) {
+func (p *parser) Parse(any *anypb.Any) (interface{}, error) {
 	configStruct := &xds.TypedStruct{}
 	if err := any.UnmarshalTo(configStruct); err != nil {
 		return nil, err
diff --git a/privacy-profile-composer/go.mod b/privacy-profile-composer/go.mod
index 06424ffa..a590b83e 100644
--- a/privacy-profile-composer/go.mod
+++ b/privacy-profile-composer/go.mod
@@ -4,8 +4,7 @@ go 1.18
 
 require (
 	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4
-	// Requires this commit or later: https://github.com/envoyproxy/envoy/commit/782bb0c102ffbd9880615526c54c00301a6f3f82
-	github.com/envoyproxy/envoy v1.27.1-0.20230915211138-782bb0c102ff
+	github.com/envoyproxy/envoy v1.27.1-0.20230920193053-83e604abd821
 	google.golang.org/grpc v1.58.0
 	google.golang.org/protobuf v1.31.0
 )
diff --git a/privacy-profile-composer/go.sum b/privacy-profile-composer/go.sum
index 3bfe17f5..62fb1ee7 100644
--- a/privacy-profile-composer/go.sum
+++ b/privacy-profile-composer/go.sum
@@ -25,8 +25,8 @@ github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWa
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+UbP35JkH8yB7MYb4q/qhBarqZE6g=
 github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/envoyproxy/envoy v1.27.1-0.20230915211138-782bb0c102ff h1:hPoW6Q0d7GBjU2ROjYay8w+rsaofPceBE/FtnGy+zpg=
-github.com/envoyproxy/envoy v1.27.1-0.20230915211138-782bb0c102ff/go.mod h1:evKXPgkH1BYJk2yAdlD5jyfgLj6tPGsi0R7PHC+uCFk=
+github.com/envoyproxy/envoy v1.27.1-0.20230920193053-83e604abd821 h1:ItDxVjyjqObN3aHD8DZpT4L83LX3MCTvo9UZ0dJk0xw=
+github.com/envoyproxy/envoy v1.27.1-0.20230920193053-83e604abd821/go.mod h1:evKXPgkH1BYJk2yAdlD5jyfgLj6tPGsi0R7PHC+uCFk=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA=
diff --git a/privacy-profile-composer/pkg/proto/privacy_profiles.pb.go b/privacy-profile-composer/pkg/proto/privacy_profiles.pb.go
index 1cfdf418..d29cd883 100644
--- a/privacy-profile-composer/pkg/proto/privacy_profiles.pb.go
+++ b/privacy-profile-composer/pkg/proto/privacy_profiles.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.28.1
 // 	protoc        v4.24.2
 // source: pkg/proto/privacy_profiles.proto