From c3f990f0a2bfeb889d13c26b2a34592469203023 Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Fri, 23 Jul 2021 10:06:52 +0200
Subject: [PATCH] replace deprecated method after transitive dependency update

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 cli/server/proxy/streams/io.go          | 7 ++++---
 cli/server/proxy/streams/stream_test.go | 5 ++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cli/server/proxy/streams/io.go b/cli/server/proxy/streams/io.go
index 28fd6fd06..205499728 100644
--- a/cli/server/proxy/streams/io.go
+++ b/cli/server/proxy/streams/io.go
@@ -17,7 +17,8 @@
 package streams
 
 import (
-	"github.com/golang/protobuf/ptypes"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/types/known/anypb"
 
 	streamsv1 "github.com/docker/compose-cli/cli/server/protos/streams/v1"
 )
@@ -34,7 +35,7 @@ func (io *IO) Read(p []byte) (int, error) {
 	}
 
 	var m streamsv1.BytesMessage
-	err = ptypes.UnmarshalAny(a, &m)
+	err = anypb.UnmarshalTo(a, &m, proto.UnmarshalOptions{})
 	if err != nil {
 		return 0, err
 	}
@@ -52,7 +53,7 @@ func (io *IO) Write(p []byte) (n int, err error) {
 		Value: p,
 	}
 
-	m, err := ptypes.MarshalAny(&message)
+	m, err := anypb.New(&message)
 	if err != nil {
 		return 0, err
 	}
diff --git a/cli/server/proxy/streams/stream_test.go b/cli/server/proxy/streams/stream_test.go
index bb6ea0b2c..54bd221a0 100644
--- a/cli/server/proxy/streams/stream_test.go
+++ b/cli/server/proxy/streams/stream_test.go
@@ -24,7 +24,6 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/types/known/anypb"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/assert/cmp"
@@ -76,7 +75,7 @@ func getReader(t *testing.T, in []byte, errResult error) IO {
 		Type:  streamsv1.IOStream_STDOUT,
 		Value: in,
 	}
-	m, err := ptypes.MarshalAny(&message)
+	m, err := anypb.New(&message)
 	assert.NilError(t, err)
 
 	return IO{
@@ -90,7 +89,7 @@ func getReader(t *testing.T, in []byte, errResult error) IO {
 }
 
 func getAny(t *testing.T, in []byte) *any.Any {
-	value, err := ptypes.MarshalAny(&streamsv1.BytesMessage{
+	value, err := anypb.New(&streamsv1.BytesMessage{
 		Type:  streamsv1.IOStream_STDOUT,
 		Value: in,
 	})