diff --git a/go.mod b/go.mod index 84e74d5..7ee6dcc 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/spf13/cobra v1.2.1 google.golang.org/api v0.111.0 - google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 google.golang.org/grpc v1.53.0 ) @@ -39,5 +38,6 @@ require ( golang.org/x/text v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 // indirect google.golang.org/protobuf v1.28.1 // indirect ) diff --git a/pkg/spanner/admin.go b/pkg/spanner/admin.go index bc3a440..92c1ec4 100644 --- a/pkg/spanner/admin.go +++ b/pkg/spanner/admin.go @@ -5,8 +5,8 @@ import ( "fmt" instancev1 "cloud.google.com/go/spanner/admin/instance/apiv1" + instancepb "cloud.google.com/go/spanner/admin/instance/apiv1/instancepb" "google.golang.org/api/option" - instancepb "google.golang.org/genproto/googleapis/spanner/admin/instance/v1" ) type AdminClient struct { diff --git a/pkg/spanner/client.go b/pkg/spanner/client.go index e72dad5..dd8f9cd 100644 --- a/pkg/spanner/client.go +++ b/pkg/spanner/client.go @@ -27,11 +27,11 @@ import ( "cloud.google.com/go/spanner" databasev1 "cloud.google.com/go/spanner/admin/database/apiv1" + databasepb "cloud.google.com/go/spanner/admin/database/apiv1/databasepb" + sppb "cloud.google.com/go/spanner/apiv1/spannerpb" "github.com/hashicorp/go-multierror" "google.golang.org/api/iterator" "google.golang.org/api/option" - databasepb "google.golang.org/genproto/googleapis/spanner/admin/database/v1" - sppb "google.golang.org/genproto/googleapis/spanner/v1" ) const ( diff --git a/pkg/spanner/client_test.go b/pkg/spanner/client_test.go index 08e15c1..a9e62ba 100644 --- a/pkg/spanner/client_test.go +++ b/pkg/spanner/client_test.go @@ -27,9 +27,9 @@ import ( "testing" "cloud.google.com/go/spanner" + sppb "cloud.google.com/go/spanner/apiv1/spannerpb" "github.com/google/uuid" "google.golang.org/api/iterator" - sppb "google.golang.org/genproto/googleapis/spanner/v1" ) const (