refactor: remove service resolver fallbacks (#3955)

2026-08-06 13:27:43 +00:00 · 2026-06-27 19:35:43 +08:00
parent 4732f4ee2d
commit 243a20b14e
5 changed files with 140 additions and 73 deletions
@@ -5,7 +5,7 @@ Status values: `[ ]` not started, `[~]` in progress, `[x]` complete, `[!]` block
 ## Current Context

 - Issue: [`rustfs/backlog#660`](https://github.com/rustfs/backlog/issues/660)
- Branch: `overtrue/arch-runtime-fallback-boundary-cleanup`
+- Branch: `overtrue/arch-runtime-default-resolver-fallback-removal`
 - Baseline: completed `C-011/C-012/C-013/API-055/API-059/API-079/API-080/API-081/API-082/API-083/API-084/API-085/API-086/API-087/API-088/API-089/API-090/API-091/API-092/API-093/API-094/API-095/API-096/API-097/API-098/API-099/API-100/API-101/API-102/API-103/API-104/API-105/API-106/API-107/API-108/API-109/API-110/API-111/API-112/API-113/API-114/API-115/API-116/API-117/API-118/API-119/API-120/API-121/API-122/API-123/API-124/API-125/API-126/API-127/API-128/API-129/API-130/API-131/API-132/API-133/API-134/API-135/API-136/API-137/API-138/API-139/API-140/API-141/API-142/API-143/API-144/API-145/API-146/API-147/API-148/API-149/API-150/API-151/API-152/API-153/API-154/API-155/API-156/API-157/API-158/API-159/API-160/API-161/API-162/API-163/API-164/API-165/API-166/API-167/API-168/API-169/API-170/API-171/API-172/API-173/API-174/API-175/API-176/API-177/API-178/API-179/API-180/API-181/API-182/API-183/API-184/API-185/API-186/API-187/API-188/API-189/API-190/API-191/API-192/API-193/API-194/API-195/API-196/API-197/API-198/API-199/API-200/API-201/API-202/API-203/API-204/API-205/API-206/API-207/API-208/API-209/API-210/API-211/API-212/API-213/API-214/API-215/API-216/API-217/API-218/API-219/API-220/API-221/API-222/API-223/API-224/API-225/API-226/API-227/API-228/API-229/API-230/API-231/API-232/API-233/API-234/API-235/API-236/API-237/API-238/API-239/API-240/API-241/API-242/API-243/API-244/API-245/API-246/API-247/API-248/API-249/API-250/API-251/API-252/API-253/API-254/CTX-002`.
 - Current baseline also includes API-255 from PR #3923, API-256 from PR
  #3925, CFG-009 from PR #3927, C-007/C-009 from PR #3935, C-008/C-010
@@ -21,18 +21,24 @@ Status values: `[ ]` not started, `[~]` in progress, `[x]` complete, `[!]` block
  alias sweep from PR #3949, the GLOB-007 object-store fallback removal from
  PR #3950, the GLOB-007 notification-system/server-config fallback removal
  from PR #3951, the GLOB-007 optional runtime handle fallback removal from
-  PR #3952, and the GLOB-007 AppContext-only fallback signature cleanup from
-  PR #3953.
- Current phase PR: GLOB-007 runtime resolver fallback boundary cleanup.
- Based on: `origin/main` after PR #3953 merged.
+  PR #3952, the GLOB-007 AppContext-only fallback signature cleanup from
+  PR #3953, and the GLOB-007 runtime resolver fallback boundary cleanup from
+  PR #3954.
+- Current phase PR: GLOB-007 service/credential resolver fallback removal.
+- Based on: current `origin/main` after PR #3954 merged.
 - PR type for this branch: `ci-gate`.
- Runtime behavior changes: none intended; public runtime facades keep their
-  existing no-AppContext fallback behavior.
- Rust code changes: move remaining resolver helper fallback parameters to the
-  public facade boundary for KMS, IAM, TLS, metrics, S3 Select, node identity,
-  tier/expiry, credentials, runtime port, and buffer config reads.
+- Runtime behavior changes: when no AppContext is published, service/credential
+  resolvers for KMS manager lookup, encryption service, IAM readiness/handle,
+  ready IAM handle, and action credentials now return their empty/error state
+  instead of consulting legacy globals.
+- Rust code changes: remove those public no-AppContext fallbacks, delete the
+  now-unused legacy runtime-source adapters, and pass object ZIP download token
+  signing credentials explicitly after resolving them at handler boundaries.
+  SSE/KMS tests now inject their test KMS service manager explicitly instead of
+  relying on no-AppContext fallback reads.
 - CI/script changes: none intended.
- Docs changes: update this progress ledger for the fallback boundary cleanup.
+- Docs changes: update this progress ledger for the service/credential fallback
+  removal.

 ## Phase 0 Tasks

@@ -2826,6 +2832,9 @@ Status values: `[ ]` not started, `[~]` in progress, `[x]` complete, `[!]` block
  - Current slice: move the remaining resolver helper fallback parameters to
    public runtime facade boundaries, preserving no-AppContext fallback behavior
    while making private helpers context-only.
+  - Current slice: remove the public no-AppContext legacy fallbacks from
+    service/credential resolvers for KMS manager lookup, encryption service,
+    IAM readiness/handle, ready IAM handle, and action credentials.
  - Remaining work: remove the next fallback family per PR only after scans
    prove no production caller depends on it.
  - Verification: focused RustFS compile and admin test-target compile,
@@ -6094,6 +6103,9 @@ Status values: `[ ]` not started, `[~]` in progress, `[x]` complete, `[!]` block

 | Expert | Status | Notes |
 |---|---|---|
+| Quality/architecture | pass | GLOB-007 removes the next cohesive service/credential fallback family without changing public resolver signatures or caller-side error handling contracts. |
+| Migration preservation | pass | AppContext-backed behavior is unchanged; absent AppContext now returns `None`, `false`, or `IamSysNotInitialized` for the affected service/credential resolvers instead of consulting legacy globals. |
+| Testing/verification | pass | Focused resolver, object ZIP download, and SSE/KMS tests passed; compile, formatting, architecture guard, service/credential fallback residual scan, diff hygiene, Rust risk scan, Rust quality scan, and full `make pre-pr` are required before PR. |
 | Quality/architecture | pass | GLOB-007 moves the remaining resolver helper fallback parameters out to public facade boundaries, making private helper paths context-only without hiding fallback closures. |
 | Migration preservation | pass | Public runtime facade names, return types, and no-AppContext fallback behavior are preserved; only helper signatures and focused resolver tests change. |
 | Testing/verification | pass | Focused resolver test, compile, formatting, architecture guard, fallback-boundary residual scan, diff hygiene, diff-added Rust risk scan, Rust quality scan, and full `make pre-pr` passed before PR. |
@@ -6487,6 +6499,28 @@ Status values: `[ ]` not started, `[~]` in progress, `[x]` complete, `[!]` block

 Passed before push:

+- Issue #660 GLOB-007 service/credential resolver fallback removal:
+  - Branch freshness check: rebased onto current `origin/main` after PR #3954
+    merged.
+  - `cargo test -p rustfs --lib app::context::tests::resolver_helpers_are_context_first_and_empty_when_context_is_absent`:
+    passed.
+  - `cargo test -p rustfs --lib admin::handlers::object_zip_download::tests`:
+    passed.
+  - `cargo test -p rustfs --lib storage::sse::tests::test_kms_sse_dek_provider_uses_latest_reconfigured_service`:
+    passed.
+  - `cargo check -p rustfs --lib`: passed.
+  - `cargo fmt --all`: passed.
+  - `cargo fmt --all --check`: passed.
+  - `git diff --check`: passed.
+  - `./scripts/check_architecture_migration_rules.sh`: passed.
+  - Service/credential fallback residual scan: passed.
+  - Removed runtime-source fallback adapter scan: passed.
+  - Diff-added Rust risk scan: passed.
+  - Rust code quality scan: passed.
+  - Three-expert review: passed.
+  - `make pre-pr`: passed (`nextest`: 6917 passed, 112 skipped; doctests
+    passed).
+
 - Issue #660 GLOB-007 runtime resolver fallback boundary cleanup:
  - Branch freshness check: moved onto `origin/main` after PR #3953 merged.
  - `cargo test -p rustfs --lib app::context::tests::resolver_helpers_are_context_first_and_empty_when_context_is_absent`: