Bläddra i källkod

replace deprecated method after transitive dependency update

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 4 år sedan
förälder
incheckning
c3f990f0a2
2 ändrade filer med 6 tillägg och 6 borttagningar
  1. 4 3
      cli/server/proxy/streams/io.go
  2. 2 3
      cli/server/proxy/streams/stream_test.go

+ 4 - 3
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
 	}

+ 2 - 3
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,
 	})