Merge pull request #260 from thaJeztah/switch_proto

cmd/continuity: switch to google.golang.org/protobuf/proto
containerd · Oct 28, 2024 · c156753 · c156753
2 parents 2fab5e9 + fd64705
commit c156753
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/cmd/continuity/commands/dump.go b/cmd/continuity/commands/dump.go
@@ -17,13 +17,15 @@
 package commands
 
 import (
+	"fmt"
 	"io"
 	"log"
 	"os"
 
 	pb "github.com/containerd/continuity/proto"
-	"github.com/golang/protobuf/proto"
 	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/encoding/prototext"
+	"google.golang.org/protobuf/proto"
 )
 
 var DumpCmd = &cobra.Command{
@@ -51,10 +53,7 @@ var DumpCmd = &cobra.Command{
 			log.Fatalf("error unmarshaling manifest: %v", err)
 		}
 
-		// TODO(stevvooe): For now, just dump the text format. Turn this into
-		// nice text output later.
-		if err := proto.MarshalText(os.Stdout, &bm); err != nil {
-			log.Fatalf("error dumping manifest: %v", err)
-		}
+		// TODO(stevvooe): For now, just dump the text format. Turn this into nice text output later.
+		_, _ = fmt.Fprintln(os.Stdout, prototext.Format(&bm))
 	},
 }
diff --git a/cmd/continuity/commands/main.go b/cmd/continuity/commands/main.go
@@ -22,8 +22,8 @@ import (
 	"text/tabwriter"
 
 	pb "github.com/containerd/continuity/proto"
-	"github.com/golang/protobuf/proto"
 	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/proto"
 )
 
 var (