Skip to content

Commit bdbc00b

Browse files
zasgarzasgar
committed
Change bazel build rules to use actual names instead of go_default_binary, go_default_library.
Summary: This is much cleaner than the earlier approach we had to adopt because of limitation in gazelle. There are a few missed cases and some bad package naming. Will address those shortly. Test Plan: existing. Reviewers: michelle, vihang, #third_party_approvers Reviewed By: vihang, #third_party_approvers Differential Revision: https://phab.corp.pixielabs.ai/D8018 GitOrigin-RevId: 29cffda
1 parent fe7692b commit bdbc00b

177 files changed

Lines changed: 1796 additions & 1797 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎BUILD.bazel‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gazelle(
1414
# gazelle:exclude vendor
1515
# gazelle:exclude third_party
1616
# gazelle:exclude src/ui/node_modules
17-
# gazelle:go_naming_convention go_default_library
17+
# gazelle:go_naming_convention import
1818

1919
# Make gazelle not generate proto files. We need to use gogo proto and this does
2020
# not seem to work automatically right now. Keep an eye out on issue:
@@ -41,7 +41,6 @@ gazelle(
4141
# gazelle:resolve go pixielabs.ai/pixielabs/src/carnot/udfspb //src/carnot/udfspb:udfs_pl_go_proto
4242
# gazelle:resolve go pixielabs.ai/pixielabs/src/carnot/queryresultspb //src/carnot/queryresultspb:query_results_pl_go_proto
4343
# gazelle:resolve go pixielabs.ai/pixielabs/src/carnotpb //src/carnotpb:carnot_pl_go_proto
44-
# gazelle:resolve go pixielabs.ai/pixielabs/src/carnotpb/mock //src/carnotpb/mock:go_default_library
4544
# gazelle:resolve go pixielabs.ai/pixielabs/src/cloud/auth/proto //src/cloud/auth/proto:auth_go_proto
4645
# gazelle:resolve go pixielabs.ai/pixielabs/src/cloud/project_manager/projectmanagerpb //src/cloud/project_manager/projectmanagerpb:service_go_proto
4746
# gazelle:resolve go pixielabs.ai/pixielabs/src/cloud/artifact_tracker/artifacttrackerpb //src/cloud/artifact_tracker/artifacttrackerpb:artifact_tracker_pl_go_proto

‎demos/applications/hipster_shop/productcatalogservice_client/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ load("@io_bazel_rules_docker//go:image.bzl", "go_image")
55

66
go_binary(
77
name = "productcatalogservice_client",
8-
embed = [":go_default_library"],
8+
embed = [":productcatalogservice_client_lib"],
99
)
1010

1111
go_library(
12-
name = "go_default_library",
12+
name = "productcatalogservice_client_lib",
1313
srcs = ["client.go"],
1414
importpath = "pixielabs.ai/pixielabs/demos/applications/hipster_shop/productcatalogservice_client",
1515
deps = [
1616
"//demos/applications/hipster_shop/proto:demo_pl_go_proto",
17-
"@com_github_sirupsen_logrus//:go_default_library",
17+
"@com_github_sirupsen_logrus//:logrus",
1818
"@org_golang_google_grpc//:go_default_library",
1919
],
2020
)

‎demos/client_server_apps/go_http/server/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ load("@io_bazel_rules_docker//go:image.bzl", "go_image")
33
load("@io_bazel_rules_docker//container:container.bzl", "container_push")
44

55
go_library(
6-
name = "go_default_library",
6+
name = "server_lib",
77
srcs = ["simple_http_server.go"],
88
importpath = "pixielabs.ai/pixielabs/demos/client_server_apps/go_http/server",
99
visibility = ["//visibility:private"],
1010
)
1111

1212
go_binary(
1313
name = "simple_http_server",
14-
embed = [":go_default_library"],
14+
embed = [":server_lib"],
1515
visibility = ["//visibility:public"],
1616
)
1717

‎demos/client_server_apps/wrk_sweeper/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "wrk_sweeper_lib",
55
srcs = ["wrk_sweeper.go"],
66
importpath = "pixielabs.ai/pixielabs/demos/client_server_apps/wrk_sweeper",
77
visibility = ["//visibility:private"],
88
)
99

1010
go_binary(
1111
name = "wrk_sweeper",
12-
embed = [":go_default_library"],
12+
embed = [":wrk_sweeper_lib"],
1313
visibility = ["//visibility:public"],
1414
)

‎demos/load_generation/BUILD.bazel‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "load_generation_lib",
55
srcs = ["generate_load.go"],
66
importpath = "pixielabs.ai/pixielabs/demos/load_generation",
77
visibility = ["//visibility:private"],
88
deps = [
99
"//demos/load_generation/proto:load_config_go_proto",
10-
"//src/utils:go_default_library",
11-
"@com_github_gogo_protobuf//proto:go_default_library",
12-
"@com_github_sirupsen_logrus//:go_default_library",
13-
"@com_github_spf13_pflag//:go_default_library",
14-
"@com_github_spf13_viper//:go_default_library",
10+
"//src/utils",
11+
"@com_github_gogo_protobuf//proto",
12+
"@com_github_sirupsen_logrus//:logrus",
13+
"@com_github_spf13_pflag//:pflag",
14+
"@com_github_spf13_viper//:viper",
1515
],
1616
)
1717

1818
go_binary(
1919
name = "load_generation",
20-
embed = [":go_default_library"],
20+
embed = [":load_generation_lib"],
2121
visibility = ["//visibility:public"],
2222
)

‎src/api/go/pxapi/BUILD.bazel‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "pxapi",
55
srcs = [
66
"client.go",
77
"doc.go",
@@ -13,15 +13,15 @@ go_library(
1313
importpath = "pixielabs.ai/pixielabs/src/api/go/pxapi",
1414
visibility = ["//visibility:public"],
1515
deps = [
16-
"//src/api/go/pxapi/errdefs:go_default_library",
17-
"//src/api/go/pxapi/types:go_default_library",
16+
"//src/api/go/pxapi/errdefs",
17+
"//src/api/go/pxapi/types",
1818
"//src/api/public/cloudapipb:public_cloudapi_pl_go_proto",
1919
"//src/api/public/uuidpb:uuid_pl_go_proto",
2020
"//src/api/public/vizierapipb:public_vizier_pl_go_proto",
21-
"@com_github_gofrs_uuid//:go_default_library",
21+
"@com_github_gofrs_uuid//:uuid",
2222
"@org_golang_google_grpc//:go_default_library",
23-
"@org_golang_google_grpc//credentials:go_default_library",
24-
"@org_golang_google_grpc//metadata:go_default_library",
23+
"@org_golang_google_grpc//credentials",
24+
"@org_golang_google_grpc//metadata",
2525
],
2626
)
2727

@@ -39,14 +39,14 @@ filegroup(
3939
)
4040

4141
go_test(
42-
name = "go_default_test",
42+
name = "pxapi_test",
4343
srcs = ["results_test.go"],
44-
embed = [":go_default_library"],
44+
embed = [":pxapi"],
4545
deps = [
46-
"//src/api/go/pxapi/errdefs:go_default_library",
47-
"//src/api/go/pxapi/types:go_default_library",
46+
"//src/api/go/pxapi/errdefs",
47+
"//src/api/go/pxapi/types",
4848
"//src/api/public/vizierapipb:public_vizier_pl_go_proto",
49-
"@com_github_stretchr_testify//assert:go_default_library",
50-
"@org_golang_google_grpc//codes:go_default_library",
49+
"@com_github_stretchr_testify//assert",
50+
"@org_golang_google_grpc//codes",
5151
],
5252
)

‎src/api/go/pxapi/errdefs/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "errdefs",
55
srcs = [
66
"compiler.go",
77
"doc.go",
@@ -12,14 +12,14 @@ go_library(
1212
visibility = ["//visibility:public"],
1313
deps = [
1414
"//src/api/public/vizierapipb:public_vizier_pl_go_proto",
15-
"@org_golang_google_grpc//codes:go_default_library",
15+
"@org_golang_google_grpc//codes",
1616
],
1717
)
1818

1919
go_test(
20-
name = "go_default_test",
20+
name = "errdefs_test",
2121
srcs = ["err_test.go"],
22-
embed = [":go_default_library"],
22+
embed = [":errdefs"],
2323
)
2424

2525
filegroup(

‎src/api/go/pxapi/errdefs/formatters/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_library")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "formatters",
55
srcs = [
66
"doc.go",
77
"json.go",
@@ -10,8 +10,8 @@ go_library(
1010
importpath = "pixielabs.ai/pixielabs/src/api/go/pxapi/errdefs/formatters",
1111
visibility = ["//visibility:public"],
1212
deps = [
13-
"//src/api/go/pxapi/errdefs:go_default_library",
14-
"//src/api/go/pxapi/types:go_default_library",
15-
"@com_github_olekukonko_tablewriter//:go_default_library",
13+
"//src/api/go/pxapi/errdefs",
14+
"//src/api/go/pxapi/types",
15+
"@com_github_olekukonko_tablewriter//:tablewriter",
1616
],
1717
)

‎src/api/go/pxapi/muxes/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_library")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "muxes",
55
srcs = [
66
"doc.go",
77
"regex.go",
88
],
99
importpath = "pixielabs.ai/pixielabs/src/api/go/pxapi/muxes",
1010
visibility = ["//visibility:public"],
1111
deps = [
12-
"//src/api/go/pxapi:go_default_library",
13-
"//src/api/go/pxapi/types:go_default_library",
12+
"//src/api/go/pxapi",
13+
"//src/api/go/pxapi/types",
1414
],
1515
)

‎src/api/go/pxapi/types/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_library")
22

33
go_library(
4-
name = "go_default_library",
4+
name = "types",
55
srcs = [
66
"doc.go",
77
"schema.go",
@@ -11,7 +11,7 @@ go_library(
1111
visibility = ["//visibility:public"],
1212
deps = [
1313
"//src/api/public/vizierapipb:public_vizier_pl_go_proto",
14-
"@com_github_gofrs_uuid//:go_default_library",
14+
"@com_github_gofrs_uuid//:uuid",
1515
],
1616
)
1717

0 commit comments

Comments
 (0)