all: migrate to cloud.google.com message types
Done with:
go run cloud.google.com/go/internal/aliasfix/cmd/aliasfix@latest .
go mod tidy
As suggested in the package deprecation note¹.
¹ https://pkg.go.dev/google.golang.org/genproto/googleapis/cloud/tasks/v2#pkg-overview
Change-Id: I78df9037198e5460a2e00339727a06282cf8a701
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/526315
Reviewed-by: Bryan Mills <bcmills@google.com>
Auto-Submit: Dmitri Shuralyov <dmitshur@golang.org>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/all.bash b/all.bash
index 74d4367..5c3f43c 100755
--- a/all.bash
+++ b/all.bash
@@ -149,7 +149,7 @@
# check_staticcheck runs staticcheck on source files.
check_staticcheck() {
ensure_go_binary honnef.co/go/tools/cmd/staticcheck
- runcmd staticcheck -fail=-SA1019 $(go list ./... | grep -v third_party | grep -v internal/doc | grep -v internal/render)
+ runcmd staticcheck $(go list ./... | grep -v third_party | grep -v internal/doc | grep -v internal/render)
}
# check_misspell runs misspell on source files.
diff --git a/go.mod b/go.mod
index 3dd934e..7e4b179 100644
--- a/go.mod
+++ b/go.mod
@@ -38,7 +38,6 @@
golang.org/x/text v0.11.0
golang.org/x/tools v0.7.0
google.golang.org/api v0.114.0
- google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
google.golang.org/grpc v1.57.0
google.golang.org/protobuf v1.30.0
@@ -94,5 +93,6 @@
golang.org/x/sys v0.10.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-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
)
diff --git a/internal/queue/gcpqueue/queue.go b/internal/queue/gcpqueue/queue.go
index bd56852..e007bf0 100644
--- a/internal/queue/gcpqueue/queue.go
+++ b/internal/queue/gcpqueue/queue.go
@@ -16,9 +16,9 @@
"strings"
"time"
- "cloud.google.com/go/cloudtasks/apiv2"
+ cloudtasks "cloud.google.com/go/cloudtasks/apiv2"
+ taskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
"golang.org/x/pkgsite/internal/config/serverconfig"
- taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/durationpb"
diff --git a/internal/queue/gcpqueue/queue_test.go b/internal/queue/gcpqueue/queue_test.go
index cbe92e7..6644c25 100644
--- a/internal/queue/gcpqueue/queue_test.go
+++ b/internal/queue/gcpqueue/queue_test.go
@@ -5,12 +5,12 @@
package gcpqueue
import (
- "golang.org/x/pkgsite/internal/queue"
"testing"
+ taskspb "cloud.google.com/go/cloudtasks/apiv2/cloudtaskspb"
"github.com/google/go-cmp/cmp"
"golang.org/x/pkgsite/internal/config"
- taskspb "google.golang.org/genproto/googleapis/cloud/tasks/v2"
+ "golang.org/x/pkgsite/internal/queue"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/durationpb"
)
diff --git a/internal/secrets/secrets.go b/internal/secrets/secrets.go
index 78f0356..189681d 100644
--- a/internal/secrets/secrets.go
+++ b/internal/secrets/secrets.go
@@ -12,8 +12,8 @@
"os"
secretmanager "cloud.google.com/go/secretmanager/apiv1"
+ smpb "cloud.google.com/go/secretmanager/apiv1/secretmanagerpb"
"golang.org/x/pkgsite/internal/derrors"
- smpb "google.golang.org/genproto/googleapis/cloud/secretmanager/v1"
)
// Get returns the named secret value as plaintext.
