Skip to content

fix: read the secret marker as x-scalo-secret - #768

Draft
catinspace-au wants to merge 1 commit into
mainfrom
fix/contract-parity-scalo-secret
Draft

catinspace-au wants to merge 1 commit into
mainfrom
fix/contract-parity-scalo-secret

Conversation

@catinspace-au

@catinspace-au catinspace-au commented Oct 8, 2026 •

Copy link
Copy Markdown
Contributor

MERGE THIS TOGETHER WITH THE 2.2.1 FLEET REBUILD, not before. An app image built on an older scalo marks its secrets only as x-dfe-secret, and after this the engine no longer sees those marks. Fields whose names say they are credentials stay masked by the name rules either way, but a marked field with a plain name would not.

scalo marks a secret config field with x-scalo-secret alone now (hyperi-io/scalo-rs#293, hyperi-io/scalo-py#86). The engine reads that one name.

  • contract.py: SECRET_MARKERS becomes SECRET_MARKER = "x-scalo-secret", and _marked_secret keys on it. No dual read.
  • The app schema fixtures carry the marker under its new name, the name each app emits once rebuilt. Only the key changed: 121 lines across 13 files. The source.json refs still name the app commits the fixtures came from, so refresh them from the rebuilt apps when the fleet lands.
  • New test: every field an app marks reads as a secret, and the fixtures must carry a marker the reader keys on. It fails on the old fixtures.

Done when the engine treats every x-scalo-secret field in the app fixtures as a secret, CI is green, and the rebuilt fleet merges alongside.

Checks: hyperi-ci check --quick passed. The five test files that read the marker or the fixtures pass, 557 tests. The full suite was not run locally, to keep inside the /tmp inode limit.

scalo now marks a secret config field with x-scalo-secret alone, so the contract reader keys on that one name and no longer reads x-dfe-secret. SECRET_MARKERS becomes SECRET_MARKER.

The app schema fixtures under tests/fixtures/contract, contract-main and contract-acknowledgements carry the marker under its new name, the name each app emits once it is rebuilt on that scalo. A new test checks every field an app marks reads as a secret, and fails if the fixtures carry a marker the reader does not key on.

This must merge together with the 2.2.1 fleet rebuild. An app image built on an older scalo marks secrets only as x-dfe-secret, and this reader would no longer see those marks.
@catinspace-au

Copy link
Copy Markdown
Contributor Author

Back to draft on purpose: this merges in the same window as the 2.2.1 fleet rebuild, because the engine reads x-scalo-secret only once the rebuilt apps emit it. Green at e186746.

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