chore(internal/gencli): remove use of github.com/golang/protobuf (#1555)

For #1417
googleapis · Aug 19, 2024 · ad61ccf · ad61ccf
1 parent 53c66dc
commit ad61ccf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/internal/gencli/gencli.go b/internal/gencli/gencli.go
@@ -191,7 +191,7 @@ func (g *gcli) genCommands() {
 				})
 
 				putImport(cmd.Imports, &pbinfo.ImportSpec{
-					Path: "github.com/golang/protobuf/jsonpb",
+					Path: "google.golang.org/protobuf/jsonpb",
 				})
 
 				if !cmd.ClientStreaming {

diff --git a/internal/gencli/root_file.go b/internal/gencli/root_file.go
@@ -31,9 +31,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/jsonpb"
+	"google.golang.org/protobuf/proto"
 )
 
 var Verbose, OutputJSON bool

diff --git a/internal/gencli/service_file_test.go b/internal/gencli/service_file_test.go
@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"github.com/googleapis/gapic-generator-go/internal/pbinfo"
-
 	"github.com/googleapis/gapic-generator-go/internal/txtdiff"
 )
 
@@ -37,7 +36,7 @@ func TestServiceFile(t *testing.T) {
 		root:   "Root",
 		format: true,
 		imports: map[string]*pbinfo.ImportSpec{
-			"test": &pbinfo.ImportSpec{Name: "proto", Path: "github.com/golang/protobuf/proto"},
+			"test": &pbinfo.ImportSpec{Name: "proto", Path: "google.golang.org/protobuf/proto"},
 		},
 		subcommands: map[string][]*Command{
 			name: []*Command{

diff --git a/internal/gencli/testdata/root_file.want b/internal/gencli/testdata/root_file.want
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
 	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/jsonpb"
+	"google.golang.org/protobuf/proto"
 )
 
 var Verbose, OutputJSON bool

diff --git a/internal/gencli/testdata/service_file.want b/internal/gencli/testdata/service_file.want
@@ -12,7 +12,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	proto "github.com/golang/protobuf/proto"
+	proto "google.golang.org/protobuf/proto"
 )
 
 var TodoConfig *viper.Viper