Skip to content

refactor(config): drop the raise-only s3/ecr/aws store aliases; neutral store wording - #106

Merged
earakely-scale merged 2 commits into
mainfrom
edgararakelyan/neutral-store-wording
Oct 7, 2026
Merged

earakely-scale merged 2 commits into
mainfrom
edgararakelyan/neutral-store-wording

Conversation

@earakely-scale

@earakely-scale earakely-scale commented Oct 7, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Store configuration, docs and comments stop assuming S3, ECR or AWS Secrets Manager.

  • Config aliases: AGENT_ENV_OBJECT_STORE=s3, AGENT_ENV_IMAGE_STORE=ecr and AGENT_ENV_SECRET_STORE=aws each had a branch that only raised "has no built-in coordinates". Those three branches and their constants go. The generic unknown-store error now gives the same advice: configure the [stores.<kind>] table, and unset the env var, which overrides it. Those values still raise ConfigError; only the wording changes. The four tests that pinned the old wording now use an unknown name and still check that the message names both the table and the env var.
  • Config docstring, .env.example: "a hosted backend (S3, Cloud Storage)", "a hosted registry (ECR)", "a hosted secret manager (AWS Secrets Manager, Google Cloud Secret Manager)". _get_secret's error says what a bundle-backed store is instead of naming backends.
  • Comments: the local grant server and store, the document store, the servicedb loader (now naming tar_gz_object_url), the file-artifact upload, the artifact store, deploy-time signing, the universe bulk-download CLI and the env-state CLI say object store or hosted store.
  • Protocol:
    • The README says grants come from the S3, Cloud Storage and local stores.
    • preflight says "no store access".
    • The stalled-upload check _is_s3_request_timeout becomes _is_store_request_timeout, reading its body markers from a table. S3's RequestTimeout is the only entry; Cloud Storage answers a stall with a 408, which the status check already retries. Behaviour is unchanged.
  • Tests and tooling:
    • Three integration-test docstrings no longer claim to need AWS or a hosted Mongo; they run against the configured stores.
    • The image-cache helper's docstring says write-once object store.
    • make test's help says Docker and a local OCI registry.

Left alone on purpose:

No release needed: nothing changes behaviour, so this ships with the next one.

Testing

  • Unit + protocol: 6711 passed, 13 skipped.
  • Two failures: test_optional_extras_stay_optional[sail] and its sibling fail the same way on main. They read the installed distribution's metadata, and my venv's installed copy predates the sail extra.
  • Config tests: an unknown backend name for each of the object, image and secret stores raises with the table and the overriding env var named. Explain reports a section that can't resolve as an error, both at the top level and as a child.
  • Transfer retry: the existing parametrized test still retries S3's stalled-upload 400.

🤖 Generated with Claude Code

RetriggerConfidence Score: 5/5

The PR appears safe to merge, though the make test help should be corrected.

Fix All in CursorFindings

  1. P2 Tests do not skip without uv ▶
Fix with agent prompt
### Issue 1
Makefile:68
The `make test` help says tests needing `uv` skip when it is missing. But the container-journey tests only check for Docker, then call `uv` through their fixtures. If Docker is available but `uv` is missing, `make test` fails instead of skipping those tests. Say that the container journey needs `uv`, or add a skip check.

---

For each issue above, determine whether it is valid and should be fixed. If so, fix it directly.

Summary

Store configuration errors and project wording no longer treat S3, ECR, or AWS as the only hosted options. The PR also makes stalled-upload retry matching store-neutral while keeping its current behavior.

  • Unknown store names point to the right config table.
  • Stalled-upload retries use store-neutral matching.
  • Store docs and comments name configured backends.

Reviews (2) · Last reviewed commit: "chore(make): say which tiers make test r..." · Reviewed by Greptile

…al store wording

The s3, ecr and aws values for AGENT_ENV_{OBJECT,IMAGE,SECRET}_STORE only raised a ConfigError
saying the backend has no built-in coordinates. The generic unknown-store error now carries the
same advice (configure the [stores.<kind>] table, unset the env var that overrides it), so the
three aliases and their constants go, and the tests that pinned them use an unknown name.

Docs, comments and messages that assumed S3, ECR or AWS Secrets Manager now say object store,
hosted backend or hosted registry, naming S3 and Cloud Storage together where an example helps.
The protocol's stalled-upload check reads its body markers from a table (S3's RequestTimeout is
the one entry); behaviour is unchanged. Stale integration-test docstrings that required AWS or
Atlas now say they run against the configured stores.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
@earakely-scale
earakely-scale requested a review from a team as a code owner October 7, 2026 22:25
Comment thread Makefile Outdated
…s tools

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Comment thread Makefile
else status=$$?; echo "kept $$work to inspect"; exit $$status; fi

test: ## Run the full test suite (includes integration; requires Docker/Mongo/AWS)
test: ## Run every tier: unit, integration and installer (needs Docker and a local OCI registry; tests needing uv, pipx, a model endpoint or a remote sandbox skip without them)

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Tests do not skip without uv

The make test help says tests needing uv skip when it is missing. But the container-journey tests only check for Docker, then call uv through their fixtures. If Docker is available but uv is missing, make test fails instead of skipping those tests. Say that the container journey needs uv, or add a skip check.

Prompt To Fix With AI
This is a comment left during a code review.
Path: Makefile
Line: 68

Comment:
**Tests do not skip without uv**

The `make test` help says tests needing `uv` skip when it is missing. But the container-journey tests only check for Docker, then call `uv` through their fixtures. If Docker is available but `uv` is missing, `make test` fails instead of skipping those tests. Say that the container journey needs `uv`, or add a skip check.

---

For each issue above, determine whether it is valid and should be fixed. If so, fix it directly.

Fix in Cursor Fix in Claude Code Fix in Codex

@earakely-scale
earakely-scale merged commit c1a1018 into main Oct 7, 2026
13 checks passed
@earakely-scale
earakely-scale deleted the edgararakelyan/neutral-store-wording branch October 7, 2026 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant