From 48c82ac79a23e57ae90642e30c32f9fd8f344440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesu=CC=81s=20Pe=CC=81rez?= Date: Fri, 17 Apr 2026 12:20:21 +0100 Subject: [PATCH] refactor(10 files): selective imports batch 4 (ADR-025 L2) 10 utils/* + workspace/migrate_to_kcl + mode/* files. Selective imports: utils/imports.nu accessor/functions [get-providers-path get-prov-lib-path get-core-nulib-path] utils/logging.nu accessor/core [config-get] utils/generate.nu accessor/functions [2 symbols] utils/files.nu accessor/core [config-get] + secrets/lib [decode_secret_file] utils/qr.nu accessor/functions [get-provisioning-url] utils/undefined.nu interface + init (kept); accessor DEAD utils/interface.nu accessor/core [config-get] + accessor/functions [get-provisioning-url] + logging [is-debug-enabled] Dead imports dropped: workspace/migrate_to_kcl.nu config/accessor mode/commands.nu utils/logging mode/validator.nu utils/logging Validation: all 10 match pre-existing baselines (25/50/42/2 for noisy files, 0 for the others). No new errors. Refs: ADR-025 --- nulib/lib_provisioning/mode/commands.nu | 2 +- nulib/lib_provisioning/mode/validator.nu | 2 +- nulib/lib_provisioning/utils/files.nu | 5 +++-- nulib/lib_provisioning/utils/generate.nu | 5 ++++- nulib/lib_provisioning/utils/imports.nu | 5 ++++- nulib/lib_provisioning/utils/interface.nu | 6 ++++-- nulib/lib_provisioning/utils/logging.nu | 3 ++- nulib/lib_provisioning/utils/qr.nu | 3 ++- nulib/lib_provisioning/utils/undefined.nu | 6 +++--- nulib/lib_provisioning/workspace/migrate_to_kcl.nu | 2 +- 10 files changed, 25 insertions(+), 14 deletions(-) diff --git a/nulib/lib_provisioning/mode/commands.nu b/nulib/lib_provisioning/mode/commands.nu index 1c3d5f2..8b1a0c7 100644 --- a/nulib/lib_provisioning/mode/commands.nu +++ b/nulib/lib_provisioning/mode/commands.nu @@ -7,7 +7,7 @@ # - cicd: CI/CD pipeline execution # - enterprise: Production enterprise deployment -use ../utils/logging.nu * +# utils/logging star-import was dead — dropped (ADR-025 Phase 3 Layer 2). # Get current active mode export def "mode current" [] -> record { diff --git a/nulib/lib_provisioning/mode/validator.nu b/nulib/lib_provisioning/mode/validator.nu index c4f375f..85545a4 100644 --- a/nulib/lib_provisioning/mode/validator.nu +++ b/nulib/lib_provisioning/mode/validator.nu @@ -1,7 +1,7 @@ # Mode Configuration Validator # Validates mode configurations against Nickel schemas and runtime requirements -use ../utils/logging.nu * +# utils/logging star-import was dead — dropped (ADR-025 Phase 3 Layer 2). # Validate complete mode configuration export def validate-mode-config [ diff --git a/nulib/lib_provisioning/utils/files.nu b/nulib/lib_provisioning/utils/files.nu index efc998a..9d77760 100644 --- a/nulib/lib_provisioning/utils/files.nu +++ b/nulib/lib_provisioning/utils/files.nu @@ -1,6 +1,7 @@ use std -use ../config/accessor.nu * -use ../secrets/lib.nu decode_secret_file +# Selective imports (ADR-025 Phase 3 Layer 2). +use lib_provisioning/config/accessor/core.nu [config-get] +use lib_provisioning/secrets/lib.nu [decode_secret_file] use ../secrets/lib.nu get_secret_provider export def find_file [ diff --git a/nulib/lib_provisioning/utils/generate.nu b/nulib/lib_provisioning/utils/generate.nu index c89368e..895257a 100644 --- a/nulib/lib_provisioning/utils/generate.nu +++ b/nulib/lib_provisioning/utils/generate.nu @@ -3,7 +3,10 @@ # Release: 1.0.4 # Date: 6-2-2024 -use ../config/accessor.nu * +# Selective imports (ADR-025 Phase 3 Layer 2). +use lib_provisioning/config/accessor/functions.nu [ + get-provisioning-generate-dirpath get-provisioning-generate-defsfile +] #use ../lib_provisioning/utils/templates.nu on_template_path diff --git a/nulib/lib_provisioning/utils/imports.nu b/nulib/lib_provisioning/utils/imports.nu index 6032330..4cc313f 100644 --- a/nulib/lib_provisioning/utils/imports.nu +++ b/nulib/lib_provisioning/utils/imports.nu @@ -1,7 +1,10 @@ # Import Helper Functions # Provides clean, environment-based imports to avoid relative paths -use ../config/accessor.nu * +# Selective imports (ADR-025 Phase 3 Layer 2). +use lib_provisioning/config/accessor/functions.nu [ + get-providers-path get-prov-lib-path get-core-nulib-path +] # Provider middleware imports export def prov-middleware [] { diff --git a/nulib/lib_provisioning/utils/interface.nu b/nulib/lib_provisioning/utils/interface.nu index 21baa3d..a3effd9 100644 --- a/nulib/lib_provisioning/utils/interface.nu +++ b/nulib/lib_provisioning/utils/interface.nu @@ -2,8 +2,10 @@ # Purpose: Provides terminal UI utilities: output formatting, prompts, spinners, and status displays. # Dependencies: error for error handling, logging for debug utilities -use ../config/accessor.nu * -use logging.nu [is-debug-enabled] +# Selective imports (ADR-025 Phase 3 Layer 2). +use lib_provisioning/config/accessor/core.nu [config-get] +use lib_provisioning/config/accessor/functions.nu [get-provisioning-url] +use lib_provisioning/utils/logging.nu [is-debug-enabled] # Check if no-terminal mode is enabled export def get-provisioning-no-terminal [] { diff --git a/nulib/lib_provisioning/utils/logging.nu b/nulib/lib_provisioning/utils/logging.nu index 2d38315..9af42c8 100644 --- a/nulib/lib_provisioning/utils/logging.nu +++ b/nulib/lib_provisioning/utils/logging.nu @@ -1,6 +1,7 @@ # Enhanced logging system for provisioning tool -use ../config/accessor.nu * +# Selective imports (ADR-025 Phase 3 Layer 2). +use lib_provisioning/config/accessor/core.nu [config-get] # Check if debug mode is enabled export def is-debug-enabled [] { diff --git a/nulib/lib_provisioning/utils/qr.nu b/nulib/lib_provisioning/utils/qr.nu index 1f7e197..641c0b3 100644 --- a/nulib/lib_provisioning/utils/qr.nu +++ b/nulib/lib_provisioning/utils/qr.nu @@ -1,4 +1,5 @@ -use ../config/accessor.nu * +# Selective imports (ADR-025 Phase 3 Layer 2). +use lib_provisioning/config/accessor/functions.nu [get-provisioning-url] # Display QR code for URL using qr_maker plugin or fallback def show_qr [url: string]: nothing -> nothing { diff --git a/nulib/lib_provisioning/utils/undefined.nu b/nulib/lib_provisioning/utils/undefined.nu index af53672..b250b95 100644 --- a/nulib/lib_provisioning/utils/undefined.nu +++ b/nulib/lib_provisioning/utils/undefined.nu @@ -1,6 +1,6 @@ -use ../config/accessor.nu * -use interface.nu [_ansi _print end_run] -use init.nu [get-provisioning-name] +# config/accessor star-import was dead — dropped (ADR-025 Phase 3 Layer 2). +use lib_provisioning/utils/interface.nu [_ansi _print end_run] +use lib_provisioning/utils/init.nu [get-provisioning-name] export def option_undefined [ root: string diff --git a/nulib/lib_provisioning/workspace/migrate_to_kcl.nu b/nulib/lib_provisioning/workspace/migrate_to_kcl.nu index d25bbef..c40e149 100644 --- a/nulib/lib_provisioning/workspace/migrate_to_kcl.nu +++ b/nulib/lib_provisioning/workspace/migrate_to_kcl.nu @@ -2,7 +2,7 @@ # Converts existing provisioning.yaml workspace configs to Nickel format # Error handling: do/complete pattern with exit_code checks (no try-catch) -use ../config/accessor.nu * +# config/accessor star-import was dead — dropped (ADR-025 Phase 3 Layer 2). use ../utils/nickel_processor.nu [ncl-eval] # ============================================================================