-
Notifications
You must be signed in to change notification settings - Fork 922
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Goland Standard "cmd" Pattern for Validator Binaries (#8541)
* validator cmd * imports * more imports * e2e viz * alias * use native alias * add actual * fix macro * work on fix e2e * add viz * gaz Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com>
- Loading branch information
1 parent
4c49d4a
commit cdea2de
Showing
41 changed files
with
225 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| load("@prysm//tools/go:def.bzl", "go_library") | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_test") | ||
| load("@io_bazel_rules_docker//go:image.bzl", "go_image") | ||
| load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image") | ||
| load("//tools:go_image.bzl", "go_image_alpine", "go_image_debug") | ||
| load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "log.go", | ||
| "main.go", | ||
| "usage.go", | ||
| ], | ||
| importpath = "github.com/prysmaticlabs/prysm/cmd/validator", | ||
| visibility = ["//validator:__subpackages__"], | ||
| deps = [ | ||
| "//cmd/validator/flags:go_default_library", | ||
| "//shared/cmd:go_default_library", | ||
| "//shared/debug:go_default_library", | ||
| "//shared/featureconfig:go_default_library", | ||
| "//shared/fileutil:go_default_library", | ||
| "//shared/journald:go_default_library", | ||
| "//shared/logutil:go_default_library", | ||
| "//shared/maxprocs:go_default_library", | ||
| "//shared/tos:go_default_library", | ||
| "//shared/version:go_default_library", | ||
| "//validator/accounts:go_default_library", | ||
| "//validator/db:go_default_library", | ||
| "//validator/node:go_default_library", | ||
| "//validator/slashing-protection:go_default_library", | ||
| "@com_github_joonix_log//:go_default_library", | ||
| "@com_github_sirupsen_logrus//:go_default_library", | ||
| "@com_github_urfave_cli_v2//:go_default_library", | ||
| "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| go_image( | ||
| name = "image", | ||
| base = select({ | ||
| "//tools:base_image_alpine": "//tools:alpine_cc_image", | ||
| "//tools:base_image_cc": "//tools:cc_image", | ||
| "//conditions:default": "//tools:cc_image", | ||
| }), | ||
| binary = ":validator", | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| container_image( | ||
| name = "image_with_creation_time", | ||
| base = "image", | ||
| stamp = True, | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| container_bundle( | ||
| name = "image_bundle", | ||
| images = { | ||
| "gcr.io/prysmaticlabs/prysm/validator:latest": ":image_with_creation_time", | ||
| "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}": ":image_with_creation_time", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:latest": ":image_with_creation_time", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}": ":image_with_creation_time", | ||
| }, | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| go_image_debug( | ||
| name = "image_debug", | ||
| image = ":image", | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| container_bundle( | ||
| name = "image_bundle_debug", | ||
| images = { | ||
| "gcr.io/prysmaticlabs/prysm/validator:latest-debug": ":image_debug", | ||
| "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}-debug": ":image_debug", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:latest-debug": ":image_debug", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}-debug": ":image_debug", | ||
| }, | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| go_image_alpine( | ||
| name = "image_alpine", | ||
| image = ":image", | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| container_bundle( | ||
| name = "image_bundle_alpine", | ||
| images = { | ||
| "gcr.io/prysmaticlabs/prysm/validator:latest-alpine": ":image_alpine", | ||
| "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}-alpine": ":image_alpine", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:latest-alpine": ":image_alpine", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}-alpine": ":image_alpine", | ||
| }, | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| docker_push( | ||
| name = "push_images", | ||
| bundle = ":image_bundle", | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| docker_push( | ||
| name = "push_images_debug", | ||
| bundle = ":image_bundle_debug", | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| docker_push( | ||
| name = "push_images_alpine", | ||
| bundle = ":image_bundle_alpine", | ||
| tags = ["manual"], | ||
| visibility = ["//validator:__pkg__"], | ||
| ) | ||
|
|
||
| go_binary( | ||
| name = "validator", | ||
| embed = [":go_default_library"], | ||
| pure = "off", # Enabled unless there is a valid reason to include cgo dep. | ||
| visibility = [ | ||
| "//endtoend:__pkg__", | ||
| "//validator:__subpackages__", | ||
| ], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = ["usage_test.go"], | ||
| embed = [":go_default_library"], | ||
| visibility = ["//validator:__pkg__"], | ||
| deps = [ | ||
| "//shared/featureconfig:go_default_library", | ||
| "@com_github_urfave_cli_v2//:go_default_library", | ||
| ], | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| def moved_targets(targets, new_package): | ||
| for target in targets: | ||
| native.alias( | ||
| name=target[1:], | ||
| actual=new_package+target, | ||
| deprecation="This target has moved to %s%s"%(new_package,target), | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,138 +1,19 @@ | ||
| load("@prysm//tools/go:def.bzl", "go_library") | ||
| load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_test") | ||
| load("@io_bazel_rules_docker//go:image.bzl", "go_image") | ||
| load("@io_bazel_rules_docker//container:container.bzl", "container_bundle", "container_image") | ||
| load("//tools:go_image.bzl", "go_image_alpine", "go_image_debug") | ||
| load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push") | ||
|
|
||
| go_library( | ||
| name = "go_default_library", | ||
| srcs = [ | ||
| "log.go", | ||
| "main.go", | ||
| "usage.go", | ||
| ], | ||
| importpath = "github.com/prysmaticlabs/prysm/validator", | ||
| visibility = ["//validator:__subpackages__"], | ||
| deps = [ | ||
| "//shared/cmd:go_default_library", | ||
| "//shared/debug:go_default_library", | ||
| "//shared/featureconfig:go_default_library", | ||
| "//shared/fileutil:go_default_library", | ||
| "//shared/journald:go_default_library", | ||
| "//shared/logutil:go_default_library", | ||
| "//shared/maxprocs:go_default_library", | ||
| "//shared/tos:go_default_library", | ||
| "//shared/version:go_default_library", | ||
| "//validator/accounts:go_default_library", | ||
| "//validator/db:go_default_library", | ||
| "//validator/flags:go_default_library", | ||
| "//validator/node:go_default_library", | ||
| "//validator/slashing-protection:go_default_library", | ||
| "@com_github_joonix_log//:go_default_library", | ||
| "@com_github_sirupsen_logrus//:go_default_library", | ||
| "@com_github_urfave_cli_v2//:go_default_library", | ||
| "@com_github_x_cray_logrus_prefixed_formatter//:go_default_library", | ||
| ], | ||
| ) | ||
|
|
||
| go_image( | ||
| name = "image", | ||
| base = select({ | ||
| "//tools:base_image_alpine": "//tools:alpine_cc_image", | ||
| "//tools:base_image_cc": "//tools:cc_image", | ||
| "//conditions:default": "//tools:cc_image", | ||
| }), | ||
| binary = ":validator", | ||
| tags = ["manual"], | ||
| visibility = ["//visibility:private"], | ||
| ) | ||
|
|
||
| container_image( | ||
| name = "image_with_creation_time", | ||
| base = "image", | ||
| stamp = True, | ||
| ) | ||
|
|
||
| container_bundle( | ||
| name = "image_bundle", | ||
| images = { | ||
| "gcr.io/prysmaticlabs/prysm/validator:latest": ":image_with_creation_time", | ||
| "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}": ":image_with_creation_time", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:latest": ":image_with_creation_time", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}": ":image_with_creation_time", | ||
| }, | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| go_image_debug( | ||
| name = "image_debug", | ||
| image = ":image", | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| container_bundle( | ||
| name = "image_bundle_debug", | ||
| images = { | ||
| "gcr.io/prysmaticlabs/prysm/validator:latest-debug": ":image_debug", | ||
| "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}-debug": ":image_debug", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:latest-debug": ":image_debug", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}-debug": ":image_debug", | ||
| }, | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| go_image_alpine( | ||
| name = "image_alpine", | ||
| image = ":image", | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| container_bundle( | ||
| name = "image_bundle_alpine", | ||
| images = { | ||
| "gcr.io/prysmaticlabs/prysm/validator:latest-alpine": ":image_alpine", | ||
| "gcr.io/prysmaticlabs/prysm/validator:{DOCKER_TAG}-alpine": ":image_alpine", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:latest-alpine": ":image_alpine", | ||
| "index.docker.io/prysmaticlabs/prysm-validator:{DOCKER_TAG}-alpine": ":image_alpine", | ||
| }, | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| docker_push( | ||
| name = "push_images", | ||
| bundle = ":image_bundle", | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| docker_push( | ||
| name = "push_images_debug", | ||
| bundle = ":image_bundle_debug", | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| docker_push( | ||
| name = "push_images_alpine", | ||
| bundle = ":image_bundle_alpine", | ||
| tags = ["manual"], | ||
| ) | ||
|
|
||
| go_binary( | ||
| name = "validator", | ||
| embed = [":go_default_library"], | ||
| pure = "off", # Enabled unless there is a valid reason to include cgo dep. | ||
| visibility = [ | ||
| "//endtoend:__pkg__", | ||
| "//validator:__subpackages__", | ||
| ], | ||
| ) | ||
|
|
||
| go_test( | ||
| name = "go_default_test", | ||
| srcs = ["usage_test.go"], | ||
| embed = [":go_default_library"], | ||
| deps = [ | ||
| "//shared/featureconfig:go_default_library", | ||
| "@com_github_urfave_cli_v2//:go_default_library", | ||
| load("//tools:target_migration.bzl", "moved_targets") | ||
|
|
||
| moved_targets( | ||
| [ | ||
| ":push_images_debug", | ||
| ":push_images_alpine", | ||
| ":push_images", | ||
| ":image_bundle_debug", | ||
| ":image_debug", | ||
| ":image_bundle_alpine", | ||
| ":image_bundle", | ||
| ":image_with_creation_time", | ||
| ":image_alpine", | ||
| ":image", | ||
| ":go_default_test", | ||
| ":validator", | ||
| ], | ||
| "//cmd/validator", | ||
| ) |
Oops, something went wrong.