Skip to content

Commit

Permalink
rename imports
Browse files Browse the repository at this point in the history
  • Loading branch information
5h4d0w4rt committed Nov 3, 2021
1 parent 85883cd commit 69553b8
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 40 deletions.
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@//prometheus:defs.bzl", "prometheus", "promtool")
load("@io_bazel_rules_prometheus//prometheus:defs.bzl", "prometheus", "promtool")
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

package(default_visibility = ["//visibility:public"])
Expand Down
2 changes: 1 addition & 1 deletion deps.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(
"@//prometheus:defs.bzl",
"@io_bazel_rules_prometheus//prometheus:defs.bzl",
_prometheus_repositories = "prometheus_repositories",
_prometheus_toolchains = "prometheus_toolchains",
)
Expand Down
2 changes: 1 addition & 1 deletion examples/BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@//prometheus:defs.bzl", "promtool_config_test", "promtool_rules_test", "promtool_unit_test")
load("@io_bazel_rules_prometheus//prometheus:defs.bzl", "promtool_config_test", "promtool_rules_test", "promtool_unit_test")

promtool_unit_test(
name = "unit_test_rules_yml",
Expand Down
15 changes: 8 additions & 7 deletions prometheus/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,20 @@ exports_files([
bzl_library(
name = "api",
srcs = [
"@//prometheus/internal:defaults",
"@//prometheus/internal:platforms",
"@//prometheus/internal:prom",
"@//prometheus/internal:promtool",
"@//prometheus/internal:providers",
"@//prometheus/internal:repositories",
"@//prometheus/internal:toolchain",
"@io_bazel_rules_prometheus//prometheus/internal:defaults",
"@io_bazel_rules_prometheus//prometheus/internal:platforms",
"@io_bazel_rules_prometheus//prometheus/internal:prom",
"@io_bazel_rules_prometheus//prometheus/internal:promtool",
"@io_bazel_rules_prometheus//prometheus/internal:providers",
"@io_bazel_rules_prometheus//prometheus/internal:repositories",
"@io_bazel_rules_prometheus//prometheus/internal:toolchain",
],
)

bzl_library(
name = "defs",
srcs = ["defs.bzl"],
visibility = ["//visibility:public"],
deps = [
":api",
],
Expand Down
8 changes: 4 additions & 4 deletions prometheus/defs.bzl
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
load(
"@//prometheus/internal:repositories.bzl",
"@io_bazel_rules_prometheus//prometheus/internal:repositories.bzl",
_prometheus_repositories = "prometheus_repositories",
)
load(
"@//prometheus/internal:promtool.bzl",
"@io_bazel_rules_prometheus//prometheus/internal:promtool.bzl",
_promtool = "promtool",
_promtool_config_test = "promtool_config_test",
_promtool_rules_test = "promtool_rules_test",
_promtool_unit_test = "promtool_unit_test",
)
load(
"@//prometheus/internal:prom.bzl",
"@io_bazel_rules_prometheus//prometheus/internal:prom.bzl",
_prometheus = "prometheus",
)
load(
"@//prometheus/internal:toolchain.bzl",
"@io_bazel_rules_prometheus//prometheus/internal:toolchain.bzl",
_prometheus_toolchains = "prometheus_toolchains",
)

Expand Down
4 changes: 2 additions & 2 deletions prometheus/internal/BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("@//prometheus/internal:toolchain.bzl", "declare_toolchains")
load("@//prometheus/internal:platforms.bzl", "declare_platforms")
load("@io_bazel_rules_prometheus//prometheus/internal:toolchain.bzl", "declare_toolchains")
load("@io_bazel_rules_prometheus//prometheus/internal:platforms.bzl", "declare_platforms")

package(
default_visibility = [
Expand Down
2 changes: 1 addition & 1 deletion prometheus/internal/defaults.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load(
"@//prometheus/internal:providers.bzl",
"@io_bazel_rules_prometheus//prometheus/internal:providers.bzl",
"AlertmanagerBinaryInfo",
"PrometheusBinaryInfo",
"PrometheusPackageInfo",
Expand Down
2 changes: 1 addition & 1 deletion prometheus/internal/platforms.bzl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@//prometheus/internal:defaults.bzl", "DEFAULT_PLATFORMS")
load("@io_bazel_rules_prometheus//prometheus/internal:defaults.bzl", "DEFAULT_PLATFORMS")
load("@bazel_skylib//lib:structs.bzl", "structs")

INCOMPATIBLE = "@platforms//:incompatible"
Expand Down
10 changes: 5 additions & 5 deletions prometheus/internal/prom.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ scrape_configs:

def _prometheus_impl(ctx):
prom_info = (
ctx.toolchains["@//prometheus:toolchain"]
ctx.toolchains["@io_bazel_rules_prometheus//prometheus:toolchain"]
.prometheusToolchainInfo
.prometheus
)
Expand All @@ -63,12 +63,12 @@ _prometheus = rule(
doc = """Private rule implemented for invocation in public prometheus() runner""",
attrs = {
"_template": attr.label(
default = Label("@//prometheus/internal:prom.manual_runner.sh.tpl"),
default = Label("@io_bazel_rules_prometheus//prometheus/internal:prom.manual_runner.sh.tpl"),
allow_single_file = True,
),
},
executable = True,
toolchains = ["@//prometheus:toolchain"],
toolchains = ["@io_bazel_rules_prometheus//prometheus:toolchain"],
)

def prometheus(name, **kwargs):
Expand Down Expand Up @@ -108,7 +108,7 @@ def prometheus(name, **kwargs):

def _prometheus_server_impl(ctx):
prom_info = (
ctx.toolchains["@//prometheus:toolchain"]
ctx.toolchains["@io_bazel_rules_prometheus//prometheus:toolchain"]
.prometheusToolchainInfo
.prometheus
)
Expand Down Expand Up @@ -172,5 +172,5 @@ prometheus_server = rule(
"scrape_jobs": attr.string(default = ""),
"additional_contents": attr.string(default = ""),
},
toolchains = ["@//prometheus:toolchain"],
toolchains = ["@io_bazel_rules_prometheus//prometheus:toolchain"],
)
18 changes: 9 additions & 9 deletions prometheus/internal/promtool.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
def _promtool_impl(ctx):
promtool_info = (
ctx.toolchains["@//prometheus:toolchain"]
ctx.toolchains["@io_bazel_rules_prometheus//prometheus:toolchain"]
.prometheusToolchainInfo
.promtool
)
Expand All @@ -26,12 +26,12 @@ _promtool = rule(
doc = """Private rule implemented for invocation in public promtool() runner""",
attrs = {
"_template": attr.label(
default = Label("@//prometheus/internal:promtool.manual_runner.sh.tpl"),
default = Label("@io_bazel_rules_prometheus//prometheus/internal:promtool.manual_runner.sh.tpl"),
allow_single_file = True,
),
},
executable = True,
toolchains = ["@//prometheus:toolchain"],
toolchains = ["@io_bazel_rules_prometheus//prometheus:toolchain"],
)

def promtool(name, **kwargs):
Expand Down Expand Up @@ -74,7 +74,7 @@ def _promtool_unit_test_impl(ctx):
# To ensure the files needed by the script are available, we put them in
# the runfiles.
promtool_info = (
ctx.toolchains["@//prometheus:toolchain"]
ctx.toolchains["@io_bazel_rules_prometheus//prometheus:toolchain"]
.prometheusToolchainInfo
.promtool
)
Expand Down Expand Up @@ -140,7 +140,7 @@ bazel test //examples:unit_test_rules_yml
doc = "List of Rules-under-Test file targets",
),
},
toolchains = ["@//prometheus:toolchain"],
toolchains = ["@io_bazel_rules_prometheus//prometheus:toolchain"],
)

def _promtool_config_test_impl(ctx):
Expand All @@ -150,7 +150,7 @@ def _promtool_config_test_impl(ctx):
# the runfiles.

promtool_info = (
ctx.toolchains["@//prometheus:toolchain"]
ctx.toolchains["@io_bazel_rules_prometheus//prometheus:toolchain"]
.prometheusToolchainInfo
.promtool
)
Expand Down Expand Up @@ -206,12 +206,12 @@ bazel test //examples:test_config_yml
doc = "List of prometheus configuration targets",
),
},
toolchains = ["@//prometheus:toolchain"],
toolchains = ["@io_bazel_rules_prometheus//prometheus:toolchain"],
)

def _promtool_rules_test_impl(ctx):
promtool_info = (
ctx.toolchains["@//prometheus:toolchain"]
ctx.toolchains["@io_bazel_rules_prometheus//prometheus:toolchain"]
.prometheusToolchainInfo
.promtool
)
Expand Down Expand Up @@ -265,5 +265,5 @@ bazel test //examples:test_rules_yml
doc = "List of Prometheus rules file targets",
),
},
toolchains = ["@//prometheus:toolchain"],
toolchains = ["@io_bazel_rules_prometheus//prometheus:toolchain"],
)
4 changes: 2 additions & 2 deletions prometheus/internal/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@//prometheus/internal:defaults.bzl", "DEFAULT_PROMETHEUS_PACKAGE_INFO")
load("@//prometheus/internal:providers.bzl", "HttpArchiveInfo")
load("@io_bazel_rules_prometheus//prometheus/internal:defaults.bzl", "DEFAULT_PROMETHEUS_PACKAGE_INFO")
load("@io_bazel_rules_prometheus//prometheus/internal:providers.bzl", "HttpArchiveInfo")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
Expand Down
12 changes: 6 additions & 6 deletions prometheus/internal/toolchain.bzl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@//prometheus/internal:providers.bzl", "AlertmanagerInfo", "AmtoolInfo", "PrometheusInfo", "PromtoolInfo")
load("@//prometheus/internal:defaults.bzl", "DEFAULT_PROMETHEUS_PACKAGE_INFO")
load("@io_bazel_rules_prometheus//prometheus/internal:providers.bzl", "AlertmanagerInfo", "AmtoolInfo", "PrometheusInfo", "PromtoolInfo")
load("@io_bazel_rules_prometheus//prometheus/internal:defaults.bzl", "DEFAULT_PROMETHEUS_PACKAGE_INFO")

PrometheusToolchainInfo = provider(
doc = "Prometheus Toolchain metadata, contains prometheus, alertmanager, promtool and amtool's necessary data",
Expand Down Expand Up @@ -63,8 +63,8 @@ def declare_toolchains(name = "declare_toolchains", _prometheus_package_info = D
name = "prometheus_{platform}".format(platform = platform),
prometheus = "@prometheus_{platform}//:prometheus".format(platform = platform),
promtool = "@prometheus_{platform}//:promtool".format(platform = platform),
promtool_executor_template = "@//prometheus/internal:promtool.sh.tpl",
prometheus_executor_template = "@//prometheus/internal:prometheus.sh.tpl",
promtool_executor_template = "@io_bazel_rules_prometheus//prometheus/internal:promtool.sh.tpl",
prometheus_executor_template = "@io_bazel_rules_prometheus//prometheus/internal:prometheus.sh.tpl",

# https://docs.bazel.build/versions/main/be/common-definitions.html#common.tags
# exclude toolchain from expanding on wildcard
Expand All @@ -77,11 +77,11 @@ def declare_toolchains(name = "declare_toolchains", _prometheus_package_info = D
target_compatible_with = platform_info.os_constraints + platform_info.cpu_constraints,
exec_compatible_with = platform_info.os_constraints + platform_info.cpu_constraints,
toolchain = ":prometheus_{platform}".format(platform = platform),
toolchain_type = "@//prometheus:toolchain",
toolchain_type = "@io_bazel_rules_prometheus//prometheus:toolchain",
)

def _link_toolchain_to_prometheus_toolchain(arch):
return "@//prometheus/internal:prometheus_toolchain_%s" % arch
return "@io_bazel_rules_prometheus//prometheus/internal:prometheus_toolchain_%s" % arch

def build_toolchains(architectures, toolchain_linker = _link_toolchain_to_prometheus_toolchain):
return [
Expand Down

0 comments on commit 69553b8

Please # to comment.