Skip to content

Commit

Permalink
chore: Upgrade gazelle (#1925)
Browse files Browse the repository at this point in the history
Summary: I ran into an issue when upgrading an different go dep that
forced be to upgrade gazelle, which in turn forced me to upgrade
buildtools.

Relevant Issues: N/A

Type of change: /kind infra

Test Plan: gazelle and other buildtools still work, build still works.

Signed-off-by: Vihang Mehta <[email protected]>
  • Loading branch information
vihangm authored May 30, 2024
1 parent 7ab2556 commit ced9a19
Show file tree
Hide file tree
Showing 52 changed files with 60 additions and 132 deletions.
12 changes: 6 additions & 6 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

REPOSITORY_LOCATIONS = dict(
bazel_gazelle = dict(
sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
sha256 = "d76bf7a60fd8b050444090dfa2837a4eaf9829e1165618ee35dceca5cbdf58d5",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz",
],
),
bazel_skylib = dict(
Expand Down Expand Up @@ -62,9 +62,9 @@ REPOSITORY_LOCATIONS = dict(
urls = ["https://github.com/arun11299/cpp-jwt/archive/refs/tags/v1.1.1.tar.gz"],
),
com_github_bazelbuild_buildtools = dict(
sha256 = "977a0bd4593c8d4c8f45e056d181c35e48aa01ad4f8090bdb84f78dca42f47dc",
strip_prefix = "buildtools-6.1.2",
urls = ["https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.1.2.tar.gz"],
sha256 = "39c59cb5352892292cbe3174055aac187edcb5324c9b4e2d96cb6e40bd753877",
strip_prefix = "buildtools-7.1.2",
urls = ["https://github.com/bazelbuild/buildtools/archive/refs/tags/v7.1.2.tar.gz"],
),
com_github_cameron314_concurrentqueue = dict(
sha256 = "eb37336bf9ae59aca7b954db3350d9b30d1cab24b96c7676f36040aa76e915e8",
Expand Down
72 changes: 0 additions & 72 deletions go_deps.bzl

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/api/go/pxapi/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ go_library(
"//src/api/go/pxapi/utils",
"//src/api/proto/cloudpb:cloudapi_pl_go_proto",
"//src/api/proto/vizierpb:vizier_pl_go_proto",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//credentials",
"@org_golang_google_grpc//credentials/insecure",
Expand Down
2 changes: 1 addition & 1 deletion src/api/proto/cloudpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ go_library(
"//src/api/proto/uuidpb:uuid_pl_go_proto",
"@com_github_gogo_protobuf//types",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/api/proto/vizierpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ go_library(
deps = [
"//src/api/proto/vizierpb:vizier_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//metadata",
],
)
2 changes: 1 addition & 1 deletion src/carnot/carnotpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ go_library(
deps = [
"//src/carnot/carnotpb:carnot_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//metadata",
],
)
2 changes: 1 addition & 1 deletion src/cloud/api/apienv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ go_library(
"@com_github_gorilla_sessions//:sessions",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)

Expand Down
4 changes: 2 additions & 2 deletions src/cloud/api/controllers/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//metadata",
"@org_golang_google_grpc//status",
Expand Down Expand Up @@ -159,7 +159,7 @@ pl_go_test(
"@com_github_spf13_viper//:viper",
"@com_github_stretchr_testify//assert",
"@com_github_stretchr_testify//require",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//metadata",
"@org_golang_google_grpc//status",
Expand Down
4 changes: 2 additions & 2 deletions src/cloud/api/ptproxy/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ go_library(
"@com_github_gogo_protobuf//types",
"@com_github_nats_io_nats_go//:nats_go",
"@com_github_sirupsen_logrus//:logrus",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//metadata",
"@org_golang_google_grpc//status",
Expand All @@ -65,7 +65,7 @@ pl_go_test(
"@com_github_spf13_viper//:viper",
"@com_github_stretchr_testify//assert",
"@com_github_stretchr_testify//require",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//credentials/insecure",
"@org_golang_google_grpc//metadata",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ go_library(
"//src/cloud/artifact_tracker/artifacttrackerpb:artifact_tracker_pl_go_proto",
"//src/shared/artifacts/versionspb:versions_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/auth/authenv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ go_library(
"//src/shared/services/env",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/auth/authpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ go_library(
"//src/cloud/auth/authpb:auth_pl_go_proto",
"@com_github_gogo_protobuf//types",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/config_manager/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/config_manager/configmanagerpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ go_library(
deps = [
"//src/cloud/config_manager/configmanagerpb:service_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/cron_script/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/cron_script/cronscriptpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ go_library(
deps = [
"//src/cloud/cron_script/cronscriptpb:service_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/indexer/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/cloud/plugin/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/plugin/load_db/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ go_library(
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@in_gopkg_yaml_v2//:yaml_v2",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//metadata",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/cloud/plugin/pluginpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ go_library(
deps = [
"//src/cloud/plugin/pluginpb:service_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/profile/profileenv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ go_library(
"//src/shared/services/env",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/profile/profilepb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ go_library(
"//src/cloud/profile/profilepb:service_pl_go_proto",
"@com_github_gogo_protobuf//types",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ go_library(
"//src/api/proto/uuidpb:uuid_pl_go_proto",
"//src/cloud/project_manager/projectmanagerpb:service_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/scriptmgr/scriptmgrpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ go_library(
deps = [
"//src/cloud/scriptmgr/scriptmgrpb:service_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/cloud/vzconn/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/cloud/vzconn/bridge/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pl_go_test(
"@com_github_stretchr_testify//assert",
"@com_github_stretchr_testify//require",
"@org_golang_google_genproto//googleapis/rpc/code",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//credentials/insecure",
"@org_golang_google_grpc//metadata",
"@org_golang_google_grpc//status",
Expand Down
2 changes: 1 addition & 1 deletion src/cloud/vzconn/vzconnpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ go_library(
deps = [
"//src/cloud/vzconn/vzconnpb:service_pl_go_proto",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//metadata",
],
)
2 changes: 1 addition & 1 deletion src/cloud/vzmgr/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/cloud/vzmgr/vzmgrpb/mock/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ go_library(
"//src/shared/cvmsgspb:cvmsgs_pl_go_proto",
"@com_github_gogo_protobuf//types",
"@com_github_golang_mock//gomock",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)
2 changes: 1 addition & 1 deletion src/e2e_test/protocol_loadtest/grpc/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ go_library(
deps = [
"//src/e2e_test/protocol_loadtest/grpc/loadtestpb:service_pl_go_proto",
"//src/e2e_test/util",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//credentials",
"@org_golang_google_grpc//encoding/gzip",
],
Expand Down
2 changes: 1 addition & 1 deletion src/operator/controllers/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ go_library(
"@io_k8s_client_go//tools/cache",
"@io_k8s_sigs_controller_runtime//:controller-runtime",
"@io_k8s_sigs_controller_runtime//pkg/client",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/pixie_cli/pkg/cmd/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ go_library(
"@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
"@io_k8s_client_go//kubernetes",
"@io_k8s_client_go//rest",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_x_term//:term",
],
)
2 changes: 1 addition & 1 deletion src/pixie_cli/pkg/update/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ go_library(
"@com_github_kardianos_osext//:osext",
"@com_github_vbauerster_mpb_v4//:mpb",
"@com_github_vbauerster_mpb_v4//decor",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_x_sys//unix",
],
)
2 changes: 1 addition & 1 deletion src/pixie_cli/pkg/utils/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ go_library(
"@com_github_fatih_color//:color",
"@in_gopkg_yaml_v2//:yaml_v2",
"@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_x_sync//errgroup",
],
)
Expand Down
2 changes: 1 addition & 1 deletion src/pixie_cli/pkg/vizier/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ go_library(
"@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
"@io_k8s_client_go//kubernetes",
"@io_k8s_client_go//rest",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//metadata",
"@org_golang_google_grpc//status",
Expand Down
2 changes: 1 addition & 1 deletion src/shared/services/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ go_library(
"@com_github_zenazn_goji//web/mutil",
"@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
"@io_k8s_client_go//rest",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//credentials",
"@org_golang_google_grpc//credentials/insecure",
Expand Down
4 changes: 2 additions & 2 deletions src/shared/services/server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ go_library(
"@com_github_grpc_ecosystem_go_grpc_middleware//tags",
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//encoding/gzip",
"@org_golang_google_grpc//reflection",
Expand All @@ -56,7 +56,7 @@ pl_go_test(
"@com_github_spf13_viper//:viper",
"@com_github_stretchr_testify//assert",
"@com_github_stretchr_testify//require",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//credentials/insecure",
"@org_golang_google_grpc//metadata",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ go_library(
importpath = "px.dev/pixie/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_client",
deps = [
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/proto:greet_pl_go_proto",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//credentials",
"@org_golang_google_grpc//credentials/insecure",
"@org_golang_google_grpc//encoding/gzip",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ go_library(
importpath = "px.dev/pixie/src/stirling/source_connectors/socket_tracer/protocols/http2/testing/go_grpc_server",
deps = [
"//src/stirling/source_connectors/socket_tracer/protocols/http2/testing/proto:greet_pl_go_proto",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//encoding/gzip",
"@org_golang_google_grpc//reflection",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//credentials",
],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ go_library(
"@com_github_sirupsen_logrus//:logrus",
"@com_github_spf13_pflag//:pflag",
"@com_github_spf13_viper//:viper",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_x_net//http2",
"@org_golang_x_net//http2/h2c",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ go_library(
deps = [
"//src/stirling/testing/demo_apps/hipster_shop/proto:demo_pl_go_proto",
"@com_github_sirupsen_logrus//:logrus",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//:grpc",
"@org_golang_google_grpc//credentials/insecure",
],
)
Expand Down
Loading

0 comments on commit ced9a19

Please sign in to comment.