refactor: remove utils.home_directory and use get_home_directory from…

… Aspect bazel-lib utils instead (#1606)
aspect-build · May 14, 2024 · 1ffbd2a · 1ffbd2a
1 parent 52731cb
commit 1ffbd2a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/npm/extensions.bzl b/npm/extensions.bzl
@@ -2,6 +2,7 @@
 See https://bazel.build/docs/bzlmod#extension-definition
 """
 
+load("@aspect_bazel_lib//lib:repo_utils.bzl", "repo_utils")
 load("@bazel_features//:features.bzl", "bazel_features")
 load("//npm:repositories.bzl", "npm_import", "pnpm_repository", _LATEST_PNPM_VERSION = "LATEST_PNPM_VERSION")
 load("//npm/private:npm_translate_lock.bzl", "npm_translate_lock", "npm_translate_lock_lib")
@@ -97,7 +98,7 @@ def _npm_lock_imports_bzlmod(module_ctx, attr):
         (registries, npm_auth) = npm_translate_lock_helpers.get_npm_auth(npmrc, module_ctx.path(attr.npmrc), module_ctx.os.environ)
 
     if attr.use_home_npmrc:
-        home_directory = utils.home_directory(module_ctx)
+        home_directory = repo_utils.get_home_directory(module_ctx)
         if home_directory:
             home_npmrc_path = "{}/{}".format(home_directory, ".npmrc")
             home_npmrc = parse_npmrc(module_ctx.read(home_npmrc_path))

diff --git a/npm/private/npm_translate_lock_state.bzl b/npm/private/npm_translate_lock_state.bzl
@@ -493,7 +493,7 @@ def _load_npmrc(priv, rctx, npmrc_path):
 
 ################################################################################
 def _load_home_npmrc(priv, rctx):
-    home_directory = utils.home_directory(rctx)
+    home_directory = repo_utils.get_home_directory(rctx)
     if not home_directory:
         # buildifier: disable=print
         print("""

diff --git a/npm/private/utils.bzl b/npm/private/utils.bzl
@@ -399,9 +399,6 @@ if [ ! -f $1 ]; then exit 42; fi
     else:
         fail(INTERNAL_ERROR_MSG)
 
-def _home_directory(rctx):
-    return repo_utils.get_env_var(rctx, "HOME", None)
-
 def _replace_npmrc_token_envvar(token, npmrc_path, environ):
     # A token can be a reference to an environment variable
     if token.startswith("$"):
@@ -484,7 +481,6 @@ utils = struct(
     dicts_match = _dicts_match,
     reverse_force_copy = _reverse_force_copy,
     exists = _exists,
-    home_directory = _home_directory,
     replace_npmrc_token_envvar = _replace_npmrc_token_envvar,
     is_vendored_tarfile = _is_vendored_tarfile,
     is_tarball_extension = _is_tarball_extension,