Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Config file input #8

Merged
merged 6 commits into from
Oct 18, 2023
Merged

Config file input #8

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4cef88a
Add ability to reference external file
wrobstory Oct 13, 2023
a314edd
format file correctly in BUILD.bazel
wrobstory Oct 13, 2023
6a8bac8
Update tools
wrobstory Oct 18, 2023
fe7b6fd
Update tools and get this all working properly
wrobstory Oct 18, 2023
747edec
Fix test
wrobstory Oct 18, 2023
61876f0
Update depset
wrobstory Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions minidock/container_assemble.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@ def __container_assemble_impl(ctx):
merger_args.add("--upload-metadata-path").add(merger_upload_metadata_output.path)
merger_args.add("--config-path").add(merger_config_output.path)

if composed_external_config:
merger_args.add("--external-config-path").add(composed_external_config.config)
inputs = [merger_config_file]
for target in composed_external_config.config:
external_config_files = target.files.to_list()
inputs = inputs + external_config_files
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to linearize here. add_all accepts depsets: https://bazel.build/rules/lib/builtins/Args#add_all

so instead:

transdepsets = [composed_transitive_deps]
for target in composed_external_config.config:
    external_config_files = target.files
    transdepsets.append(external_config_files)
    merger_args.add("--external-config-path").add_all(external_config_files)


merger_input = depset([merger_config_file], transitive = transdepsets)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh intersting, i didnt know depset had an append, updating

merger_args.add("--external-config-path").add_all(external_config_files)

merger_input = depset([merger_config_file], transitive = [composed_transitive_deps])
merger_input = depset(inputs, transitive = [composed_transitive_deps])
ctx.actions.run(
inputs = merger_input,
outputs = [merger_config_output, merger_manifest_output, merger_upload_metadata_output, merger_manifest_sha256_output],
Expand Down
3 changes: 2 additions & 1 deletion minidock/container_compose.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@ container_compose = rule(
"layers": attr.label_list(
providers = [ContainerInfo],
),
"external_config": attr.label(
"external_config": attr.label_list(
doc = "External config file to be merged with this composition",
mandatory = False,
allow_files = True
)
},
implementation = __container_compose_impl,
Expand Down
12 changes: 1 addition & 11 deletions minidock/container_config.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@com_github_bazeltools_rules_minidock//minidock:providers.bzl", "ContainerInfo", "ExternalContainerConfig")
load("@com_github_bazeltools_rules_minidock//minidock:providers.bzl", "ContainerInfo")

def __expand_env(ctx, env):
env_lst = None
Expand Down Expand Up @@ -95,13 +95,3 @@ container_config = rule(
},
implementation = __container_config__impl,
)

def __external_config__impl(ctx):
return [ExternalContainerConfig(config = ctx.file.config)]

external_container_config = rule(
attrs = {
"config": attr.label(allow_single_file=True)
},
implementation = __external_config__impl
)
30 changes: 15 additions & 15 deletions minidock/remote_tools/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,63 +9,63 @@ def load_tools():
if "rules_minidock__merge_app_linux_x86_64" not in excludes:
load_tool(
name = "rules_minidock__merge_app_linux_x86_64",
sha256 = "9ae88eb012f6ddcdeef87e1bf0d2d050fac78e9007c78b3433d0ec44f0f20c4a",
sha256 = "a2f11bb0e135271a1d41a8812a2532e0ea8868d40ac89d00ac4e58b953b11e52",
packaged = False,
binary_path = "merge-app-linux-x86_64",
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/merge-app-linux-x86_64"],
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/merge-app-linux-x86_64"],
)

if "rules_minidock__merge_app_macos_x86_64" not in excludes:
load_tool(
name = "rules_minidock__merge_app_macos_x86_64",
sha256 = "2ebb3e2d31686399b61c188d3519ad7cb762fcbcb42f6037e65cfa10f1e55578",
sha256 = "1591fc03b647b6d399e26250dd30115463a44215a1e343a067b0c75f8404287b",
packaged = False,
binary_path = "merge-app-macos-x86_64",
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/merge-app-macos-x86_64"],
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/merge-app-macos-x86_64"],
)

if "rules_minidock__merge_app_macos_aarch64" not in excludes:
load_tool(
name = "rules_minidock__merge_app_macos_aarch64",
sha256 = "cf4ac984193348aa927ef567e18987e9fdceca04097d9386364b2537f20aa0bc",
sha256 = "4f3aa6d5984b138cd7af5811c346d53351d3ca02e8364d9072378965efb6240e",
packaged = False,
binary_path = "merge-app-macos-aarch64",
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/merge-app-macos-aarch64"],
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/merge-app-macos-aarch64"],
)

if "rules_minidock__pusher_app_linux_x86_64" not in excludes:
load_tool(
name = "rules_minidock__pusher_app_linux_x86_64",
sha256 = "5406a376c263cf135ab1a7b7821eee935cb7d8d9374ebf45beb6dee39bc4cb7c",
sha256 = "1c83cb1c84239cbaddf58bac1b43ae83546c8cf5ec51a3a9aae9e4e3bcd3b538",
packaged = False,
binary_path = "pusher-app-linux-x86_64",
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/pusher-app-linux-x86_64"],
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/pusher-app-linux-x86_64"],
)

if "rules_minidock__pusher_app_macos_x86_64" not in excludes:
load_tool(
name = "rules_minidock__pusher_app_macos_x86_64",
sha256 = "f109170cf9b486b8abbc8c1d581973d1c65ae5eb47ccaef2732f2d87f78be4b2",
sha256 = "d83b047bcbb47238a02897350f4f3ee24020f30cf70b0db7c226922d36d00b18",
packaged = False,
binary_path = "pusher-app-macos-x86_64",
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/pusher-app-macos-x86_64"],
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/pusher-app-macos-x86_64"],
)

if "rules_minidock__pusher_app_macos_aarch64" not in excludes:
load_tool(
name = "rules_minidock__pusher_app_macos_aarch64",
sha256 = "077b894ae88997010bc228cf0d6a86388ccb1772f3edfda9062c8071b1d0b6c4",
sha256 = "33298b9299acba15e90667b806305a52de6146614124c790ef7def9305ff5c5c",
packaged = False,
binary_path = "pusher-app-macos-aarch64",
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/pusher-app-macos-aarch64"],
urls = ["https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/pusher-app-macos-aarch64"],
)
if "rules_minidock__puller_app" not in excludes:
repo_rule_load_tool(
name="rules_minidock__puller_app",
platform_to_sha_pairs = {
"linux__x86_64": ["c9b1c867a481f40c3078fef4eacc27f11150cf383feb6b038a1f2bd832ab5f6a", "https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/puller-app-linux-x86_64"],
"macos__x86_64": ["09b6ae3d3b9375de67784d2fe127bdcaf4f4af10b3ee7258bc01f8d5cb462a55", "https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/puller-app-macos-x86_64"],
"macos__aarch64": ["d65f6d8c556bc5840aac7b2fb8152d2cc6a3ae28381cc3309cff671684bd63f4", "https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.56/puller-app-macos-aarch64"],
"linux__x86_64": ["a6d338d9df9b9c087421152387cc5be19431f6dcff5b4d476ab2aace762bb067", "https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/puller-app-linux-x86_64"],
"macos__x86_64": ["bd52783111fe6c22647d2b5dddb680e7f46d08338dc96867fcceee54864131cb", "https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/puller-app-macos-x86_64"],
"macos__aarch64": ["5cc25b21a749d5384b6c374b4f9a02ce26cee2ea8aa349f948e5d4ff645b47cd", "https://github.com/bazeltools/rules_minidock_tools/releases/download/v0.0.61/puller-app-macos-aarch64"],
}
)
# RUST_BINARIES_AUTO_GEN_REPLACE_SECTION_END
10 changes: 9 additions & 1 deletion scripts/ci_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@
env = data["config"]["Env"]

expected_cmd = ["/usr/bin/my_app"]
expected_labels = {"label1": "foo", "label2": "bar"}
expected_labels = {
"label1": "foo",
"label2": "bar",
"external-config-label-1": "extlabel1",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This verifies that our external configs are getting merged properly

"external-config-label-2": "extlabel2",
"external-config-label-3": "extlabel3",
"external-config-label-4": "extlabel4"
}
expected_user = "nfbasic"

assert(cmd == expected_cmd)
Expand All @@ -31,6 +38,7 @@
assert(len(env) > 2)
assert("ENV1=FOO" in env)
assert("ENV2=BAR" in env)
assert("EXTERNALENV1=extenv1" in env)

subprocess.run(["bazel", "clean", "--expunge"], check=True)
subprocess.run(["bazel", "build", "..."], check=True)
Expand Down
27 changes: 16 additions & 11 deletions tests/simple_flow/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ load(
"@com_github_bazeltools_rules_minidock//minidock:container_config.bzl",
"container_config",
)
load(
"@com_github_bazeltools_rules_minidock//minidock:container_config.bzl",
"external_container_config",
)

genrule(
name = "external_config_file",
outs = ["ConfigFile.json"],
Expand All @@ -43,6 +38,21 @@ EOF""",
stamp = 1,
)

genrule(
name = "external_config_file_2",
outs = ["ConfigFile2.json"],
cmd = """
cat << EOF > $@
{
"Labels": {
"external-config-label-3": "extlabel3",
"external-config-label-4": "extlabel4"
}
}
EOF""",
stamp = 1,
)

container_data(
name = "file_a_data",
files = ["file_a.txt"],
Expand All @@ -69,11 +79,6 @@ container_config(
"ENV2": "BAR"}
)

external_container_config(
name = "external_config_labels_and_env",
config = ":external_config_file"
)

container_compose(
name = "test_simple_imagen",
base = "@bazel_320//:metadata",
Expand All @@ -83,7 +88,7 @@ container_compose(
":user_and_app",
":labels_and_env",
],
external_config = ":external_config_labels_and_env"
external_config = [":external_config_file", ":external_config_file_2"]
)

container_assemble(
Expand Down