From 1d6af61f94d59e887167ffb354d67fb6a4e3503b Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Mon, 9 Oct 2023 12:48:20 -0700 Subject: [PATCH] feat: expose a config_setting for copy execution_requirements Fixes #604 --- docs/copy_directory.md | 4 +++- docs/copy_to_directory.md | 4 +++- lib/BUILD.bazel | 23 +++++++++++++++++++++++ lib/private/copy_common.bzl | 22 ++++++++++++++++++++-- lib/private/copy_directory.bzl | 10 +++++++--- lib/private/copy_file.bzl | 11 ++++++----- lib/private/copy_to_directory.bzl | 10 +++++++--- 7 files changed, 69 insertions(+), 15 deletions(-) diff --git a/docs/copy_directory.md b/docs/copy_directory.md index 407124b40..40ab46e1f 100644 --- a/docs/copy_directory.md +++ b/docs/copy_directory.md @@ -42,7 +42,8 @@ for more context. ## copy_directory_bin_action 
-copy_directory_bin_action(ctx, src, dst, copy_directory_bin, hardlink, verbose)
+copy_directory_bin_action(ctx, src, dst, copy_directory_bin, hardlink, verbose,
+                          override_execution_requirements)
Factory function that creates an action to copy a directory from src to dst using a tool binary. @@ -65,5 +66,6 @@ within other rule implementations. | copy_directory_bin | Copy to directory tool binary. | none | | hardlink | Controls when to use hardlinks to files instead of making copies.

See copy_directory rule documentation for more details. | "auto" | | verbose | If true, prints out verbose logs to stdout | False | +| override_execution_requirements | specify execution_requirements for this action | None | diff --git a/docs/copy_to_directory.md b/docs/copy_to_directory.md index 36e23bd84..b5f5c251c 100644 --- a/docs/copy_to_directory.md +++ b/docs/copy_to_directory.md @@ -73,7 +73,8 @@ for more information on supported globbing patterns. copy_to_directory_bin_action(ctx, name, dst, copy_to_directory_bin, files, targets, root_paths, include_external_repositories, include_srcs_packages, exclude_srcs_packages, include_srcs_patterns, exclude_srcs_patterns, - replace_prefixes, allow_overwrites, hardlink, verbose) + replace_prefixes, allow_overwrites, hardlink, verbose, + override_execution_requirements) Factory function to copy files to a directory using a tool binary. @@ -106,6 +107,7 @@ other rule implementations where additional_files can also be passed in. | allow_overwrites | If True, allow files to be overwritten if the same output file is copied to twice.

See copy_to_directory rule documentation for more details. | False | | hardlink | Controls when to use hardlinks to files instead of making copies.

See copy_to_directory rule documentation for more details. | "auto" | | verbose | If true, prints out verbose logs to stdout | False | +| override_execution_requirements | specify execution_requirements for this action | None | diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 3f1b13491..9761e87a7 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -1,6 +1,7 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") load("//lib:utils.bzl", "is_bzlmod_enabled") +load("//lib/private:copy_common.bzl", "copy_options") load("//lib/private:stamping.bzl", "stamp_build_setting") # Ensure that users building their own rules can dep on our bzl_library targets for their stardoc @@ -31,6 +32,28 @@ bool_flag( build_setting_default = True if is_bzlmod_enabled() else False, ) +bool_flag( + name = "copy_use_local_execution", + build_setting_default = True, + visibility = ["//visibility:public"], +) + +config_setting( + name = "copy_use_local_execution_setting", + flag_values = { + ":copy_use_local_execution": "true", + }, +) + +# Used in rules which spawn actions that copy files +copy_options( + name = "copy_options", + copy_use_local_execution = select({ + ":copy_use_local_execution_setting": True, + "//conditions:default": False, + }), +) + toolchain_type( name = "jq_toolchain_type", ) diff --git a/lib/private/copy_common.bzl b/lib/private/copy_common.bzl index aedb04ac6..b17d86f9c 100644 --- a/lib/private/copy_common.bzl +++ b/lib/private/copy_common.bzl @@ -1,7 +1,25 @@ "Helpers for copy rules" -# Hints for Bazel spawn strategy -COPY_EXECUTION_REQUIREMENTS = { +CopyOptionsInfo = provider("Options for running copy actions", fields = ["execution_requirements"]) + +def _copy_options_impl(ctx): + return CopyOptionsInfo( + execution_requirements = COPY_EXECUTION_REQUIREMENTS_LOCAL if ctx.attr.copy_use_local_execution else {}, + ) + +copy_options = rule(implementation = _copy_options_impl, attrs = {"copy_use_local_execution": attr.bool()}) + +# Helper function to be used when creating an action +def execution_requirements_for_copy(ctx): + if hasattr(ctx.attr, "_options") and CopyOptionsInfo in ctx.attr._options: + return ctx.attr._options[CopyOptionsInfo].execution_requirements + + # If the rule ctx doesn't expose the CopyOptions, the default is to run locally + return COPY_EXECUTION_REQUIREMENTS_LOCAL + +# When applied to execution_requirements of an action, these prevent the action from being +# sandboxed or remotely cached, for performance of builds that don't rely on RBE and build-without-bytes. +COPY_EXECUTION_REQUIREMENTS_LOCAL = { # ----------------+----------------------------------------------------------------------------- # no-remote | Prevents the action or test from being executed remotely or cached remotely. # | This is equivalent to using both `no-remote-cache` and `no-remote-exec`. diff --git a/lib/private/copy_directory.bzl b/lib/private/copy_directory.bzl index 5d15db97d..9b548d4ae 100644 --- a/lib/private/copy_directory.bzl +++ b/lib/private/copy_directory.bzl @@ -4,7 +4,7 @@ This rule copies a directory to another location using Bash (on Linux/macOS) or cmd.exe (on Windows). """ -load(":copy_common.bzl", _COPY_EXECUTION_REQUIREMENTS = "COPY_EXECUTION_REQUIREMENTS", _progress_path = "progress_path") +load(":copy_common.bzl", "execution_requirements_for_copy", _progress_path = "progress_path") def copy_directory_bin_action( ctx, @@ -12,7 +12,8 @@ def copy_directory_bin_action( dst, copy_directory_bin, hardlink = "auto", - verbose = False): + verbose = False, + override_execution_requirements = None): """Factory function that creates an action to copy a directory from src to dst using a tool binary. The tool binary will typically be the `@aspect_bazel_lib//tools/copy_directory` `go_binary` @@ -35,6 +36,8 @@ def copy_directory_bin_action( See copy_directory rule documentation for more details. verbose: If true, prints out verbose logs to stdout + + override_execution_requirements: specify execution_requirements for this action """ args = [ src.path, @@ -55,7 +58,7 @@ def copy_directory_bin_action( arguments = args, mnemonic = "CopyDirectory", progress_message = "Copying directory %s" % _progress_path(src), - execution_requirements = _COPY_EXECUTION_REQUIREMENTS, + execution_requirements = override_execution_requirements or execution_requirements_for_copy(ctx), ) def _copy_directory_impl(ctx): @@ -93,6 +96,7 @@ _copy_directory = rule( default = "auto", ), "verbose": attr.bool(), + "_options": attr.label(default = "//lib:copy_options"), # use '_tool' attribute for development only; do not commit with this attribute active since it # propagates a dependency on rules_go which would be breaking for users # "_tool": attr.label( diff --git a/lib/private/copy_file.bzl b/lib/private/copy_file.bzl index f47474473..1b3355c6b 100644 --- a/lib/private/copy_file.bzl +++ b/lib/private/copy_file.bzl @@ -24,11 +24,11 @@ cmd.exe (on Windows). `_copy_xfile` marks the resulting file executable, `_copy_file` does not. """ -load(":copy_common.bzl", _COPY_EXECUTION_REQUIREMENTS = "COPY_EXECUTION_REQUIREMENTS", _progress_path = "progress_path") +load(":copy_common.bzl", "execution_requirements_for_copy", _progress_path = "progress_path") load(":directory_path.bzl", "DirectoryPathInfo") load(":platform_utils.bzl", _platform_utils = "platform_utils") -def _copy_cmd(ctx, src, src_path, dst): +def _copy_cmd(ctx, src, src_path, dst, override_execution_requirements = None): # Most Windows binaries built with MSVC use a certain argument quoting # scheme. Bazel uses that scheme too to quote arguments. However, # cmd.exe uses different semantics, so Bazel's quoting is wrong here. @@ -65,10 +65,10 @@ def _copy_cmd(ctx, src, src_path, dst): mnemonic = mnemonic, progress_message = progress_message, use_default_shell_env = True, - execution_requirements = _COPY_EXECUTION_REQUIREMENTS, + execution_requirements = override_execution_requirements or execution_requirements_for_copy(ctx), ) -def _copy_bash(ctx, src, src_path, dst): +def _copy_bash(ctx, src, src_path, dst, override_execution_requirements = None): cmd_tmpl = "cp -f \"$1\" \"$2\"" mnemonic = "CopyFile" progress_message = "Copying file %s" % _progress_path(src) @@ -81,7 +81,7 @@ def _copy_bash(ctx, src, src_path, dst): mnemonic = mnemonic, progress_message = progress_message, use_default_shell_env = True, - execution_requirements = _COPY_EXECUTION_REQUIREMENTS, + execution_requirements = override_execution_requirements or execution_requirements_for_copy(ctx), ) def copy_file_action(ctx, src, dst, dir_path = None): @@ -154,6 +154,7 @@ _ATTRS = { "is_executable": attr.bool(mandatory = True), "allow_symlink": attr.bool(mandatory = True), "out": attr.output(mandatory = True), + "_options": attr.label(default = "//lib:copy_options"), } _copy_file = rule( diff --git a/lib/private/copy_to_directory.bzl b/lib/private/copy_to_directory.bzl index 1bb265aaa..4a623cddd 100644 --- a/lib/private/copy_to_directory.bzl +++ b/lib/private/copy_to_directory.bzl @@ -1,6 +1,6 @@ "copy_to_directory implementation" -load(":copy_common.bzl", _COPY_EXECUTION_REQUIREMENTS = "COPY_EXECUTION_REQUIREMENTS", _progress_path = "progress_path") +load(":copy_common.bzl", "execution_requirements_for_copy", _progress_path = "progress_path") load(":directory_path.bzl", "DirectoryPathInfo") load(":paths.bzl", "paths") @@ -254,6 +254,7 @@ _copy_to_directory_attr = { "verbose": attr.bool( doc = _copy_to_directory_attr_doc["verbose"], ), + "_options": attr.label(default = "//lib:copy_options"), # use '_tool' attribute for development only; do not commit with this attribute active since it # propagates a dependency on rules_go which would be breaking for users # "_tool": attr.label( @@ -324,7 +325,8 @@ def copy_to_directory_bin_action( replace_prefixes = {}, allow_overwrites = False, hardlink = "auto", - verbose = False): + verbose = False, + override_execution_requirements = None): """Factory function to copy files to a directory using a tool binary. The tool binary will typically be the `@aspect_bazel_lib//tools/copy_to_directory` `go_binary` @@ -383,6 +385,8 @@ def copy_to_directory_bin_action( See copy_to_directory rule documentation for more details. verbose: If true, prints out verbose logs to stdout + + override_execution_requirements: specify execution_requirements for this action """ # Replace "." in root_paths with the package name of the target @@ -491,7 +495,7 @@ def copy_to_directory_bin_action( arguments = [config_file.path], mnemonic = "CopyToDirectory", progress_message = "Copying files to directory %s" % _progress_path(dst), - execution_requirements = _COPY_EXECUTION_REQUIREMENTS, + execution_requirements = override_execution_requirements or execution_requirements_for_copy(ctx), ) copy_to_directory_lib = struct(