Compare commits
53 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 652ddb649c | |||
| a33522ddca | |||
| 3f58d44e96 | |||
| eeafc356e4 | |||
| ab6e610fb7 | |||
| 60bcb6ddac | |||
| ea1f2a808d | |||
| 649a63fff1 | |||
| e750b6d423 | |||
| a3c77f32f2 | |||
| a9c72c1b67 | |||
| 7b4fcf224a | |||
| df6c3df67d | |||
| fb0560d888 | |||
| e1336f74e5 | |||
| 20a1087e25 | |||
| 51ef314415 | |||
| 00efe90236 | |||
| 8aa91e8f0a | |||
| c1c7e87f2c | |||
| 99098d2974 | |||
| 3e50388b73 | |||
| 22603f0e5b | |||
| 5f001cf597 | |||
| 47547bc63e | |||
| ce6005ca2d | |||
| ef420c943b | |||
| f0198f865d | |||
| 367fe4120f | |||
| 37ea670747 | |||
| 68de431bb9 | |||
| 720df98a5a | |||
| 81c27bb9cd | |||
| 9a08438769 | |||
| a05bb94a21 | |||
| d2608e8d56 | |||
| 18af2d2130 | |||
| bc3fc91296 | |||
| 08ea01921b | |||
| 761dd0a4e0 | |||
| b93cbb0639 | |||
| e47960d377 | |||
| f0a4bf9bb2 | |||
| 0a136063da | |||
| ae0c94d3c6 | |||
| c51bea9b4f | |||
| 132b9ec659 | |||
| c0bc5e2b73 | |||
| daa0cf9e88 | |||
| 2ba61d5c7c | |||
| e36740313d | |||
| 1960304f6f | |||
| 26ea24958c |
@@ -1,6 +1,6 @@
|
||||
# ADR 0004: Use secret references and explicit environment bootstrap
|
||||
|
||||
Status: accepted
|
||||
Status: superseded by [ADR 0023](0023-explicit-configured-secrets-bootstrap.md).
|
||||
|
||||
Date: 2026-09-06
|
||||
|
||||
|
||||
47
docs/adr/0022-main-relative-context.md
Normal file
47
docs/adr/0022-main-relative-context.md
Normal file
@@ -0,0 +1,47 @@
|
||||
# ADR 0022: Bind Companion Contexts After Main Selection
|
||||
|
||||
## Status
|
||||
|
||||
Accepted.
|
||||
|
||||
## Date
|
||||
|
||||
2026-11-09
|
||||
|
||||
## Context
|
||||
|
||||
Applications choose a main-file search and may also declare companion imports
|
||||
and a selected overlay. The main directory is only known after discovery, so
|
||||
supplying every dependent context before loading duplicates selection or requires
|
||||
a preliminary load. ADR 0019 keeps main discovery explicit and inside loading.
|
||||
|
||||
## Decision
|
||||
|
||||
Extend layered loading to bind application-declared non-file underlays to the
|
||||
resolved main context after acquisition. An explicit underlay context overrides
|
||||
the binding, and an explicit fallback or require-base option controls absence.
|
||||
Selected layered overlays choose an explicit context, the resolved main context,
|
||||
or a fallback in that order. Derived and fallback lookup use the context base;
|
||||
the inherited root continues to bound containment. Ordinary and explicit
|
||||
overlay lookup retain their established root-relative behavior.
|
||||
|
||||
Applications remain responsible for choosing searches, import declarations,
|
||||
and overlay names. Selection failures are terminal; no second search or
|
||||
application context callback is introduced.
|
||||
|
||||
## Alternatives Considered
|
||||
|
||||
- Require applications to discover the main file separately. This repeats
|
||||
discovery and may run a complete load more than once.
|
||||
- Implicitly scan conventional companion directories. This would impose
|
||||
application-specific conventions without an explicit declaration.
|
||||
- Add only a relative file constructor. This would not cover mapping or bytes
|
||||
sources with existing import, placement, and composition rules.
|
||||
|
||||
## Consequences
|
||||
|
||||
The load owns the resolved binding and keeps namespace, containment, source
|
||||
identity, and handle lifetime in the existing acquisition lifecycle. A missing
|
||||
base skips optional imports while preserving the declaring payload; required
|
||||
imports and require-base retain explicit failures. The configuration contract
|
||||
and public declarations describe the observable rules.
|
||||
60
docs/adr/0023-explicit-configured-secrets-bootstrap.md
Normal file
60
docs/adr/0023-explicit-configured-secrets-bootstrap.md
Normal file
@@ -0,0 +1,60 @@
|
||||
# ADR 0023: Keep Configured Secrets Bootstrap Explicit
|
||||
|
||||
## Status
|
||||
|
||||
Accepted. Supersedes [ADR 0004](0004-secret-references-and-explicit-bootstrap.md).
|
||||
|
||||
## Date
|
||||
|
||||
2026-11-18
|
||||
|
||||
## Context
|
||||
|
||||
Applications may discover their main configuration file during startup and keep
|
||||
secret files beside it. Requiring applications to discover and parse that file
|
||||
separately duplicates ConfigKit's work. Some deployments also need secret files
|
||||
to replace environment values that are already set.
|
||||
|
||||
## Decision
|
||||
|
||||
Keep secrets as typed references to environment-variable names. Resolve surviving
|
||||
references and keep credential values out of configuration trees, history, and
|
||||
inspection. Applications own credential use.
|
||||
|
||||
Directory bootstrap remains a separate startup operation that the application
|
||||
must call explicitly. Ordinary configuration loading never writes the process
|
||||
environment. The application may supply the directory directly or authorize
|
||||
bootstrap from settings in the selected main document. Imports, underlays,
|
||||
overlays, and later application processing do not choose those settings.
|
||||
|
||||
When bootstrap uses the main document, ConfigKit selects and captures that
|
||||
document and its filesystem context for subsequent loading. This keeps bootstrap
|
||||
and loading tied to the same main contents and location. It does not snapshot
|
||||
later imports, resources, or the environment.
|
||||
|
||||
Preserve existing environment variables by default, including empty values.
|
||||
Allow an explicit overwrite choice. An application-supplied choice takes
|
||||
precedence over the main document's choice, including an explicit choice to
|
||||
preserve existing values.
|
||||
|
||||
Keep bootstrap reports separate from later secret-lookup evidence. Report
|
||||
writes, skips, and partial failures without credential values. Bootstrap offers
|
||||
no rollback or transaction across environment variables and no protection
|
||||
against concurrent environment mutation. General environment-variable
|
||||
configuration overlays remain outside this model.
|
||||
|
||||
## Alternatives Considered
|
||||
|
||||
- Leave discovery and parsing to applications. This preserves duplicate startup
|
||||
infrastructure and can select different main contents for bootstrap and loading.
|
||||
- Run bootstrap inside ordinary loading. This hides process mutation in an
|
||||
operation applications may repeat or run concurrently.
|
||||
- Always preserve existing environment values. This keeps one precedence rule
|
||||
but prevents deployments from explicitly choosing provisioned files instead.
|
||||
|
||||
## Consequences
|
||||
|
||||
Applications retain control of startup ordering and environment writes.
|
||||
ConfigKit owns main-source capture, bounded secret-file loading, and safe
|
||||
reporting. A later configuration failure leaves completed bootstrap writes in
|
||||
place. Existing callers retain the preservation default.
|
||||
174
docs/config.md
174
docs/config.md
@@ -75,6 +75,8 @@ or the supported directory presets, then pass it to `SearchConfig`. Search
|
||||
descriptions are immutable and reusable; each load resolves dynamic directories
|
||||
and checks current candidate files again. `Searches` is ordered concatenation.
|
||||
It preserves the supplied description order and does not deduplicate candidates.
|
||||
Layered companion inputs can use the selected main's context without a second
|
||||
search, as described under [layered loading](#layered-loading).
|
||||
|
||||
`NamedFilenames` selects `<application>.yml`, then `<application>.yaml`.
|
||||
`GenericFilenames` selects `config.yml`, `config.yaml`, `main.yml`, then
|
||||
@@ -316,13 +318,33 @@ typed configuration before application resolution. Syntax, strict-composition,
|
||||
inheritance, and decoding errors cannot be masked by a CLI override. Resolution,
|
||||
secret lookup, validation, and publication run once on the resulting values.
|
||||
|
||||
An active layered overlay requires `LayeredOptions.OverlayFilesystem` explicitly,
|
||||
independent of the main source's namespace. Its name and root-relative lookup
|
||||
follow the selected-overlay rules below; inactive overlays ignore the context.
|
||||
An active layered overlay selects `OverlayFilesystem` first, then the resolved
|
||||
main context, then `OverlayFallback`. An invalid selected context fails without
|
||||
trying another. An inactive overlay ignores both supplied contexts.
|
||||
The same path in a different filesystem namespace is not a repeated file.
|
||||
Ordinary `Load` infers overlay context from sources that provide one; with
|
||||
`NoSource`, it requires the explicit `Options.Filesystem` context.
|
||||
|
||||
An underlay `Input.MainRelative` requests the resolved main context for a
|
||||
non-file source. An explicit `Input.Filesystem` overrides it entirely. File,
|
||||
native file, and search underlays cannot use an active binding, nor can the
|
||||
main input bind to itself. `MainRelative()` creates a fresh default description.
|
||||
The binding does not enable imports. If the main has no usable context, its
|
||||
`Fallback` is selected if supplied; otherwise optional imports are skipped and
|
||||
the input's own payload remains. Required named targets, directory and glob
|
||||
selections fail without a base, while an empty `path: []` remains a no-op.
|
||||
`RequireBase` requires a usable main or fallback context even without imports.
|
||||
Invalid declarations still fail, and skipped imports create no search evidence.
|
||||
Selected main failures never trigger fallback or a second discovery attempt.
|
||||
|
||||
Derived contexts preserve the main namespace and containment root, while lookup
|
||||
starts at its resolved base. A host file's base is its canonical target directory,
|
||||
including when the selected filename is a symlink. A wider root permits contained
|
||||
parent-relative imports without moving the lookup base. Explicit non-file and
|
||||
absent-main contexts can provide a base; an absent host input may use its root as
|
||||
base. An unused fallback is not opened or checked for existence. See the
|
||||
[consumer example](../examples/consumers/main_relative.go).
|
||||
|
||||
Source IDs follow acquisition order—main and its depth-first imports, then each
|
||||
underlay tier's inputs and depth-first imports, then overlay and CLI—even though
|
||||
history follows precedence order. Default main-version checking happens after
|
||||
@@ -567,7 +589,7 @@ one context for a composite origin or an application-derived value.
|
||||
`ResourceContext.FS` is rooted at the source's configured root, and `BaseDir`
|
||||
is its slash-relative directory inside that root. This includes imported
|
||||
sources, selected overlays, host files even without enabled imports, native
|
||||
files, and byte, reader, or mapping inputs with an explicit context. CLI and
|
||||
files, and byte, reader, or mapping inputs with an explicit or main-derived context. CLI and
|
||||
contextless synthetic inputs have no resource context. To open a relative
|
||||
resource, join `BaseDir` with the application resource name using slash-path
|
||||
operations and open that path through `FS`.
|
||||
@@ -997,7 +1019,7 @@ There are three separate tasks when working with credentials:
|
||||
| --- | --- |
|
||||
| Read a credential from an environment variable | A typed `Secret` field whose YAML value is the variable's name |
|
||||
| Hide a configuration value in inspection output | A `configkit:"secret"` tag or `Definition.Sensitive` |
|
||||
| Populate environment variables from local files before loading | An explicit `LoadSecretsIntoEnvironment` call |
|
||||
| Populate environment variables from local files before loading | An explicit [secrets bootstrap](#explicit-secrets-directory-bootstrap) call |
|
||||
|
||||
For example, YAML `api_key: DEMO_API_KEY` names an environment variable. Its
|
||||
credential is available to trusted application code through `Secret.Value()`
|
||||
@@ -1029,8 +1051,8 @@ its effective source location for diagnostics. Each unique name is read with
|
||||
`os.LookupEnv` once per load. Validation can inspect the credential through the
|
||||
deliberately named `Value()` accessor and distinguish success with `IsResolved()`.
|
||||
Later loads read the environment again, and cloned defaults are rebuilt from names
|
||||
so a previously resolved result cannot retain a stale credential. `Load` never
|
||||
writes to the environment.
|
||||
so a previously resolved result cannot retain a stale credential. `Load` and
|
||||
`LoadLayered` never write to the environment.
|
||||
|
||||
Credential bytes are held only in the per-load lookup state and the trusted returned
|
||||
configuration, and are returned only by `Value`. Secret formatting uses a safe
|
||||
@@ -1056,17 +1078,80 @@ reference state without printing its value.
|
||||
|
||||
## Explicit secrets-directory bootstrap
|
||||
|
||||
If an application stores credentials in files, it can call this helper before
|
||||
loading configuration. A file named `DEMO_API_KEY` containing the dummy text
|
||||
If an application stores credentials in files, it can explicitly bootstrap
|
||||
them before loading configuration. A file named `DEMO_API_KEY` containing the dummy text
|
||||
`example-value` supplies environment variable `DEMO_API_KEY`. YAML can then
|
||||
refer to that variable with `api_key: DEMO_API_KEY`. Applications that already
|
||||
receive environment variables do not need this file step.
|
||||
|
||||
Existing environment variables take priority over files. If `DEMO_API_KEY` is
|
||||
already set to an empty string, its file is skipped and it stays empty. A later
|
||||
By default existing environment variables take priority over files. If
|
||||
`DEMO_API_KEY` is already set to an empty string, its file is skipped and it stays empty. A later
|
||||
required `Secret` reference will still fail on that empty value. File bootstrap
|
||||
accepting an empty file is different from a required reference resolving to an
|
||||
empty credential.
|
||||
empty credential. `LoadSecretsIntoEnvironmentWithOptions` accepts
|
||||
`SecretsOptions{Overwrite: true}` to replace existing values explicitly.
|
||||
|
||||
For a directory selected by the main file, call
|
||||
`LoadSecretsIntoEnvironmentFromConfig` with a host `File` or `SearchConfig`
|
||||
source before `Load` or `LoadLayered`. The main document may declare:
|
||||
|
||||
```yaml
|
||||
config:
|
||||
secrets_dir: secrets
|
||||
secrets_overwrite: false
|
||||
```
|
||||
|
||||
`secrets_dir` is a nonempty relative host path, interpreted literally relative
|
||||
to the selected main file's canonical directory. Its canonical target must be
|
||||
inside the main filesystem root; a contained directory symlink is allowed.
|
||||
Parent-relative paths can reach other directories inside an explicitly wider
|
||||
root. Rooted, absolute, and host volume-qualified paths are invalid. `secrets_overwrite`
|
||||
is a Boolean and defaults to false. A non-nil Go `Overwrite` option wins over
|
||||
the YAML value, including an explicit false. Invalid declarations fail even
|
||||
when Go supplies an override. Overwrite without a directory is a no-op.
|
||||
|
||||
Only the main document root owns these controls. Imports and underlays reject
|
||||
them with source-local import diagnostics; selected overlays reject them as
|
||||
overlay directives. Nested application `config` mappings and data assembled at
|
||||
the application root by placement, defaults, CLI, or resolution remain ordinary
|
||||
data. Normal `Load` and `LoadLayered` validate and consume main controls whether
|
||||
imports are enabled or disabled, but never bootstrap or write the environment.
|
||||
Each load resolves typed secret names from the environment at the usual point.
|
||||
|
||||
The companion accepts at most one `SecretsFromConfigOptions`, including an
|
||||
optional host `FilesystemContext`. It selects and parses the main once, validates
|
||||
the bootstrap controls, and completes directory bootstrap before returning a
|
||||
prepared source. It does not run import acquisition, version checks, decoding,
|
||||
resolution, or validation. It loads every eligible directory entry, including
|
||||
names unused by the application's typed schema. A main with no directory still
|
||||
returns a prepared source and empty report. `NoSource` or an exhausted optional
|
||||
search returns `NoSource` and an empty report. Explicit absent-input context
|
||||
continues to follow the normal absent-host-context rules. The helper also accepts
|
||||
a previously prepared source, reusing its captured main and explicitly performing
|
||||
bootstrap again.
|
||||
|
||||
The prepared source is a reusable snapshot of the selected main document,
|
||||
including its unconsumed controls, byte count, canonical file identity, base,
|
||||
and containment root. A later load neither rediscovers nor rereads the main
|
||||
and does not repeat bootstrap; it reads imports and resources when accessed and
|
||||
looks up secrets anew. The main's source record retains `SourceKindFile`. Each
|
||||
load clones the document, creates its own source IDs
|
||||
and records, and applies normal input accounting. No file handle or secret-file
|
||||
contents remain in the prepared source. With no later context, loading uses the
|
||||
captured context. A supplied later host context must resolve to the same root,
|
||||
base, and main path; equivalent path spellings and root symlink aliases are
|
||||
accepted. Native contexts, a file `BaseDir`, and different roots fail with
|
||||
`options.invalid`. A caller needing another root prepares the original source
|
||||
again. These rules apply to ordinary options and layered main inputs.
|
||||
|
||||
The helper returns a non-nil report on every attempt and a zero, unusable source
|
||||
on error. Discovery, source, parse, control, and preparation-context failures
|
||||
return `*LoadError` with available source records and source-local diagnostics.
|
||||
Directory inspection, reads, and environment writes return `*SecretsError`.
|
||||
An invalid directory declaration uses `secrets.invalid_path`; a non-Boolean
|
||||
overwrite declaration uses `secrets.invalid_value`. Later loading failures do
|
||||
not undo bootstrap effects or change its report. Multiple options fail before
|
||||
acquisition or writes.
|
||||
|
||||
Read the report even when the helper returns an error:
|
||||
|
||||
@@ -1079,18 +1164,20 @@ Read the report even when the helper returns an error:
|
||||
|
||||
Render the returned `SecretsReport` separately from a later configuration load.
|
||||
It contains filenames, paths, and statuses, not credential contents. The
|
||||
[maintained startup example](../examples/consumers/consumers_test.go) shows how to
|
||||
keep bootstrap and configuration reports together in the application.
|
||||
[configured startup example](../examples/consumers/secrets.go) prepares a source
|
||||
for either loading entry point; its [test](../examples/consumers/secrets_test.go)
|
||||
shows both handoffs. The [direct-directory example](../examples/consumers/consumers_test.go)
|
||||
shows how to keep bootstrap and configuration reports together.
|
||||
|
||||
### Preflight, limits, and partial writes
|
||||
|
||||
`LoadSecretsIntoEnvironment(directory)` is a separate, opt-in startup operation.
|
||||
It is never called by `Load`, is not a YAML option, and does not participate in
|
||||
configuration validation. Applications choose the native directory path and
|
||||
should invoke the operation once before starting concurrent work. The selected
|
||||
path may itself be a symlink; ConfigKit resolves it to an existing canonical
|
||||
directory before examining
|
||||
its immediate entries.
|
||||
All bootstrap helpers are separate, opt-in startup operations. They are never
|
||||
called by a configuration load and do not perform configuration validation.
|
||||
Applications own startup ordering and should invoke bootstrap before concurrent
|
||||
work or other process-environment mutation. The direct helpers accept a native
|
||||
directory path; the configured helper resolves the declared path as described
|
||||
above. The selected path may itself be a symlink; ConfigKit resolves it to an
|
||||
existing canonical directory before examining its immediate entries.
|
||||
|
||||
The bootstrap enumerates at most 1,024 entries, including dot-prefixed entries.
|
||||
Entries whose names begin with `.` (files, directories, or symlinks, such as `.git`
|
||||
@@ -1098,16 +1185,18 @@ and `.gitignore`) are ignored before name or metadata validation, are never open
|
||||
and are omitted from the report. Remaining entries are sorted by filename; each
|
||||
must have an ASCII environment-variable name and be a regular, nonsymlink
|
||||
file. Metadata for all remaining entries is validated before file content is read
|
||||
or process state is changed. Existing environment variables win, including variables whose
|
||||
value is empty; their files are not opened. Each eligible file is limited to 1 MiB,
|
||||
and eligible content is limited to 8 MiB in total. ConfigKit removes exactly one
|
||||
or process state is changed. In preservation mode existing environment variables
|
||||
win, including variables whose value is empty; their files are not opened. In
|
||||
overwrite mode their files are read and applied as well. Each eligible file is
|
||||
limited to 1 MiB, and eligible content is limited to 8 MiB in total. ConfigKit removes exactly one
|
||||
terminal LF or CRLF, preserves all other whitespace, accepts an empty value, and
|
||||
rejects NUL bytes.
|
||||
|
||||
All eligible files are read successfully before application begins. Presence is
|
||||
checked again immediately before each `os.Setenv`: a variable populated since
|
||||
preflight is skipped. A write failure stops application without rollback, so prior
|
||||
writes remain and later eligible entries are `not_applied`. This operation is not
|
||||
All required files are read successfully before application begins. In
|
||||
preservation mode presence is checked again immediately before each `os.Setenv`:
|
||||
a variable populated since preflight is skipped. Overwrite mode applies the
|
||||
staged value regardless of presence. A write failure stops application without
|
||||
rollback, so prior writes remain and later eligible entries are `not_applied`. This operation is not
|
||||
atomic and does not provide compare-and-set semantics for concurrent environment
|
||||
mutation.
|
||||
|
||||
@@ -1115,9 +1204,11 @@ mutation.
|
||||
records with `loaded`, `skipped_existing`, `not_applied`, or `failed` status.
|
||||
`ExistingEmpty` distinguishes an empty existing winner. `SecretsReport.WriteTo`
|
||||
renders only quoted names, canonical paths, statuses, and that empty-state flag;
|
||||
it never retains or renders file contents. Failures return the non-nil partial
|
||||
report with a `*SecretsError` containing detached `secrets.*` diagnostics and no
|
||||
raw filesystem or environment error chain. Applications should retain the report
|
||||
it never retains or renders file contents. Directory and environment failures
|
||||
return the non-nil partial report with a `*SecretsError` containing detached
|
||||
`secrets.*` diagnostics and no raw filesystem or environment error chain.
|
||||
Configured main-preparation failures return `*LoadError` as described above.
|
||||
Applications should retain the report
|
||||
alongside the later configuration result and explicitly present blocked and failed
|
||||
files when appropriate; ConfigKit stores no implicit global report.
|
||||
|
||||
@@ -1489,12 +1580,15 @@ claim records rather than mutating or aliasing an input document.
|
||||
`Options.Overlay` selects at most one overlay by name. Names must match
|
||||
`[a-zA-Z0-9_-]+`; they are not paths. The empty name and exact lowercase name
|
||||
`default` select no overlay, and `overlays/default.yml` is never loaded implicitly.
|
||||
Every other name resolves only to `<configuration-root>/overlays/<name>.yml`, with
|
||||
For ordinary loads and explicit layered overlay contexts, every other name resolves
|
||||
to `<configuration-root>/overlays/<name>.yml`, with
|
||||
no extension fallback, case normalization, inheritance between overlay files,
|
||||
or overlay stack. A selected missing overlay is an error.
|
||||
For a layered main-derived or fallback context, lookup instead starts at the
|
||||
resolved base directory; the configured root still bounds containment.
|
||||
|
||||
With `NoSource`, the main input stays absent and the explicit filesystem context
|
||||
supplies the overlay root. The overlay is recorded as the first acquired source
|
||||
With ordinary `Load` and `NoSource`, the main input stays absent and the explicit
|
||||
filesystem context supplies the overlay root. The overlay is recorded as the first acquired source
|
||||
when no other source exists. Host contexts may use the root-only form described
|
||||
under [single-source loading](#single-source-loading); native contexts retain
|
||||
their complete namespace, base, and root requirements.
|
||||
@@ -1504,6 +1598,10 @@ base import graph is composed and its schema version is checked, but before defa
|
||||
and typed decoding. Overlay bytes, nodes, and source records count toward the same
|
||||
aggregate limits as base inputs. Its canonical path must remain within the configured
|
||||
root and must not duplicate a file already present in the base graph.
|
||||
For native filesystems that implement `fs.ReadLinkFS`, these checks resolve
|
||||
link targets in the selected namespace. For other native filesystems, the
|
||||
checks use namespace-relative paths and reads follow that filesystem's
|
||||
ordinary behavior.
|
||||
|
||||
Collection destinations follow the
|
||||
[collection operation and presence rules](#strict-document-composition) above.
|
||||
@@ -1629,6 +1727,8 @@ config:
|
||||
Each selected document follows the same strict combination rules. A missing
|
||||
optional input can be absent; invalid declarations, unreadable selected files,
|
||||
and conflicting settings still fail loading.
|
||||
Main-relative underlays follow the same import rules once a context is selected;
|
||||
their no-base behavior is described under [layered loading](#layered-loading).
|
||||
|
||||
| Option | `path` | `dir` | `glob` |
|
||||
| --- | --- | --- | --- |
|
||||
@@ -1643,8 +1743,10 @@ rules below explain absence, patterns, placement, and ordering.
|
||||
### Declaration and selection rules
|
||||
|
||||
Imports are opt-in. With `Options.Imports` enabled, a document may use its root
|
||||
`config` mapping for `imports` and `sequences` controls. Ordinary `Load` may use
|
||||
`sequences` without enabling imports, but an `imports` field still requires
|
||||
`config` mapping for `imports` and `sequences` controls. The main root may also
|
||||
declare the [secrets bootstrap controls](#explicit-secrets-directory-bootstrap).
|
||||
Ordinary `Load` may use `sequences` and main bootstrap controls without enabling
|
||||
imports, but an `imports` field still requires
|
||||
`Options.Imports`. ConfigKit removes recognized root controls before application
|
||||
decoding. Each imports sequence item is a mapping with exactly one `path`,
|
||||
`dir`, or `glob` selector. `path` and `dir` accept a string or a list of strings;
|
||||
|
||||
@@ -26,7 +26,7 @@ Start with one file, then choose the tasks your application needs:
|
||||
| Add bundled defaults beneath application settings | [Native filesystem and layered input](#native-filesystem-and-layered-input) |
|
||||
| Select files or an overlay | [Discovery](#explicit-main-file-discovery), [import defaults](#import-defaults-and-selection-inspection), and the [overlay reference](../config.md#selected-overlays) |
|
||||
| Reuse settings or combine record lists | [Inheritance](#named-sibling-inheritance) and [identified sequences](#identified-prompt-sequences) |
|
||||
| Handle credentials | [Typed-secret reference](../config.md#typed-secret-references) and the [startup example](../../examples/consumers/consumers_test.go) |
|
||||
| Handle credentials | [Typed-secret reference](../config.md#typed-secret-references), [configured startup](#configured-secrets-startup), and the [direct-directory example](../../examples/consumers/consumers_test.go) |
|
||||
| Inspect sources, earlier values, or changes | [Inspect a completed load](#inspect-a-completed-load) and [diffs](#effective-configuration-diffs) |
|
||||
| Upgrade an existing consumer | [Migration guidance](#intentional-migration-changes) |
|
||||
|
||||
@@ -38,7 +38,8 @@ Start with one file, then choose the tasks your application needs:
|
||||
- Use `LoadLayered` when several inputs should supply lower-priority defaults
|
||||
beneath the main source. Each underlay group combines its inputs strictly.
|
||||
Each [`Input`](../../layered.go) owns its source, filesystem, destination, and
|
||||
import choice. The overlay filesystem context is selected independently in
|
||||
import choice. Set `Input.MainRelative` on a companion underlay to use the
|
||||
main input's filesystem context. Overlay context selection belongs to
|
||||
[`LayeredOptions`](../../layered.go).
|
||||
- Load-wide rules belong to [`Options`](../../lifecycle.go) or
|
||||
[`LayeredOptions`](../../layered.go): the application definition (including
|
||||
@@ -53,6 +54,19 @@ file and layered cases. For import-focused adoption, see the
|
||||
[prompt catalog](../../examples/consumers/prompt_catalog.go); for explicit
|
||||
discovery composed with sequences, see the
|
||||
[sequence catalog](../../examples/consumers/sequence_catalog.go).
|
||||
For discovered main files with companion imports and an overlay, see the
|
||||
[main-relative example](../../examples/consumers/main_relative.go).
|
||||
|
||||
## Configured secrets startup
|
||||
|
||||
Call [`PrepareStartup`](../../examples/consumers/secrets.go) with a host file
|
||||
or search source and the selected containment root, then handle its report and
|
||||
error before loading. Pass the returned source to ordinary `Load`, or place it
|
||||
in the main `Input` for `LoadLayered`; the [maintained test](../../examples/consumers/secrets_test.go)
|
||||
shows both. Preparation is explicit and loads eligible files even when their
|
||||
names are used only by another SDK. The application owns startup ordering and
|
||||
handling partial effects. See the [configuration contract](../config.md#explicit-secrets-directory-bootstrap)
|
||||
for controls, overwrite precedence, errors, and source reuse.
|
||||
|
||||
## Happy path
|
||||
|
||||
@@ -517,7 +531,7 @@ focused behavioral owner:
|
||||
| `Load`, `NoSource`, validation, versions, resolution, `SecretEnv`, overrides, and explanation | Executable examples in [`example_test.go`](../../example_test.go) |
|
||||
| Source/import/selected-overlay pipeline rules and artifact defaults | Narratio-shaped executable example and fixture |
|
||||
| Canonical module objects and dynamic option handling | WeatherReporter- and Notarius-shaped examples and migration tests |
|
||||
| `LoadSecretsIntoEnvironment`, bootstrap reporting, typed lookup, CLI explanation | `Example_weatherStartup` |
|
||||
| Secrets bootstrap, prepared ordinary and layered sources, typed lookup | [`TestConfiguredSecretsStartup`](../../examples/consumers/secrets_test.go) and `Example_weatherStartup` |
|
||||
| Native filesystem, grouped underlays, programmatic mapping, retained resource context | `Example_nativeFilesystem`, `Example_layeredCatalog`, and their focused consumer tests |
|
||||
| Literal input destinations, root-default compatibility, and mounted peer collections | `Example_inputDestination`, `LoadCollectionBundle`, and `destinations_test.go` |
|
||||
| Named sibling inheritance, presence, and derivation | `Example_inheritedPresets` and `TestPresetCatalogOneLoadAndDerivation` |
|
||||
|
||||
@@ -54,7 +54,7 @@ Accepted decisions:
|
||||
- [Check source versions with one shared policy](adr/0013-shared-source-version-checks.md)
|
||||
- [Own YAML semantics behind a private parser boundary](adr/0002-own-yaml-semantics.md)
|
||||
- [Preserve presence and record application resolution](adr/0003-preserve-presence-and-resolution-history.md)
|
||||
- [Secret references and explicit bootstrap](adr/0004-secret-references-and-explicit-bootstrap.md)
|
||||
- [Explicit configured secrets bootstrap](adr/0023-explicit-configured-secrets-bootstrap.md)
|
||||
- [Explicit overrides and safe explanation](adr/0005-explicit-overrides-and-safe-explanation.md)
|
||||
- [Keep the public facade root-owned](adr/0006-public-facade.md)
|
||||
- [Compare frozen effective configuration snapshots](adr/0010-effective-configuration-diff.md)
|
||||
@@ -66,6 +66,7 @@ Accepted decisions:
|
||||
- [Keep main-file discovery explicit and composable](adr/0019-explicit-configuration-discovery.md)
|
||||
- [Scope configuration controls to document roots](adr/0020-document-root-controls.md)
|
||||
- [Match registered records during resolution inspection](adr/0021-sequence-resolution-correspondence.md)
|
||||
- [Bind companion contexts after main selection](adr/0022-main-relative-context.md)
|
||||
|
||||
For cross-cutting changes, follow every applicable row. Completed implementation
|
||||
and remediation plans are preserved in Git history at `cb5b435`; use current
|
||||
@@ -93,6 +94,12 @@ and current facade ownership belongs to the [component overview](internal/overvi
|
||||
|
||||
## Baseline validation
|
||||
|
||||
The completed main-relative companion roadmap, Audita request, implementation
|
||||
plan, and remediation report are preserved in Git history at `47547bc` under
|
||||
`docs/roadmap/`. The [layered loading contract](config.md#layered-loading)
|
||||
describes current behavior, and [ADR 0022](adr/0022-main-relative-context.md)
|
||||
records the context binding decision.
|
||||
|
||||
The completed field-level sequence resolution roadmap, implementation plan, and
|
||||
resolved audit findings are preserved in Git history at `7e53863` under
|
||||
`docs/roadmap/`. For example:
|
||||
@@ -306,7 +313,7 @@ code changes. Use the component overview to find the corresponding implementatio
|
||||
| Resolution sequence matching and inspection | [Correspondence](../internal/engine/resolution_correspondence_test.go), [auditing and history](../internal/engine/resolution_compare_test.go), [public integration](../facade_resolution_sequences_test.go) | `go test ./internal/engine -run 'Resolution\|History\|Explain\|Sensitivity'` and `go test . -run 'Resolution\|SequenceIdentity\|Diff'` |
|
||||
| Paths, metadata, provenance | [Paths](../internal/engine/path_test.go), [metadata](../internal/engine/metadata_test.go), [provenance](../internal/engine/provenance_test.go) | `go test ./internal/engine -run 'Path\|Metadata\|Provenance\|Queries'` |
|
||||
| Passive resource contexts | [Engine contexts](../internal/engine/resource_context_test.go), [public contexts](../facade_resource_context_test.go) | `go test ./internal/engine -run 'Resource'` and `go test . -run 'SourceContext'` |
|
||||
| Secrets, bootstrap, redaction, explanation | [References](../internal/engine/secret_reference_test.go), [bootstrap](../internal/engine/secrets_test.go), [rendering](../internal/engine/render_test.go), [explanation](../internal/engine/explain_test.go) | `go test ./internal/engine -run 'Secret\|Bootstrap\|Effective\|Explain\|Explanation\|History\|Sensitivity'` |
|
||||
| Secrets, bootstrap, redaction, explanation | [References](../internal/engine/secret_reference_test.go), [directory bootstrap](../internal/engine/secrets_test.go), [configured preparation](../internal/engine/secrets_from_config_test.go), [public handoff](../facade_secrets_handoff_test.go), [consumer example](../examples/consumers/secrets_test.go), [rendering](../internal/engine/render_test.go), [explanation](../internal/engine/explain_test.go) | `go test ./internal/engine -run 'Secret\|Bootstrap\|Effective\|Explain\|Explanation\|History\|Sensitivity'`, `go test . -run 'Secrets\|Bootstrap'`, and `go test ./examples/consumers -run 'ConfiguredSecrets'` |
|
||||
| Effective configuration diff | [Engine comparison and masking tests](../internal/engine/diff_test.go), [engine operation tests](../internal/engine/diff_operation_test.go), [root facade tests](../facade_diff_test.go), and [consumer examples](../examples/consumers/diff_test.go) | `go test ./internal/engine -run 'Diff\|Explain\|History\|Secret\|Independent'`, `go test . -run 'Diff\|FacadeInspection\|PublicFacadeBoundary\|DependencyImportBoundary'`, `go test ./examples/consumers`, and `go test . -run '^ExampleDiff$'` |
|
||||
| Consumer examples and migration fixtures | [Consumer tests](../examples/consumers/consumers_test.go), [native, layered, and ordinary relative-import examples](../examples/consumers/layered_test.go), [mounted collection examples](../examples/consumers/destinations_test.go), [API examples](../example_test.go) | `go test ./examples/consumers` and `go test . -run '^Example'` |
|
||||
| Assembly and layered scaling evidence | [Assembly benchmarks](../internal/engine/assembly_bench_test.go), [layered benchmarks](../internal/engine/underlay_bench_test.go) | `go test ./internal/engine -run '^$' -bench '^BenchmarkUnderlay' -benchmem`; repeat with `^BenchmarkCompose` and `^BenchmarkOverlay` |
|
||||
|
||||
@@ -20,6 +20,23 @@ patterns to discovered names, and form a set union of matching candidates across
|
||||
overlapping roots. Exclusions are applied as set difference after discovery and
|
||||
candidate normalization. They do not suppress discovery or resource errors.
|
||||
|
||||
Layered assembly passes the resolved main context to underlay acquisition.
|
||||
Derived inputs retain the main's filesystem location and namespace. The
|
||||
receiving tier supplies its own host token and tracks repeated sources.
|
||||
Contextless bindings prepare declaration policies and assemble the declaring
|
||||
payload without opening filesystem access or recording selection evidence.
|
||||
Selected contexts use the existing acquisition and handle lifecycle.
|
||||
|
||||
A captured host main enters the same parsed-source and import traversal handoff
|
||||
as an ordinarily selected file. Its original bytes and nodes are charged once per
|
||||
load, including placement wrappers, and its canonical path participates in
|
||||
cycle and repeated-source checks. Imports are still acquired live; layered
|
||||
main-relative consumers receive the captured base and root, while each tier
|
||||
continues to use its own namespace token and repetition state. The capture and
|
||||
context checks are owned by
|
||||
[`prepared_source.go`](../../internal/engine/prepared_source.go) and
|
||||
[`filesystem_context.go`](../../internal/engine/filesystem_context.go).
|
||||
|
||||
Directory traversal tracks canonical directories on the active traversal path.
|
||||
It adds an identity when descending and removes it when the frame is popped, so
|
||||
only a back-edge to an active directory is a traversal cycle; a later alias is
|
||||
|
||||
@@ -11,7 +11,7 @@ Implemented component owners:
|
||||
explicitly selected configuration discovery. A search resolves once during
|
||||
shared acquisition; the selected concrete file or absent-input state then
|
||||
follows the existing composition, metadata, and resource-context lifecycle.
|
||||
It also owns grouped strict composition, recursive precedence assembly,
|
||||
It also owns main-relative context selection, grouped strict composition, recursive precedence assembly,
|
||||
per-input mapping and sequence-item placement, YAML collection declarations
|
||||
and operations for identified sequences, and application identity registrations for strict
|
||||
composition, inheritance, and final validation. It applies the selected
|
||||
@@ -125,6 +125,16 @@ for passive-context construction and ordinary-overlay handling: see
|
||||
[`filesystem_context.go`](../../internal/engine/filesystem_context.go) and
|
||||
[`source_context.go`](../../internal/engine/source_context.go).
|
||||
|
||||
Explicit configured bootstrap uses
|
||||
[`prepared_source.go`](../../internal/engine/prepared_source.go) to share host
|
||||
discovery and bounded parsing with acquisition. It stores a read-only main tree,
|
||||
byte count, and canonical path facts; each load clones the tree and assigns its
|
||||
own source ID. [`secrets_from_config.go`](../../internal/engine/secrets_from_config.go)
|
||||
validates just the bootstrap controls and calls the shared directory worker.
|
||||
Acquisition checks any later explicit context against the captured facts before
|
||||
imports or overlays, then applies normal source and aggregate accounting.
|
||||
Captured state contains no access handles or secret-file values.
|
||||
|
||||
Import responsibilities are split across candidate selection and path
|
||||
normalization in [`import_selection.go`](../../internal/engine/import_selection.go),
|
||||
source reading and traversal admission in
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
## Standard Repository Policies
|
||||
|
||||
Material: `docs/policy/release.md`, adapted from
|
||||
`e833faddf120c789a9b45348edaf75720de16348`; `docs/policy/meta.md`, `docs/policy/oss.md`,
|
||||
`docs/policy/documentation.md`, `docs/policy/agents.md`,
|
||||
Material: `docs/policy/documentation.md`, `docs/policy/oss.md`, and
|
||||
`docs/policy/release.md`, adapted from
|
||||
`b339ad0427a50e43a68b932a6a9f4669cc0f6252`; `docs/policy/meta.md`, `docs/policy/agents.md`,
|
||||
`docs/policy/architecture.md`, `docs/policy/testing.md`; root `AGENTS.md`; and the
|
||||
Policy Reading Guide in `docs/development.md`, adapted from
|
||||
`d84a38ebab26f048cafbe59a2246700c35d29843` for this repository.
|
||||
@@ -16,16 +16,16 @@ SPDX-License-Identifier: CC-BY-SA-4.0
|
||||
License and notices: [CC BY-SA 4.0](licenses/CC-BY-SA-4.0.txt) |
|
||||
[COPYRIGHT](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/COPYRIGHT) |
|
||||
[LICENSE](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/LICENSE) |
|
||||
[COPYRIGHT](https://gitea.maximumdirect.net/eric/policy/src/commit/e833faddf120c789a9b45348edaf75720de16348/COPYRIGHT) |
|
||||
[LICENSE](https://gitea.maximumdirect.net/eric/policy/src/commit/e833faddf120c789a9b45348edaf75720de16348/LICENSE).
|
||||
[COPYRIGHT](https://gitea.maximumdirect.net/eric/policy/src/commit/b339ad0427a50e43a68b932a6a9f4669cc0f6252/COPYRIGHT) |
|
||||
[LICENSE](https://gitea.maximumdirect.net/eric/policy/src/commit/b339ad0427a50e43a68b932a6a9f4669cc0f6252/LICENSE).
|
||||
|
||||
[Source](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843).
|
||||
|
||||
[Source](https://gitea.maximumdirect.net/eric/policy/src/commit/e833faddf120c789a9b45348edaf75720de16348).
|
||||
[Source](https://gitea.maximumdirect.net/eric/policy/src/commit/b339ad0427a50e43a68b932a6a9f4669cc0f6252).
|
||||
|
||||
## go-yaml v4
|
||||
|
||||
Selected module: `go.yaml.in/yaml/v4` at `v4.0.0-rc.6`.
|
||||
Selected module: `go.yaml.in/yaml/v4` at `v4.0.0`.
|
||||
|
||||
Copyright 2011-2019 Canonical Ltd
|
||||
|
||||
@@ -37,7 +37,7 @@ SPDX-License-Identifier: Apache-2.0 AND MIT
|
||||
|
||||
License and notices: [Apache 2.0](licenses/Apache-2.0.txt) |
|
||||
[MIT](licenses/MIT.txt) |
|
||||
[NOTICE](https://github.com/yaml/go-yaml/blob/1c17b9cee72bf81ae73a8be50fbd7dd3a9985125/NOTICE) |
|
||||
[LICENSE](https://github.com/yaml/go-yaml/blob/1c17b9cee72bf81ae73a8be50fbd7dd3a9985125/LICENSE).
|
||||
[NOTICE](https://github.com/yaml/go-yaml/blob/f2f9563503f11b7a60da0c532175dcc693ce8d5a/NOTICE) |
|
||||
[LICENSE](https://github.com/yaml/go-yaml/blob/f2f9563503f11b7a60da0c532175dcc693ce8d5a/LICENSE).
|
||||
|
||||
[Source](https://github.com/yaml/go-yaml/tree/1c17b9cee72bf81ae73a8be50fbd7dd3a9985125).
|
||||
[Source](https://github.com/yaml/go-yaml/tree/f2f9563503f11b7a60da0c532175dcc693ce8d5a).
|
||||
|
||||
@@ -151,6 +151,11 @@ initialization, and resource checks. See the [configuration discovery
|
||||
contract](../config.md#configuration-discovery) and [ADR
|
||||
0019](../adr/0019-explicit-configuration-discovery.md).
|
||||
|
||||
The layered loader may bind application-selected dependent locations after main
|
||||
selection. Applications still choose search conventions and must explicitly
|
||||
select an overlay. [ADR 0022](../adr/0022-main-relative-context.md) records
|
||||
the deferred context decision.
|
||||
|
||||
The engine applies each input's mapping destination within the existing source
|
||||
assembly, applies immediate-parent-relative YAML destinations to imports, and
|
||||
retains each effective placement with source identity and inspection records;
|
||||
@@ -400,9 +405,14 @@ Secret values enter configuration through typed environment-name references;
|
||||
literal credentials are not a supported configuration convention. Only an explicit
|
||||
accessor exposes a resolved credential to application code. Credential bytes must
|
||||
never enter composition trees, history, or inspection. General environment-variable
|
||||
configuration overlays are an explicit non-goal. Bootstrap must preserve already
|
||||
set variables, including empty ones, and report blocked files without contents.
|
||||
See [ADR 0004](../adr/0004-secret-references-and-explicit-bootstrap.md).
|
||||
configuration overlays are an explicit non-goal. Bootstrap preserves already
|
||||
set variables by default, including empty ones, and reports blocked files without
|
||||
contents. Explicit overwrite and main-document-directed bootstrap are available
|
||||
as separate startup operations. A prepared main retains its selected document
|
||||
and passive filesystem context without retaining secret-file contents or open
|
||||
handles. [ADR 0023](../adr/0023-explicit-configured-secrets-bootstrap.md) records
|
||||
the decision; the [configuration contract](../config.md#explicit-secrets-directory-bootstrap)
|
||||
owns current behavior.
|
||||
|
||||
Secrets must be considered throughout error handling and inspection. Library
|
||||
renderers must apply secret classification, and parser errors must not be
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# Documentation Policy
|
||||
|
||||
**Base Policy Version:** 1.11
|
||||
**Base Policy Version:** 1.12
|
||||
|
||||
**Last Updated**: 2026-10-16
|
||||
**Last Updated**: 2026-11-09
|
||||
|
||||
**Upstream Source:** [Standard Repository Policies](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/docs/policy/documentation.md)
|
||||
**Upstream Source:** [Standard Repository Policies](https://gitea.maximumdirect.net/eric/policy/src/commit/b339ad0427a50e43a68b932a6a9f4669cc0f6252/docs/policy/documentation.md)
|
||||
|
||||
## Purpose
|
||||
|
||||
@@ -91,7 +91,7 @@ secret values.
|
||||
| Consumer guidance for the public Go API | `docs/consumers/` | Task-oriented public Go API usage, minimal examples, and consumer responsibilities. | Go symbol contracts, configuration semantics, and internal implementation detail. |
|
||||
| Inventory of implemented internal packages | `docs/internal/overview.md` | Implemented packages and components, responsibilities, and links to focused internal docs. | Normative architecture, contributor reading policy, external contracts. |
|
||||
| Behavior and architecture of internal packages | Other files under `docs/internal/` | Implementation flow, collaborators, state transitions, package-local guarantees and failures, and relevant tests. | Global architecture invariants, configuration definitions and defaults, external schemas, operator procedures. |
|
||||
| Architectural decision records | `docs/adr/` | Significant decisions, context, alternatives, rationale, consequences, and supersession history. | Current behavior reference, implementation status, task sequencing. |
|
||||
| Architectural decision records | `docs/adr/` | Records of significant architectural decisions and supporting rationale. | Ordinary design choices, current behavior reference, implementation status, task sequencing. |
|
||||
| Potential future features | `docs/roadmap/future.md` | Candidate enhancements and open questions for future consideration. | Rejected proposals, architectural decisions, task execution, and current behavior. |
|
||||
| Future implementation plans | Task-specific files under `docs/roadmap/` | Unfinished work, sequencing, acceptance, and progress; completed plans retire during release preparation. | Implemented behavior and ADR rationale. |
|
||||
| Release-note history | `docs/releases/` | One checked-in summary per source release under the procedure; the note at its immutable tag is the release record. | Current commands, behavior, contracts, and compatibility definitions. |
|
||||
@@ -157,10 +157,16 @@ Use sequentially numbered ADR filenames such as
|
||||
|
||||
Treat the decision content of an accepted ADR as immutable. When a decision
|
||||
changes, create a new ADR and update the earlier ADR's status to superseded.
|
||||
|
||||
ADRs should be reserved for major architectural decisions, such as ownership
|
||||
boundaries, large-scale architectural features, or invariants that rise to
|
||||
the level of architectural significance. Routine choices, implementation
|
||||
decisions, and rejected suggestions do not warrant an ADR unless they
|
||||
otherwise represent a significant architectural decision.
|
||||
|
||||
Rejected architectural alternatives and significant architectural exclusions
|
||||
belong in ADRs. Roadmaps preserve plausible future work, not rejected product
|
||||
ideas. Routine choices and rejected suggestions need no ADR unless they
|
||||
represent a significant architectural decision.
|
||||
ideas.
|
||||
|
||||
## Maintenance
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# Open Source Licensing And Attribution Policy
|
||||
|
||||
**Base Policy Version:** 1.8
|
||||
**Base Policy Version:** 1.9
|
||||
|
||||
**Last Updated**: 2026-09-28
|
||||
**Last Updated**: 2026-11-09
|
||||
|
||||
**Upstream Source:** [Standard Repository Policies](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/docs/policy/oss.md)
|
||||
**Upstream Source:** [Standard Repository Policies](https://gitea.maximumdirect.net/eric/policy/src/commit/b339ad0427a50e43a68b932a6a9f4669cc0f6252/docs/policy/oss.md)
|
||||
|
||||
## ConfigKit Applicability
|
||||
|
||||
@@ -74,8 +74,9 @@ individual packages.
|
||||
|
||||
Use the upstream [application COPYRIGHT example](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/examples/licensing/application/COPYRIGHT)
|
||||
or [library COPYRIGHT example](https://gitea.maximumdirect.net/eric/policy/src/commit/d84a38ebab26f048cafbe59a2246700c35d29843/examples/licensing/library/COPYRIGHT)
|
||||
to create the project’s root `COPYRIGHT` file.
|
||||
Use verified project names, contribution years, and copyright holders.
|
||||
to create the project’s root `COPYRIGHT` file. Use the examples as provided,
|
||||
without discretionary modification, unless otherwise instructed. Substitute
|
||||
verified project names, contribution years, and copyright holders.
|
||||
For another selected license, adapt the grant, SPDX expression, disclaimer, and
|
||||
text references together to reflect the author's selected grant.
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
# Release Policy
|
||||
|
||||
**Base Policy Version:** 1.6
|
||||
**Base Policy Version:** 1.7
|
||||
|
||||
**Last Updated**: 2026-10-09
|
||||
**Last Updated**: 2026-11-09
|
||||
|
||||
**Upstream Source:** [Standard Repository Policies](https://gitea.maximumdirect.net/eric/policy/src/commit/e833faddf120c789a9b45348edaf75720de16348/docs/policy/release.md)
|
||||
**Upstream Source:** [Standard Repository Policies](https://gitea.maximumdirect.net/eric/policy/src/commit/b339ad0427a50e43a68b932a6a9f4669cc0f6252/docs/policy/release.md)
|
||||
|
||||
## Purpose
|
||||
|
||||
@@ -110,6 +110,10 @@ For releases at or after `v1.0.0`:
|
||||
minimum as described below; and
|
||||
- a patch release may make backward-compatible fixes.
|
||||
|
||||
In this context, "backward-compatible" means only that pre-existing, valid
|
||||
configurations will continue to work following the release. Behavior need not
|
||||
remain strictly identical.
|
||||
|
||||
Before `v1.0.0`, a minor release may change a documented public, operational,
|
||||
configuration, data, integration, or compatibility contract when the release
|
||||
note explains the impact and required consumer action. A patch release must
|
||||
|
||||
@@ -103,12 +103,23 @@ go list -m go.maximumdirect.net/releasekit
|
||||
go tool releasekit version
|
||||
```
|
||||
|
||||
This repository selects ReleaseKit v0.8.0. `go tool releasekit` preserves the
|
||||
This repository selects ReleaseKit v0.10.0. `go tool releasekit` preserves the
|
||||
tool's exit status and publication report; `go run` maps a nonzero child exit
|
||||
status to 1. ReleaseKit's child Go commands
|
||||
use the `go` found on `PATH` with `GOTOOLCHAIN=local`; keep the selected
|
||||
executable first on `PATH` through the publication command.
|
||||
|
||||
If Go is configured for cross-compilation, select the host for the release
|
||||
session before preparing or running the CLI:
|
||||
|
||||
```sh
|
||||
release_host_os=$(go env GOHOSTOS)
|
||||
release_host_arch=$(go env GOHOSTARCH)
|
||||
export GOOS="$release_host_os" GOARCH="$release_host_arch"
|
||||
```
|
||||
|
||||
ReleaseKit still selects the Linux compilation targets from the profile.
|
||||
|
||||
For hosted delivery, save the Gitea API token in the ignored local file
|
||||
`.releasekit/gitea-token` with owner-only permissions. The profile uses it when
|
||||
`RELEASEKIT_GITEA_TOKEN` is unset or blank; a nonblank environment value takes
|
||||
@@ -257,10 +268,11 @@ available locally:
|
||||
|
||||
```sh
|
||||
release_version=v1.0.0
|
||||
git switch --detach "$release_version"
|
||||
git switch --detach "$release_version" && git status --short
|
||||
```
|
||||
|
||||
After preparing the tool in that tagged checkout:
|
||||
Proceed once the switch succeeds and the status output is empty. After
|
||||
preparing the tool in that tagged checkout:
|
||||
|
||||
```sh
|
||||
go tool releasekit deliver "$release_version"
|
||||
|
||||
54
docs/releases/v1.2.0.md
Normal file
54
docs/releases/v1.2.0.md
Normal file
@@ -0,0 +1,54 @@
|
||||
# ConfigKit v1.2.0
|
||||
|
||||
`LoadLayered` can now use the resolved main configuration's filesystem context
|
||||
to find companion imports and the selected overlay in a single load. For example,
|
||||
an application that discovers `/srv/campaign/config.yml` can import fragments
|
||||
from `/srv/campaign/prompts/` and apply
|
||||
`/srv/campaign/overlays/production.yml`, regardless of its working directory.
|
||||
|
||||
## Main-relative companion inputs
|
||||
|
||||
Set `Input.MainRelative` to `MainRelative()` on a non-file underlay to use the
|
||||
main input's resolved context. Enable imports separately and declare the files
|
||||
or directories to load. A concrete `Input.Filesystem` takes precedence over the
|
||||
binding. The derived context keeps the main input's filesystem namespace and
|
||||
containment root, with lookup starting at its resolved base directory.
|
||||
|
||||
When the main supplies no usable context, the companion can use a
|
||||
`MainRelativeContext.Fallback`. Otherwise, optional imports are skipped and
|
||||
the companion's own configuration still contributes. Required imports that
|
||||
need targets fail, and `RequireBase` requires a usable context even when imports
|
||||
are disabled. Skipped imports produce no filesystem search evidence.
|
||||
|
||||
The consumer example combines embedded defaults, operator imports, and a selected
|
||||
overlay. [Example](../../examples/consumers/main_relative.go) ·
|
||||
[Layered loading contract](../config.md#layered-loading)
|
||||
|
||||
## Overlay lookup and filesystem checks
|
||||
|
||||
`LoadLayered` now looks for a selected overlay using `OverlayFilesystem`, the
|
||||
resolved main context, or `OverlayFallback`, in that order. Derived and fallback
|
||||
lookups start at the context's base directory. Explicit overlay contexts and
|
||||
ordinary `Load` use their existing root-relative lookup. A selected overlay
|
||||
must exist in the chosen context.
|
||||
|
||||
Native overlays resolve symlink targets when the filesystem exposes link
|
||||
inspection. This catches targets outside the configured root and aliases of
|
||||
already acquired files in the same namespace. Derived standalone host contexts
|
||||
now check root access the same way explicit contexts do. [Overlay contract](../config.md#selected-overlays)
|
||||
|
||||
## Upgrade notes
|
||||
|
||||
Use keyed Go literals when constructing `Input` and `LayeredOptions`. Both
|
||||
types gained fields, so existing positional literals need updating. The minimum
|
||||
consumer Go version is 1.27.0.
|
||||
|
||||
Internally, imports with and without a filesystem base share root placement
|
||||
and accounting. Directory import policies reuse default patterns, and companions
|
||||
in the same tier share one derived context.
|
||||
|
||||
The repository also adopted upstream documentation, licensing, and release
|
||||
policy updates, including clearer guidance on when to write an ADR and what
|
||||
compatibility means for existing configurations. [Repository policies](../policy/meta.md)
|
||||
|
||||
[COPYRIGHT](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.2.0/COPYRIGHT) | [LICENSE](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.2.0/LICENSE) | [ATTRIBUTION](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.2.0/docs/oss/attribution.md)
|
||||
11
docs/releases/v1.2.1.md
Normal file
11
docs/releases/v1.2.1.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# ConfigKit v1.2.1
|
||||
|
||||
ConfigKit now uses the stable go-yaml v4.0.0 release in place of v4.0.0-rc.6.
|
||||
Existing Go code and configuration files require no changes. The minimum
|
||||
consumer Go version remains 1.27.0.
|
||||
|
||||
The maintainer release workflow now uses ReleaseKit v0.10.0, which updates
|
||||
Markdown validation dependencies and includes fixes for publication recovery
|
||||
and hosted release retries.
|
||||
|
||||
[COPYRIGHT](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.2.1/COPYRIGHT) | [LICENSE](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.2.1/LICENSE) | [ATTRIBUTION](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.2.1/docs/oss/attribution.md)
|
||||
50
docs/releases/v1.3.0.md
Normal file
50
docs/releases/v1.3.0.md
Normal file
@@ -0,0 +1,50 @@
|
||||
# ConfigKit v1.3.0
|
||||
|
||||
Applications can now bootstrap secrets from a directory declared in a discovered
|
||||
main configuration file, then load that same captured document. Explicit
|
||||
overwrite options support deployments that give provisioned secret files
|
||||
priority over existing environment variables.
|
||||
|
||||
## Configured secrets startup
|
||||
|
||||
Call `LoadSecretsIntoEnvironmentFromConfig` with a host `File` or `SearchConfig`
|
||||
source. The selected main file can declare:
|
||||
|
||||
```yaml
|
||||
config:
|
||||
secrets_dir: secrets
|
||||
secrets_overwrite: true
|
||||
```
|
||||
|
||||
The helper resolves the directory relative to the main file's canonical
|
||||
directory, within its filesystem root, and bootstraps all eligible entries.
|
||||
It returns a secrets report and a prepared source. Pass that source to `Load`,
|
||||
or use it as the main `Input.Source` for `LoadLayered`.
|
||||
|
||||
The prepared source retains the selected main contents and filesystem context
|
||||
for reuse. Later loads acquire imports and look up environment values at their
|
||||
normal lifecycle points. `SecretsFromConfigOptions.Filesystem` can select a
|
||||
wider host root during preparation. An explicit context supplied to a later
|
||||
load must resolve to the captured context. [Startup example](../../examples/consumers/secrets.go) · [Configuration contract](../config.md#explicit-secrets-directory-bootstrap)
|
||||
|
||||
## Explicit overwrite policy
|
||||
|
||||
Overwrite defaults to false, preserving existing variables including empty
|
||||
ones. YAML `secrets_overwrite: true` enables replacement during configured
|
||||
bootstrap. A non-nil `SecretsFromConfigOptions.Overwrite` takes precedence over
|
||||
YAML, including an explicit false.
|
||||
|
||||
For an application-supplied directory, use
|
||||
`LoadSecretsIntoEnvironmentWithOptions` with `SecretsOptions{Overwrite: true}`.
|
||||
Existing `LoadSecretsIntoEnvironment(directory)` calls retain their preservation
|
||||
behavior and exact Go function signature.
|
||||
|
||||
Bootstrap runs through an explicit helper call before configuration loading.
|
||||
Reports describe writes, skips, and partial failures without credential contents.
|
||||
A later configuration failure leaves completed environment writes in place.
|
||||
Ordinary `Load` and `LoadLayered` consume the main controls and resolve typed
|
||||
secret references from the environment. [Bootstrap and failure handling](../config.md#preflight-limits-and-partial-writes)
|
||||
|
||||
Consumers require Go 1.27.0 or later.
|
||||
|
||||
[COPYRIGHT](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.3.0/COPYRIGHT) | [LICENSE](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.3.0/LICENSE) | [ATTRIBUTION](https://forge.maximumdirect.net/base-layer/configkit/src/tag/v1.3.0/docs/oss/attribution.md)
|
||||
@@ -102,3 +102,29 @@ string equality must not be presented as semantic equality.
|
||||
Keeping `Path` solely as an opaque query/building value remains an alternative.
|
||||
No current contract changes or implementation commitment follow from this entry;
|
||||
a comparison operation can be added compatibly later.
|
||||
|
||||
## 5. Single-file named overlays
|
||||
|
||||
Status: deferred. Consider supporting a single `overlays.yml` containing named
|
||||
overlay bodies alongside the existing
|
||||
[selected-overlay directory convention](../config.md#selected-overlays).
|
||||
This would let small applications keep their overlays in one file. Planning was
|
||||
tabled because the added semantics outweighed the immediate convenience; the
|
||||
draft is preserved at `3e50388:docs/roadmap/overlays.md`.
|
||||
|
||||
The draft selected a direct name-to-body mapping, strict peer composition when
|
||||
both storage forms contribute to the selected name, and file-level version
|
||||
checks using the application's existing rule and mode. These provide a starting
|
||||
point for reconsideration, not an implementation commitment.
|
||||
|
||||
### Questions to resolve before implementation
|
||||
|
||||
- Where should collection controls live: within each named body or at catalog
|
||||
level, and how should that interact with document-root control ownership?
|
||||
- How should configured version metadata paths coexist with overlay names,
|
||||
including nested paths and modes that do not check overlay versions?
|
||||
- Which semantic checks should apply to unselected bodies?
|
||||
- Should `.yaml` also be recognized, and how should multiple matching files
|
||||
interact?
|
||||
- How should catalog lookup be enabled without disrupting successful loads that
|
||||
previously ignored an adjacent `overlays.yml`?
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
//go:embed testdata/native-source testdata/layered-bundle testdata/collection-bundle testdata/ordinary-imports testdata/source-version
|
||||
//go:embed testdata/native-source testdata/layered-bundle testdata/collection-bundle testdata/ordinary-imports testdata/source-version testdata/main-relative-bundle
|
||||
var bundledFiles embed.FS
|
||||
|
||||
// BundledConfig is a small configuration loaded directly from an embedded file.
|
||||
|
||||
47
examples/consumers/main_relative.go
Normal file
47
examples/consumers/main_relative.go
Normal file
@@ -0,0 +1,47 @@
|
||||
package consumers
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"path/filepath"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
// CompanionConfig demonstrates independently bundled and operator prompt tiers.
|
||||
type CompanionConfig struct {
|
||||
Mode string `yaml:"mode"`
|
||||
Prompts []CompanionPrompt `yaml:"prompts"`
|
||||
}
|
||||
|
||||
type CompanionPrompt struct {
|
||||
ID string `yaml:"id"`
|
||||
Text string `yaml:"text"`
|
||||
Note string `yaml:"note"`
|
||||
}
|
||||
|
||||
// LoadCompanionConfig discovers a main file and binds operator imports and the
|
||||
// selected overlay to its directory while retaining the embedded catalog tier.
|
||||
func LoadCompanionConfig(mainPath, overlay string) (*configkit.Result[CompanionConfig], error) {
|
||||
files, err := fs.Sub(bundledFiles, "testdata/main-relative-bundle")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
bundle := configkit.NewFilesystem("bundled catalog", files)
|
||||
absolute, err := filepath.Abs(mainPath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
declarations := map[string]any{"config": map[string]any{"imports": []any{
|
||||
map[string]any{"path": "prompts.yml", "destination": []any{"prompts"}, "placement": "sequence-item"},
|
||||
map[string]any{"dir": "operator", "recursive": true, "pattern": []any{"*.yml", "*.yaml"}, "destination": []any{"prompts"}, "placement": "sequence-item"},
|
||||
}}}
|
||||
main := configkit.SearchConfig("", configkit.Searches(configkit.SearchPaths(absolute)), configkit.SearchOptions{Required: true})
|
||||
return configkit.LoadLayered(configkit.Input{Source: main}, configkit.LayeredOptions[CompanionConfig]{
|
||||
Underlays: []configkit.Underlay{
|
||||
{Inputs: []configkit.Input{{Source: bundle.File("catalog.yml")}}},
|
||||
{Inputs: []configkit.Input{{Source: configkit.Mapping("operator imports", declarations), Imports: true, MainRelative: configkit.MainRelative()}}},
|
||||
},
|
||||
Overlay: overlay,
|
||||
Definition: configkit.Definition[CompanionConfig]{SequenceIdentities: []configkit.SequenceIdentity{configkit.SequenceIdentityAt(configkit.Keys("prompts"), "id")}},
|
||||
})
|
||||
}
|
||||
86
examples/consumers/main_relative_test.go
Normal file
86
examples/consumers/main_relative_test.go
Normal file
@@ -0,0 +1,86 @@
|
||||
package consumers_test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
"go.maximumdirect.net/configkit/examples/consumers"
|
||||
)
|
||||
|
||||
func Example_mainRelativeCompanions() {
|
||||
result, err := consumers.LoadCompanionConfig(fixture("main-relative", "main.yml"), "live")
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
fmt.Println(result.Config.Mode, result.Config.Prompts)
|
||||
// Output: overlay [{shared operator replacement } {bundled bundled text } {local local text transitive detail}]
|
||||
}
|
||||
|
||||
func TestMainRelativeStrictPeers(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
for name, contents := range map[string]string{
|
||||
"main.yml": "mode: main\n", "prompts.yml": "id: duplicate\ntext: first\n", "operator/second.yml": "id: duplicate\ntext: second\n",
|
||||
} {
|
||||
file := filepath.Join(root, name)
|
||||
if err := os.MkdirAll(filepath.Dir(file), 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(file, []byte(contents), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
_, err := consumers.LoadCompanionConfig(filepath.Join(root, "main.yml"), "")
|
||||
if err == nil {
|
||||
t.Fatal("duplicate peer identities succeeded")
|
||||
}
|
||||
for _, d := range err.(*configkit.LoadError).Diagnostics() {
|
||||
if d.Code == configkit.CodeComposeConflict {
|
||||
return
|
||||
}
|
||||
}
|
||||
t.Fatalf("diagnostics = %#v", err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
|
||||
func TestMainRelativeOptionalResources(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
file, directory, empty bool
|
||||
count int
|
||||
}{
|
||||
{"neither", false, false, false, 2}, {"file", true, false, false, 3},
|
||||
{"directory", false, true, false, 3}, {"both", true, true, false, 4}, {"empty directory", false, false, true, 2},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.WriteFile(filepath.Join(root, "main.yml"), []byte("mode: main\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if tc.file {
|
||||
if err := os.WriteFile(filepath.Join(root, "prompts.yml"), []byte("id: file\ntext: file\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if tc.directory || tc.empty {
|
||||
if err := os.Mkdir(filepath.Join(root, "operator"), 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if tc.directory {
|
||||
if err := os.WriteFile(filepath.Join(root, "operator", "item.yaml"), []byte("id: directory\ntext: directory\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
result, err := consumers.LoadCompanionConfig(filepath.Join(root, "main.yml"), "")
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if len(result.Config.Prompts) != tc.count {
|
||||
t.Fatalf("prompts = %#v", result.Config.Prompts)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
18
examples/consumers/secrets.go
Normal file
18
examples/consumers/secrets.go
Normal file
@@ -0,0 +1,18 @@
|
||||
package consumers
|
||||
|
||||
import configkit "go.maximumdirect.net/configkit"
|
||||
|
||||
// StartupConfig demonstrates an environment-backed credential and ordinary data.
|
||||
type StartupConfig struct {
|
||||
Name string `yaml:"name"`
|
||||
Token configkit.Secret `yaml:"token"`
|
||||
}
|
||||
|
||||
// PrepareStartup performs the explicit bootstrap once and returns a captured
|
||||
// main that can be passed to either Load or LoadLayered as its main source.
|
||||
// The caller should handle a non-nil report even if preparation fails.
|
||||
func PrepareStartup(main configkit.Source, root string) (*configkit.SecretsReport, configkit.Source, error) {
|
||||
return configkit.LoadSecretsIntoEnvironmentFromConfig(main, configkit.SecretsFromConfigOptions{
|
||||
Filesystem: &configkit.FilesystemContext{Root: root},
|
||||
})
|
||||
}
|
||||
41
examples/consumers/secrets_test.go
Normal file
41
examples/consumers/secrets_test.go
Normal file
@@ -0,0 +1,41 @@
|
||||
package consumers_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
"go.maximumdirect.net/configkit/examples/consumers"
|
||||
)
|
||||
|
||||
func TestConfiguredSecretsStartup(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.Mkdir(filepath.Join(root, "secrets"), 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
const name = "CONFIGKIT_EXAMPLE_STARTUP_SECRET"
|
||||
t.Setenv(name, "")
|
||||
if err := os.WriteFile(filepath.Join(root, "secrets", name), []byte("example-value\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
main := filepath.Join(root, "main.yml")
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: secrets, secrets_overwrite: true}\nname: app\ntoken: "+name+"\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
search := configkit.SearchConfig("app", configkit.SearchPaths(main))
|
||||
report, prepared, err := consumers.PrepareStartup(search, root)
|
||||
if err != nil || len(report.Entries()) != 1 || report.Entries()[0].Status != configkit.SecretFileLoaded {
|
||||
t.Fatalf("prepare = %#v, %v", report, err)
|
||||
}
|
||||
ordinary, err := configkit.Load[consumers.StartupConfig](prepared)
|
||||
if err != nil || ordinary.Config.Name != "app" || ordinary.Config.Token.Value() != "example-value" {
|
||||
t.Fatalf("ordinary load = %#v, %v", ordinary, err)
|
||||
}
|
||||
layered, err := configkit.LoadLayered(configkit.Input{Source: prepared}, configkit.LayeredOptions[consumers.StartupConfig]{
|
||||
Underlays: []configkit.Underlay{{Inputs: []configkit.Input{{Source: configkit.Bytes("defaults", []byte("name: default\n"))}}}},
|
||||
})
|
||||
if err != nil || layered.Config.Name != "app" || layered.Config.Token.Value() != "example-value" {
|
||||
t.Fatalf("layered load = %#v, %v", layered, err)
|
||||
}
|
||||
}
|
||||
7
examples/consumers/testdata/main-relative-bundle/catalog.yml
vendored
Normal file
7
examples/consumers/testdata/main-relative-bundle/catalog.yml
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
mode: embedded
|
||||
prompts:
|
||||
- id: shared
|
||||
text: embedded text
|
||||
note: replaced
|
||||
- id: bundled
|
||||
text: bundled text
|
||||
1
examples/consumers/testdata/main-relative/main.yml
vendored
Normal file
1
examples/consumers/testdata/main-relative/main.yml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
mode: main
|
||||
5
examples/consumers/testdata/main-relative/operator/nested/one.yaml
vendored
Normal file
5
examples/consumers/testdata/main-relative/operator/nested/one.yaml
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
config:
|
||||
imports:
|
||||
- path: ../../shared/extra.yml
|
||||
id: local
|
||||
text: local text
|
||||
1
examples/consumers/testdata/main-relative/overlays/live.yml
vendored
Normal file
1
examples/consumers/testdata/main-relative/overlays/live.yml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
mode: overlay
|
||||
2
examples/consumers/testdata/main-relative/prompts.yml
vendored
Normal file
2
examples/consumers/testdata/main-relative/prompts.yml
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
id: shared
|
||||
text: operator replacement
|
||||
1
examples/consumers/testdata/main-relative/shared/extra.yml
vendored
Normal file
1
examples/consumers/testdata/main-relative/shared/extra.yml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
note: transitive detail
|
||||
@@ -1,6 +1,8 @@
|
||||
package configkit_test
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
@@ -8,6 +10,72 @@ import (
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
func TestMainBootstrapControlsAreConsumedWithoutEnvironmentWrites(t *testing.T) {
|
||||
t.Setenv("CONFIGKIT_CONTROL_SENTINEL", "unchanged")
|
||||
type nested struct {
|
||||
Config struct {
|
||||
Directory string `yaml:"secrets_dir"`
|
||||
} `yaml:"config"`
|
||||
}
|
||||
type app struct {
|
||||
Service nested `yaml:"service"`
|
||||
}
|
||||
for _, imports := range []bool{false, true} {
|
||||
body := "config: {secrets_dir: missing, secrets_overwrite: true}\nservice: {config: {secrets_dir: ordinary}}\n"
|
||||
fs := configkit.NewFilesystem("bundle", fstest.MapFS{"main.yml": {Data: []byte(body)}})
|
||||
result, err := configkit.Load[app](fs.File("main.yml"), configkit.Options[app]{Imports: imports})
|
||||
if err != nil || result.Config.Service.Config.Directory != "ordinary" || os.Getenv("CONFIGKIT_CONTROL_SENTINEL") != "unchanged" {
|
||||
t.Fatalf("imports %v: result = %#v, error = %v", imports, result, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestBootstrapControlsRejectMisplacedAndMalformedValues(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
name, body string
|
||||
code configkit.Code
|
||||
path string
|
||||
}{
|
||||
{"directory", "config: {secrets_dir: null}\n", configkit.CodeSecretsInvalidPath, "/config/secrets_dir"},
|
||||
{"overwrite", "config: {secrets_overwrite: 'false'}\n", configkit.CodeSecretsInvalidValue, "/config/secrets_overwrite"},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
_, err := configkit.Load[struct{}](configkit.Bytes("main", []byte(test.body)))
|
||||
var loadErr *configkit.LoadError
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != test.code || loadErr.Diagnostics()[0].Path.String() != test.path || loadErr.Diagnostics()[0].Primary == nil {
|
||||
t.Fatalf("error = %#v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
fs := configkit.NewFilesystem("bundle", fstest.MapFS{
|
||||
"main.yml": {Data: []byte("config: {imports: [{path: other.yml}]}\n")},
|
||||
"other.yml": {Data: []byte("config: {secrets_overwrite: false}\n")},
|
||||
})
|
||||
_, err := configkit.Load[struct{}](fs.File("main.yml"), configkit.Options[struct{}]{Imports: true})
|
||||
var loadErr *configkit.LoadError
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != configkit.CodeImportInvalid || loadErr.Diagnostics()[0].Path.String() != "/config/secrets_overwrite" {
|
||||
t.Fatalf("import error = %#v", err)
|
||||
}
|
||||
_, err = configkit.LoadLayered(configkit.Input{Source: configkit.Bytes("main", []byte("{}\n"))}, configkit.LayeredOptions[struct{}]{
|
||||
Underlays: []configkit.Underlay{{Inputs: []configkit.Input{{Source: configkit.Bytes("underlay", []byte("config: {secrets_dir: secrets}\n"))}}}},
|
||||
})
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != configkit.CodeImportInvalid {
|
||||
t.Fatalf("underlay error = %#v", err)
|
||||
}
|
||||
overlays := configkit.NewFilesystem("overlays", fstest.MapFS{
|
||||
"main.yml": {Data: []byte("{}\n")},
|
||||
"overlays/dev.yml": {Data: []byte("config: {secrets_overwrite: false}\n")},
|
||||
})
|
||||
_, err = configkit.Load[struct{}](overlays.File("main.yml"), configkit.Options[struct{}]{Overlay: "dev"})
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != configkit.CodeOverlayDirective || loadErr.Diagnostics()[0].Primary == nil {
|
||||
t.Fatalf("overlay error = %#v", err)
|
||||
}
|
||||
_, err = configkit.Load[struct{}](configkit.Bytes("main", []byte("config: {imports: [], secrets_overwrite: false}\n")))
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != configkit.CodeImportDisabled {
|
||||
t.Fatalf("disabled imports error = %#v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDocumentRootControlsAndNestedApplicationConfig(t *testing.T) {
|
||||
type settings struct {
|
||||
Imports string `yaml:"imports"`
|
||||
|
||||
253
facade_main_relative_integration_test.go
Normal file
253
facade_main_relative_integration_test.go
Normal file
@@ -0,0 +1,253 @@
|
||||
package configkit_test
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
func TestMainRelativeStandaloneRejectsInaccessibleHostRoot(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
mainPath := filepath.Join(root, "main.yml")
|
||||
if err := os.WriteFile(mainPath, []byte("count: 1\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Chmod(root, 0100); err != nil {
|
||||
t.Skipf("cannot set search-only permissions: %v", err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
if err := os.Chmod(root, 0700); err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
})
|
||||
handle, err := os.OpenRoot(root)
|
||||
if err == nil {
|
||||
_ = handle.Close()
|
||||
t.Skip("host allows opening this search-only directory")
|
||||
}
|
||||
if !errors.Is(err, os.ErrPermission) {
|
||||
t.Fatalf("open root = %v, want permission denied", err)
|
||||
}
|
||||
if _, err := os.ReadFile(mainPath); err != nil {
|
||||
t.Skipf("main must remain readable by name: %v", err)
|
||||
}
|
||||
|
||||
main := configkit.Input{Source: configkit.File(mainPath)}
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
filesystem *configkit.FilesystemContext
|
||||
}{
|
||||
{name: "derived"},
|
||||
{name: "explicit", filesystem: &configkit.FilesystemContext{Root: root, BaseDir: root}},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
underlay := configkit.Input{
|
||||
Source: configkit.Bytes("companion", []byte("{}\n")),
|
||||
MainRelative: &configkit.MainRelativeContext{RequireBase: true},
|
||||
Filesystem: tc.filesystem,
|
||||
}
|
||||
_, err := configkit.LoadLayered(main, configkit.LayeredOptions[layeredFacadeConfig]{
|
||||
Underlays: []configkit.Underlay{{Inputs: []configkit.Input{underlay}}},
|
||||
})
|
||||
var failure *configkit.LoadError
|
||||
if !errors.As(err, &failure) {
|
||||
t.Fatalf("error = %v, want a load error", err)
|
||||
}
|
||||
diagnostics := failure.Diagnostics()
|
||||
if len(diagnostics) != 1 || diagnostics[0].Code != configkit.CodeImportPermission {
|
||||
t.Fatalf("diagnostics = %#v, want import.permission", diagnostics)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeDiscoveryAndEvidence(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
first, second := filepath.Join(root, "first"), filepath.Join(root, "second")
|
||||
for _, dir := range []string{first, second} {
|
||||
if err := os.MkdirAll(dir, 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(dir, "main.yml"), []byte("count: 1\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(dir, "fragment.yml"), []byte("settings: {selected: "+filepath.Base(dir)+"}\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
binding := configkit.MainRelative()
|
||||
underlay := configkit.Input{Source: configkit.Bytes("declaration", []byte("config: {imports: [{path: fragment.yml}]}\n")), Imports: true, MainRelative: binding}
|
||||
for _, test := range []struct {
|
||||
name string
|
||||
paths []string
|
||||
want string
|
||||
}{
|
||||
{"first", []string{filepath.Join(first, "main.yml"), filepath.Join(second, "main.yml")}, "first"},
|
||||
{"later", []string{filepath.Join(root, "missing.yml"), filepath.Join(second, "main.yml")}, "second"},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
var callbacks int
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: configkit.SearchConfig("", configkit.SearchPaths(test.paths...))}, configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{underlay}}}, Definition: configkit.Definition[layeredFacadeConfig]{Validate: func(*layeredFacadeConfig, *configkit.Validation) { callbacks++ }}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Settings["selected"] != test.want || callbacks != 1 {
|
||||
t.Fatalf("config = %#v, callbacks = %d", result.Config, callbacks)
|
||||
}
|
||||
sources := result.Sources()
|
||||
if len(sources) != 3 || sources[0].Layer != configkit.LayerMain || sources[1].Layer != configkit.LayerUnderlay || sources[2].Layer != configkit.LayerUnderlay || sources[2].UnderlayIndex != 1 || filepath.Base(sources[2].Path) != "fragment.yml" || sources[1].Path != "" {
|
||||
t.Fatalf("sources = %#v", sources)
|
||||
}
|
||||
if _, ok := result.SourceContext(sources[1].ID); !ok {
|
||||
t.Fatal("bound synthetic source lacks context")
|
||||
}
|
||||
if _, ok := result.SourceContext(sources[2].ID); !ok {
|
||||
t.Fatal("import source lacks context")
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeSyntheticMainContexts(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.WriteFile(filepath.Join(root, "fragment.yml"), []byte("settings: {selected: synthetic}\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
ctx := &configkit.FilesystemContext{Root: root, BaseDir: root}
|
||||
mainSources := []configkit.Source{configkit.Bytes("main bytes", []byte("count: 1\n")), configkit.Reader("main reader", strings.NewReader("count: 1\n")), configkit.Mapping("main mapping", map[string]any{"count": 1})}
|
||||
for _, source := range mainSources {
|
||||
input := configkit.Input{Source: configkit.Bytes("underlay", []byte("config: {imports: [{path: fragment.yml}]}\n")), Imports: true, MainRelative: configkit.MainRelative()}
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: source, Filesystem: ctx}, configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{input}}}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Settings["selected"] != "synthetic" {
|
||||
t.Fatalf("config = %#v", result.Config)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeSelectedMainFailureIsTerminal(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
bad, good := filepath.Join(root, "bad.yml"), filepath.Join(root, "good.yml")
|
||||
if err := os.WriteFile(bad, []byte("count: [\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(good, []byte("count: 1\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
called := false
|
||||
input := configkit.Input{Source: configkit.Bytes("underlay", []byte("count: 3\n")), MainRelative: &configkit.MainRelativeContext{Fallback: &configkit.FilesystemContext{Root: root, BaseDir: root}}}
|
||||
_, err := configkit.LoadLayered(configkit.Input{Source: configkit.SearchConfig("", configkit.SearchPaths(bad, good))}, configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{input}}}, Definition: configkit.Definition[layeredFacadeConfig]{Validate: func(*layeredFacadeConfig, *configkit.Validation) { called = true }}})
|
||||
if err == nil || called {
|
||||
t.Fatalf("error = %v, callback = %v", err, called)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeSourceVersionEvidence(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.WriteFile(filepath.Join(root, "main.yml"), []byte("version: 1\ncount: 1\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(root, "fragment.yml"), []byte("version: 2\nsettings: {loaded: fragment}\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
input := configkit.Input{Source: configkit.Bytes("companion", []byte("version: 3\nconfig: {imports: [{path: fragment.yml}]}\n")), Imports: true, MainRelative: configkit.MainRelative()}
|
||||
type versioned struct {
|
||||
Version int `yaml:"version"`
|
||||
Count int `yaml:"count"`
|
||||
Settings map[string]string `yaml:"settings"`
|
||||
}
|
||||
definition := configkit.Definition[versioned]{Version: &configkit.VersionRule{Path: configkit.Keys("version"), Check: func(configkit.Version, *configkit.Validation) error { return nil }}}
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: configkit.File(filepath.Join(root, "main.yml"))}, configkit.LayeredOptions[versioned]{Definition: definition, SourceVersionMode: configkit.SourceVersionModeRequired, Underlays: []configkit.Underlay{{Inputs: []configkit.Input{input}}}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
sources := result.Sources()
|
||||
if len(sources) != 3 {
|
||||
t.Fatalf("sources = %#v", sources)
|
||||
}
|
||||
for i, want := range []string{"1", "3", "2"} {
|
||||
evidence := sources[i].VersionEvidence
|
||||
if evidence == nil || evidence.Version.Text != want || evidence.Location == nil || evidence.Location.SourceID != sources[i].ID {
|
||||
t.Fatalf("version evidence = %#v", sources)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeOptionalSearchExhaustion(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.Mkdir(filepath.Join(root, "overlays"), 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for name, content := range map[string]string{
|
||||
"fragment.yml": "settings: {companion: loaded}\n",
|
||||
"overlays/live.yml": "count: 9\n",
|
||||
} {
|
||||
if err := os.WriteFile(filepath.Join(root, name), []byte(content), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
search := configkit.SearchConfig("", configkit.SearchPaths(filepath.Join(root, "absent.yml")))
|
||||
missing := filepath.Join(root, "missing-fallback")
|
||||
fallback := &configkit.FilesystemContext{Root: missing, BaseDir: missing}
|
||||
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
mainContext *configkit.FilesystemContext
|
||||
bindingFallback *configkit.FilesystemContext
|
||||
overlayFallback *configkit.FilesystemContext
|
||||
overlay string
|
||||
wantCount int
|
||||
wantSources int
|
||||
}{
|
||||
{name: "skip without context", wantCount: 3, wantSources: 1},
|
||||
{
|
||||
name: "root-only main context wins", mainContext: &configkit.FilesystemContext{Root: root},
|
||||
bindingFallback: fallback, overlayFallback: fallback, overlay: "live", wantCount: 9, wantSources: 3,
|
||||
},
|
||||
{name: "selected missing companion fallback", bindingFallback: fallback},
|
||||
{name: "selected missing overlay fallback", overlay: "live", overlayFallback: fallback},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
underlay := configkit.Input{
|
||||
Source: configkit.Bytes("companion", []byte("count: 3\nconfig: {imports: [{path: fragment.yml}]}\n")),
|
||||
Imports: true, MainRelative: &configkit.MainRelativeContext{Fallback: tc.bindingFallback},
|
||||
}
|
||||
result, err := configkit.LoadLayered(
|
||||
configkit.Input{Source: search, Filesystem: tc.mainContext},
|
||||
configkit.LayeredOptions[layeredFacadeConfig]{
|
||||
Underlays: []configkit.Underlay{{Inputs: []configkit.Input{underlay}}},
|
||||
Overlay: tc.overlay, OverlayFallback: tc.overlayFallback,
|
||||
},
|
||||
)
|
||||
if tc.wantSources == 0 {
|
||||
if err == nil {
|
||||
t.Fatal("missing selected fallback succeeded")
|
||||
}
|
||||
diagnostics := err.(*configkit.LoadError).Diagnostics()
|
||||
if len(diagnostics) != 1 || diagnostics[0].Code != configkit.CodeImportInvalid {
|
||||
t.Fatalf("diagnostics = %#v", diagnostics)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
sources := result.Sources()
|
||||
if result.Config.Count != tc.wantCount || len(sources) != tc.wantSources {
|
||||
t.Fatalf("config = %#v, sources = %#v", result.Config, sources)
|
||||
}
|
||||
if sources[0].Layer != configkit.LayerUnderlay || len(sources[0].EmptyImportSelections) != 0 {
|
||||
t.Fatalf("declaring source = %#v", sources[0])
|
||||
}
|
||||
if tc.mainContext != nil && (result.Config.Settings["companion"] != "loaded" || sources[2].Layer != configkit.LayerOverlay) {
|
||||
t.Fatalf("config = %#v, sources = %#v", result.Config, sources)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
45
facade_main_relative_options_test.go
Normal file
45
facade_main_relative_options_test.go
Normal file
@@ -0,0 +1,45 @@
|
||||
package configkit_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
func TestMainRelativeOptions(t *testing.T) {
|
||||
if configkit.MainRelative() == configkit.MainRelative() {
|
||||
t.Fatal("binding descriptions must be distinct")
|
||||
}
|
||||
invalid := &configkit.FilesystemContext{BaseDir: "relative", Root: "relative"}
|
||||
cases := []struct {
|
||||
name string
|
||||
main configkit.Input
|
||||
underlay configkit.Input
|
||||
overlay string
|
||||
overlayContext, fallback *configkit.FilesystemContext
|
||||
wantError bool
|
||||
}{
|
||||
{name: "binding on main", main: configkit.Input{Source: configkit.NoSource(), MainRelative: configkit.MainRelative()}, wantError: true},
|
||||
{name: "binding on file", underlay: configkit.Input{Source: configkit.File("missing"), MainRelative: configkit.MainRelative()}, wantError: true},
|
||||
{name: "invalid fallback", underlay: configkit.Input{Source: configkit.NoSource(), MainRelative: &configkit.MainRelativeContext{Fallback: invalid}}, wantError: true},
|
||||
{name: "shadowed binding", underlay: configkit.Input{Source: configkit.NoSource(), Filesystem: &configkit.FilesystemContext{Root: t.TempDir()}, MainRelative: &configkit.MainRelativeContext{Fallback: invalid}}},
|
||||
{name: "inactive overlay fallback", fallback: invalid},
|
||||
{name: "invalid explicit overlay", overlay: "test", overlayContext: invalid, fallback: &configkit.FilesystemContext{Root: t.TempDir(), BaseDir: t.TempDir()}, wantError: true},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
main := tc.main
|
||||
if tc.name != "binding on main" {
|
||||
main.Source = configkit.NoSource()
|
||||
}
|
||||
opts := configkit.LayeredOptions[layeredFacadeConfig]{Overlay: tc.overlay, OverlayFilesystem: tc.overlayContext, OverlayFallback: tc.fallback}
|
||||
if tc.name == "binding on file" || tc.name == "invalid fallback" || tc.name == "shadowed binding" {
|
||||
opts.Underlays = []configkit.Underlay{{Inputs: []configkit.Input{tc.underlay}}}
|
||||
}
|
||||
_, err := configkit.LoadLayered(main, opts)
|
||||
if (err != nil) != tc.wantError {
|
||||
t.Fatalf("error = %v, want error %v", err, tc.wantError)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
260
facade_main_relative_test.go
Normal file
260
facade_main_relative_test.go
Normal file
@@ -0,0 +1,260 @@
|
||||
package configkit_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
func TestMainRelativeCompanion(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
if err := os.WriteFile(filepath.Join(dir, "main.yml"), []byte("count: 3\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(dir, "extra.yml"), []byte("settings: {companion: host}\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
binding := configkit.MainRelative()
|
||||
companion := configkit.Input{Source: configkit.Bytes("companions", []byte("config: {imports: [{path: extra.yml}]}\n")), Imports: true, MainRelative: binding}
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: configkit.File(filepath.Join(dir, "main.yml"))}, configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{companion}}}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 3 || result.Config.Settings["companion"] != "host" {
|
||||
t.Fatalf("configuration = %#v", result.Config)
|
||||
}
|
||||
native := configkit.NewFilesystem("bundle", fstest.MapFS{"dir/main.yml": &fstest.MapFile{Data: []byte("count: 4\n")}, "dir/extra.yml": &fstest.MapFile{Data: []byte("settings: {companion: native}\n")}})
|
||||
result, err = configkit.LoadLayered(configkit.Input{Source: native.File("dir/main.yml")}, configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{companion}}}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 4 || result.Config.Settings["companion"] != "native" {
|
||||
t.Fatalf("configuration = %#v", result.Config)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeContextSelection(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
base := filepath.Join(root, "main")
|
||||
if err := os.Mkdir(base, 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for path, value := range map[string]string{"main/main.yml": "count: 1\n", "main/extra.yml": "settings: {value: derived}\n", "extra.yml": "settings: {value: fallback}\n"} {
|
||||
if err := os.WriteFile(filepath.Join(root, path), []byte(value), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
link := filepath.Join(root, "link.yml")
|
||||
if err := os.Symlink(filepath.Join(base, "main.yml"), link); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
companion := configkit.Input{Source: configkit.Bytes("companion", []byte("config: {imports: [{path: extra.yml}]}\n")), Imports: true, MainRelative: &configkit.MainRelativeContext{Fallback: &configkit.FilesystemContext{Root: root, BaseDir: root}}}
|
||||
opts := configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{companion}}}}
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: configkit.File(link), Filesystem: &configkit.FilesystemContext{Root: root}}, opts)
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if got := result.Config.Settings["value"]; got != "derived" {
|
||||
t.Fatalf("derived value = %q", got)
|
||||
}
|
||||
result, err = configkit.LoadLayered(configkit.Input{Source: configkit.NoSource()}, opts)
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if got := result.Config.Settings["value"]; got != "fallback" {
|
||||
t.Fatalf("fallback value = %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeWithoutBase(t *testing.T) {
|
||||
tests := []struct {
|
||||
name, source string
|
||||
requireBase bool
|
||||
wantCode configkit.Code
|
||||
}{
|
||||
{"optional", "config: {imports: [{path: missing.yml}]}\ncount: 7\n", false, ""},
|
||||
{"required", "config: {imports: [{path: missing.yml, required: true}]}\n", false, configkit.CodeImportMissing},
|
||||
{"required directory", "config: {imports: [{dir: missing, required: true}]}\n", false, configkit.CodeImportMissing},
|
||||
{"required glob", "config: {imports: [{glob: '*.yml', required: true}]}\n", false, configkit.CodeImportMissing},
|
||||
{"empty required", "config: {imports: [{path: [], required: true}]}\ncount: 7\n", false, ""},
|
||||
{"base required", "count: 7\n", true, configkit.CodeOptionsInvalid},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
input := configkit.Input{Source: configkit.Bytes("companion", []byte(test.source)), Imports: true, MainRelative: &configkit.MainRelativeContext{RequireBase: test.requireBase}}
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: configkit.NoSource()}, configkit.LayeredOptions[layeredFacadeConfig]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{input}}}})
|
||||
if test.wantCode != "" {
|
||||
if err == nil {
|
||||
t.Fatal("expected failure")
|
||||
}
|
||||
for _, d := range err.(*configkit.LoadError).Diagnostics() {
|
||||
if d.Code == test.wantCode {
|
||||
return
|
||||
}
|
||||
}
|
||||
t.Fatalf("diagnostics: %#v", err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 7 {
|
||||
t.Fatalf("config = %#v", result.Config)
|
||||
}
|
||||
if sources := result.Sources(); len(sources) != 1 || len(sources[0].EmptyImportSelections) != 0 {
|
||||
t.Fatalf("sources = %#v", sources)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeWithoutBaseSequenceItem(t *testing.T) {
|
||||
type item struct {
|
||||
Name string `yaml:"name"`
|
||||
}
|
||||
type config struct {
|
||||
Items []item `yaml:"items"`
|
||||
}
|
||||
input := configkit.Input{Source: configkit.Bytes("item", []byte("config: {imports: [{path: missing.yml}]}\nname: example\n")), Imports: true, MainRelative: configkit.MainRelative(), Destination: configkit.Keys("items"), PlacementMode: configkit.PlacementModeSequenceItem}
|
||||
result, err := configkit.LoadLayered(configkit.Input{Source: configkit.NoSource()}, configkit.LayeredOptions[config]{Underlays: []configkit.Underlay{{Inputs: []configkit.Input{input}}}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if len(result.Config.Items) != 1 || result.Config.Items[0].Name != "example" {
|
||||
t.Fatalf("config = %#v", result.Config)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeWithoutBaseImportDefaults(t *testing.T) {
|
||||
required := true
|
||||
tests := []struct {
|
||||
name, source string
|
||||
imports bool
|
||||
requireBase bool
|
||||
code configkit.Code
|
||||
}{
|
||||
{"default required", "config: {imports: [{path: missing.yml}]}\n", true, false, configkit.CodeImportMissing},
|
||||
{"malformed", "config: {imports: [{path: 42}]}\n", true, false, configkit.CodeImportInvalid},
|
||||
{"imports disabled", "config: {imports: [{path: missing.yml}]}\n", false, false, configkit.CodeImportDisabled},
|
||||
{"base required without imports", "count: 1\n", false, true, configkit.CodeOptionsInvalid},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
input := configkit.Input{Source: configkit.Bytes("companion", []byte(test.source)), Imports: test.imports, MainRelative: &configkit.MainRelativeContext{RequireBase: test.requireBase}}
|
||||
_, err := configkit.LoadLayered(configkit.Input{Source: configkit.NoSource()}, configkit.LayeredOptions[layeredFacadeConfig]{ImportDefaults: configkit.ImportDefaults{Required: &required}, Underlays: []configkit.Underlay{{Inputs: []configkit.Input{input}}}})
|
||||
if err == nil {
|
||||
t.Fatal("expected failure")
|
||||
}
|
||||
for _, diagnostic := range err.(*configkit.LoadError).Diagnostics() {
|
||||
if diagnostic.Code == test.code {
|
||||
return
|
||||
}
|
||||
}
|
||||
t.Fatalf("diagnostics = %#v", err.(*configkit.LoadError).Diagnostics())
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLayeredOverlayContextSelection(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
base := filepath.Join(root, "base")
|
||||
for _, dir := range []string{filepath.Join(root, "overlays"), filepath.Join(base, "overlays")} {
|
||||
if err := os.MkdirAll(dir, 0700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
for path, content := range map[string]string{"base/main.yml": "count: 1\n", "base/overlays/test.yml": "count: 2\n", "overlays/test.yml": "count: 3\n"} {
|
||||
if err := os.WriteFile(filepath.Join(root, path), []byte(content), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
main := configkit.Input{Source: configkit.File(filepath.Join(base, "main.yml")), Filesystem: &configkit.FilesystemContext{Root: root}}
|
||||
result, err := configkit.LoadLayered(main, configkit.LayeredOptions[layeredFacadeConfig]{Overlay: "test"})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 2 {
|
||||
t.Fatalf("derived overlay = %d", result.Config.Count)
|
||||
}
|
||||
result, err = configkit.LoadLayered(main, configkit.LayeredOptions[layeredFacadeConfig]{Overlay: "test", OverlayFilesystem: &configkit.FilesystemContext{Root: root, BaseDir: base}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 3 {
|
||||
t.Fatalf("explicit overlay = %d", result.Config.Count)
|
||||
}
|
||||
result, err = configkit.LoadLayered(configkit.Input{Source: configkit.NoSource()}, configkit.LayeredOptions[layeredFacadeConfig]{Overlay: "test", OverlayFallback: &configkit.FilesystemContext{Root: root, BaseDir: base}})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 2 {
|
||||
t.Fatalf("fallback overlay = %d", result.Config.Count)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLayeredOverlayNativeContext(t *testing.T) {
|
||||
filesystem := configkit.NewFilesystem("bundle", fstest.MapFS{
|
||||
"dir/main.yml": &fstest.MapFile{Data: []byte("count: 1\n")},
|
||||
"dir/overlays/test.yml": &fstest.MapFile{Data: []byte("count: 9\n")},
|
||||
})
|
||||
main := configkit.Input{Source: filesystem.File("dir/main.yml"), Filesystem: &configkit.FilesystemContext{Root: ".", FS: &filesystem}}
|
||||
result, err := configkit.LoadLayered(main, configkit.LayeredOptions[layeredFacadeConfig]{Overlay: "test"})
|
||||
if err != nil {
|
||||
t.Fatalf("%v: %#v", err, err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
if result.Config.Count != 9 {
|
||||
t.Fatalf("config = %#v", result.Config)
|
||||
}
|
||||
_, err = configkit.LoadLayered(main, configkit.LayeredOptions[layeredFacadeConfig]{Overlay: "missing", OverlayFallback: &configkit.FilesystemContext{Root: ".", BaseDir: ".", FS: &filesystem}})
|
||||
if err == nil {
|
||||
t.Fatal("missing selected overlay succeeded")
|
||||
}
|
||||
for _, diagnostic := range err.(*configkit.LoadError).Diagnostics() {
|
||||
if diagnostic.Code == configkit.CodeOverlayMissing {
|
||||
return
|
||||
}
|
||||
}
|
||||
t.Fatalf("diagnostics = %#v", err.(*configkit.LoadError).Diagnostics())
|
||||
}
|
||||
|
||||
func TestLayeredOverlayNativeLinks(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name, mainPath, target string
|
||||
want configkit.Code
|
||||
}{
|
||||
{"outside root", "scope/main.yml", "../../outside.yml", configkit.CodeOverlayOutsideRoot},
|
||||
{"overlay aliases main", "scope/main.yml", "../main.yml", configkit.CodeOverlayRepeated},
|
||||
{"main aliases overlay target", "scope/alias.yml", "../target.yml", configkit.CodeOverlayRepeated},
|
||||
{"contained overlay", "scope/main.yml", "../target.yml", ""},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
native := configkit.NewFilesystem("bundle", fstest.MapFS{
|
||||
"scope/main.yml": {Data: []byte("count: 1\n")},
|
||||
"scope/alias.yml": {Data: []byte("target.yml"), Mode: os.ModeSymlink},
|
||||
"scope/target.yml": {Data: []byte("count: 7\n")},
|
||||
"scope/overlays/test.yml": {Data: []byte(tc.target), Mode: os.ModeSymlink},
|
||||
"outside.yml": {Data: []byte("count: 9\n")},
|
||||
})
|
||||
main := configkit.Input{Source: native.File(tc.mainPath), Filesystem: &configkit.FilesystemContext{Root: "scope", FS: &native}}
|
||||
result, err := configkit.LoadLayered(main, configkit.LayeredOptions[layeredFacadeConfig]{Overlay: "test"})
|
||||
if tc.want != "" {
|
||||
if err == nil {
|
||||
t.Fatal("overlay link unexpectedly loaded")
|
||||
}
|
||||
diagnostics := err.(*configkit.LoadError).Diagnostics()
|
||||
if len(diagnostics) != 1 || diagnostics[0].Code != tc.want {
|
||||
t.Fatalf("diagnostics = %#v, want %v", diagnostics, tc.want)
|
||||
}
|
||||
return
|
||||
}
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result.Config.Count != 7 || result.Sources()[1].Path != "scope/target.yml" {
|
||||
t.Fatalf("config = %#v, sources = %#v", result.Config, result.Sources())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
103
facade_secrets_config_test.go
Normal file
103
facade_secrets_config_test.go
Normal file
@@ -0,0 +1,103 @@
|
||||
package configkit_test
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
var _ func(string) (*configkit.SecretsReport, error) = configkit.LoadSecretsIntoEnvironment
|
||||
|
||||
func TestFacadeSecretsOptionsAndConfiguredPrecedence(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
directory := filepath.Join(root, "secrets")
|
||||
if err := os.Mkdir(directory, 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(filepath.Join(directory, "CONFIGKIT_FACADE_SECRET"), []byte("replacement\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Setenv("CONFIGKIT_FACADE_SECRET", "old")
|
||||
report, err := configkit.LoadSecretsIntoEnvironmentWithOptions(directory, configkit.SecretsOptions{Overwrite: true})
|
||||
if err != nil || len(report.Entries()) != 1 || report.Entries()[0].Status != configkit.SecretFileLoaded || os.Getenv("CONFIGKIT_FACADE_SECRET") != "replacement" {
|
||||
t.Fatalf("direct report = %#v, error = %v", report, err)
|
||||
}
|
||||
for _, test := range []struct {
|
||||
name, setting, want string
|
||||
overwrite *bool
|
||||
}{
|
||||
{"default", "", "old", nil},
|
||||
{"yaml true", " secrets_overwrite: true\n", "replacement", nil},
|
||||
{"false overrides true", " secrets_overwrite: true\n", "old", facadeBool(false)},
|
||||
{"true overrides false", " secrets_overwrite: false\n", "replacement", facadeBool(true)},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
t.Setenv("CONFIGKIT_FACADE_SECRET", "old")
|
||||
main := filepath.Join(root, "main.yml")
|
||||
if err := os.WriteFile(main, []byte("config:\n secrets_dir: secrets\n"+test.setting+"value: original\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var report *configkit.SecretsReport
|
||||
var prepared configkit.Source
|
||||
var err error
|
||||
if test.overwrite == nil {
|
||||
report, prepared, err = configkit.LoadSecretsIntoEnvironmentFromConfig(configkit.File(main))
|
||||
} else {
|
||||
report, prepared, err = configkit.LoadSecretsIntoEnvironmentFromConfig(configkit.File(main), configkit.SecretsFromConfigOptions{Overwrite: test.overwrite})
|
||||
}
|
||||
if err != nil || report == nil || len(report.Entries()) != 1 || os.Getenv("CONFIGKIT_FACADE_SECRET") != test.want {
|
||||
t.Fatalf("report = %#v, error = %v", report, err)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("value: changed\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err := configkit.Load[struct {
|
||||
Value string `yaml:"value"`
|
||||
}](prepared)
|
||||
if err != nil || loaded.Config.Value != "original" {
|
||||
t.Fatalf("prepared load = %#v, error = %v", loaded, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func facadeBool(value bool) *bool { return &value }
|
||||
|
||||
func TestFacadeSecretsFromConfigErrorsKeepPublicEvidence(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
directReport, directErr := configkit.LoadSecretsIntoEnvironmentWithOptions(filepath.Join(root, "missing"), configkit.SecretsOptions{Overwrite: true})
|
||||
var directFailure *configkit.SecretsError
|
||||
if directReport == nil || !errors.As(directErr, &directFailure) || len(directFailure.Diagnostics()) != 1 || directFailure.Diagnostics()[0].Code != configkit.CodeSecretsMissing {
|
||||
t.Fatalf("direct report = %#v, error = %#v", directReport, directErr)
|
||||
}
|
||||
main := filepath.Join(root, "main.yml")
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_overwrite: invalid}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
report, prepared, err := configkit.LoadSecretsIntoEnvironmentFromConfig(configkit.File(main), configkit.SecretsFromConfigOptions{Overwrite: facadeBool(false)})
|
||||
var loadErr *configkit.LoadError
|
||||
if report == nil || len(report.Entries()) != 0 || !errors.As(err, &loadErr) || len(loadErr.Sources()) != 1 || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != configkit.CodeSecretsInvalidValue || loadErr.Diagnostics()[0].Primary == nil || loadErr.Diagnostics()[0].Primary.SourceID != loadErr.Sources()[0].ID {
|
||||
t.Fatalf("preparation report = %#v, error = %#v", report, err)
|
||||
}
|
||||
if _, err := configkit.Load[struct{}](prepared); err == nil {
|
||||
t.Fatal("failed preparation returned a usable source")
|
||||
}
|
||||
report, _, err = configkit.LoadSecretsIntoEnvironmentFromConfig(configkit.File(main), configkit.SecretsFromConfigOptions{}, configkit.SecretsFromConfigOptions{})
|
||||
if report == nil || !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) != 1 || loadErr.Diagnostics()[0].Code != configkit.CodeOptionsInvalid || len(loadErr.Sources()) != 0 {
|
||||
t.Fatalf("multiple options report = %#v, error = %#v", report, err)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: missing}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
report, prepared, err = configkit.LoadSecretsIntoEnvironmentFromConfig(configkit.File(main))
|
||||
var secretsErr *configkit.SecretsError
|
||||
if report == nil || !errors.As(err, &secretsErr) || len(secretsErr.Diagnostics()) != 1 || secretsErr.Diagnostics()[0].Code != configkit.CodeSecretsMissing {
|
||||
t.Fatalf("directory report = %#v, error = %#v", report, err)
|
||||
}
|
||||
if _, err := configkit.Load[struct{}](prepared); err == nil {
|
||||
t.Fatal("failed bootstrap returned a usable source")
|
||||
}
|
||||
}
|
||||
180
facade_secrets_handoff_test.go
Normal file
180
facade_secrets_handoff_test.go
Normal file
@@ -0,0 +1,180 @@
|
||||
package configkit_test
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
configkit "go.maximumdirect.net/configkit"
|
||||
)
|
||||
|
||||
type startupHandoffConfig struct {
|
||||
Main string `yaml:"main"`
|
||||
Imported string `yaml:"imported"`
|
||||
Underlay string `yaml:"underlay"`
|
||||
Overlay string `yaml:"overlay"`
|
||||
Asset string `yaml:"asset"`
|
||||
Token configkit.Secret `yaml:"token"`
|
||||
}
|
||||
|
||||
func TestConfiguredSecretsStartupHandoff(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
other := t.TempDir()
|
||||
t.Chdir(other)
|
||||
write := func(name, contents string) string {
|
||||
t.Helper()
|
||||
file := filepath.Join(root, name)
|
||||
if err := os.MkdirAll(filepath.Dir(file), 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(file, []byte(contents), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return file
|
||||
}
|
||||
const tokenName = "CONFIGKIT_HANDOFF_TOKEN"
|
||||
const sdkName = "CONFIGKIT_HANDOFF_SDK_ONLY"
|
||||
const emptyName = "CONFIGKIT_HANDOFF_EMPTY"
|
||||
t.Setenv(tokenName, "previous")
|
||||
t.Setenv(sdkName, "previous-sdk")
|
||||
t.Setenv(emptyName, "")
|
||||
write("app/secrets/"+tokenName, "bootstrap-token\n")
|
||||
write("app/secrets/"+sdkName, "bootstrap-sdk\n")
|
||||
write("app/secrets/"+emptyName, "bootstrap-empty\n")
|
||||
write("app/fragment.yml", "imported: before\n")
|
||||
write("app/lower.yml", "underlay: companion\n")
|
||||
write("app/overlays/dev.yml", "overlay: selected\n")
|
||||
write("app/asset.txt", "resource-data")
|
||||
main := write("app/main.yml", "config: {secrets_dir: secrets, secrets_overwrite: true, imports: [{path: fragment.yml}]}\nmain: captured\nasset: asset.txt\ntoken: "+tokenName+"\n")
|
||||
candidate := filepath.Join(root, "app", "earlier.yml")
|
||||
search := configkit.SearchConfig("app", configkit.SearchPaths(candidate, main))
|
||||
report, prepared, err := configkit.LoadSecretsIntoEnvironmentFromConfig(search, configkit.SecretsFromConfigOptions{Filesystem: &configkit.FilesystemContext{Root: root}})
|
||||
if err != nil || report == nil || len(report.Entries()) != 3 || os.Getenv(tokenName) != "bootstrap-token" || os.Getenv(sdkName) != "bootstrap-sdk" || os.Getenv(emptyName) != "bootstrap-empty" {
|
||||
t.Fatalf("prepare report = %#v, error = %v", report, err)
|
||||
}
|
||||
for _, entry := range report.Entries() {
|
||||
if entry.Status != configkit.SecretFileLoaded {
|
||||
t.Fatalf("bootstrap entry = %#v", entry)
|
||||
}
|
||||
}
|
||||
options := configkit.Options[startupHandoffConfig]{Imports: true}
|
||||
first, err := configkit.Load[startupHandoffConfig](prepared, options)
|
||||
if err != nil || first.Config.Main != "captured" || first.Config.Imported != "before" || first.Config.Token.Value() != "bootstrap-token" {
|
||||
t.Fatalf("first load = %#v, %v", first, err)
|
||||
}
|
||||
write("app/main.yml", "main: changed\n")
|
||||
write("app/earlier.yml", "main: different-candidate\n")
|
||||
write("app/fragment.yml", "imported: after\n")
|
||||
if err := os.Setenv(tokenName, "later-token"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
second, err := configkit.Load[startupHandoffConfig](prepared, options)
|
||||
if err != nil || second.Config.Main != "captured" || second.Config.Imported != "after" || second.Config.Token.Value() != "later-token" || first.Config.Imported != "before" || first.Config.Token.Value() != "bootstrap-token" {
|
||||
t.Fatalf("subsequent load = %#v, %v", second, err)
|
||||
}
|
||||
sources := second.Sources()
|
||||
canonicalMain, err := filepath.EvalSymlinks(main)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(sources) != 2 || sources[0].Kind != configkit.SourceKindFile || sources[0].Path != canonicalMain || sources[0].ID != "source-1" || sources[1].ID != "source-2" {
|
||||
t.Fatalf("sources = %#v", sources)
|
||||
}
|
||||
sources[0].Label = "modified"
|
||||
if second.Sources()[0].Label == "modified" || first.Sources()[0].Label == "modified" {
|
||||
t.Fatal("source evidence is shared")
|
||||
}
|
||||
context, ok := second.SourceContext("source-1")
|
||||
if !ok || context.BaseDir != "app" {
|
||||
t.Fatalf("source context = %#v, %v", context, ok)
|
||||
}
|
||||
if data, err := fs.ReadFile(context.FS, "app/asset.txt"); err != nil || string(data) != "resource-data" {
|
||||
t.Fatalf("resource = %q, %v", data, err)
|
||||
}
|
||||
underlay := configkit.Input{Source: configkit.Bytes("companion", []byte("config: {imports: [{path: lower.yml}]}\n")), Imports: true, MainRelative: configkit.MainRelative()}
|
||||
layered, err := configkit.LoadLayered(configkit.Input{Source: prepared, Imports: true, Filesystem: &configkit.FilesystemContext{Root: root}}, configkit.LayeredOptions[startupHandoffConfig]{
|
||||
Underlays: []configkit.Underlay{{Inputs: []configkit.Input{underlay}}}, Overlay: "dev",
|
||||
})
|
||||
if err != nil || layered.Config.Underlay != "companion" || layered.Config.Overlay != "selected" || layered.Config.Imported != "after" {
|
||||
t.Fatalf("layered load = %#v, %v", layered, err)
|
||||
}
|
||||
_, err = configkit.LoadLayered(configkit.Input{Source: prepared, Filesystem: &configkit.FilesystemContext{Root: filepath.Join(root, "app")}}, configkit.LayeredOptions[startupHandoffConfig]{})
|
||||
var loadErr *configkit.LoadError
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) == 0 || loadErr.Diagnostics()[0].Code != configkit.CodeOptionsInvalid || os.Getenv(tokenName) != "later-token" {
|
||||
t.Fatalf("incompatible context error = %v", err)
|
||||
}
|
||||
_, err = configkit.Load[startupHandoffConfig](prepared, configkit.Options[startupHandoffConfig]{Imports: true, Definition: configkit.Definition[startupHandoffConfig]{Validate: func(_ *startupHandoffConfig, validation *configkit.Validation) {
|
||||
validation.Error(configkit.Keys("main"), "invalid startup setting")
|
||||
}}})
|
||||
if !errors.As(err, &loadErr) || os.Getenv(tokenName) != "later-token" || os.Getenv(sdkName) != "bootstrap-sdk" || len(report.Entries()) != 3 {
|
||||
t.Fatalf("later validation error = %v, report = %#v", err, report)
|
||||
}
|
||||
var group sync.WaitGroup
|
||||
errorsFound := make(chan error, 8)
|
||||
for range 8 {
|
||||
group.Go(func() {
|
||||
loaded, err := configkit.Load[startupHandoffConfig](prepared, options)
|
||||
if err != nil {
|
||||
errorsFound <- err
|
||||
} else if loaded.Config.Main != "captured" || loaded.Config.Token.Value() != "later-token" {
|
||||
errorsFound <- errors.New("captured source produced unexpected values")
|
||||
}
|
||||
})
|
||||
}
|
||||
group.Wait()
|
||||
close(errorsFound)
|
||||
for err := range errorsFound {
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConfiguredSecretsPreservesExistingEmptyValue(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.Mkdir(filepath.Join(root, "secrets"), 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
const name = "CONFIGKIT_HANDOFF_PRESERVED_EMPTY"
|
||||
t.Setenv(name, "")
|
||||
if err := os.WriteFile(filepath.Join(root, "secrets", name), []byte("replacement"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
main := filepath.Join(root, "main.yml")
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: secrets}\nmain: value\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
report, _, err := configkit.LoadSecretsIntoEnvironmentFromConfig(configkit.File(main))
|
||||
if err != nil || len(report.Entries()) != 1 || report.Entries()[0].Status != configkit.SecretFileSkippedExisting || !report.Entries()[0].ExistingEmpty || os.Getenv(name) != "" {
|
||||
t.Fatalf("report = %#v, error = %v", report, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOrdinaryLoadingNeverBootstrapsSecrets(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
if err := os.Mkdir(filepath.Join(root, "secrets"), 0o700); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
const name = "CONFIGKIT_NO_AUTOMATIC_BOOTSTRAP"
|
||||
t.Setenv(name, "existing")
|
||||
if err := os.WriteFile(filepath.Join(root, "secrets", name), []byte("replacement"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
main := filepath.Join(root, "main.yml")
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: secrets, secrets_overwrite: true}\nmain: ordinary\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
type ordinaryConfig struct {
|
||||
Main string `yaml:"main"`
|
||||
}
|
||||
if _, err := configkit.Load[ordinaryConfig](configkit.File(main)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := configkit.LoadLayered(configkit.Input{Source: configkit.File(main)}, configkit.LayeredOptions[ordinaryConfig]{}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if os.Getenv(name) != "existing" {
|
||||
t.Fatal("ordinary loading changed the environment")
|
||||
}
|
||||
}
|
||||
8
go.mod
8
go.mod
@@ -2,12 +2,12 @@ module go.maximumdirect.net/configkit
|
||||
|
||||
go 1.27.0
|
||||
|
||||
require go.yaml.in/yaml/v4 v4.0.0-rc.6
|
||||
require go.yaml.in/yaml/v4 v4.0.0
|
||||
|
||||
require (
|
||||
github.com/yuin/goldmark/v2 v2.1.6 // indirect
|
||||
go.maximumdirect.net/releasekit v0.8.0 // indirect
|
||||
golang.org/x/mod v0.40.0 // indirect
|
||||
github.com/yuin/goldmark/v2 v2.1.16 // indirect
|
||||
go.maximumdirect.net/releasekit v0.10.0 // indirect
|
||||
golang.org/x/mod v0.43.0 // indirect
|
||||
)
|
||||
|
||||
tool go.maximumdirect.net/releasekit/cmd/releasekit
|
||||
|
||||
16
go.sum
16
go.sum
@@ -1,8 +1,8 @@
|
||||
github.com/yuin/goldmark/v2 v2.1.6 h1:igy0q9JcqovoFXFx/XjtU8sHVhcUHavPj2sA3EoKJUE=
|
||||
github.com/yuin/goldmark/v2 v2.1.6/go.mod h1:G6M4/qOFtfn01/o14BU1UR2Lo5N3S9Qo7xCuz/sHjGQ=
|
||||
go.maximumdirect.net/releasekit v0.8.0 h1:hSaHPbUI7tAhnolfbu7UMj2fvmm9FGBY+jhkygdbxR0=
|
||||
go.maximumdirect.net/releasekit v0.8.0/go.mod h1:QE4BLrAhVJTzi+/YTcVl21K/qZp9ojRLg5kuoy3Zb44=
|
||||
go.yaml.in/yaml/v4 v4.0.0-rc.6 h1:1h7H1ohdUh93/FyE4YaDa1Zh64K6VVbjF4K6WUxMtH4=
|
||||
go.yaml.in/yaml/v4 v4.0.0-rc.6/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
|
||||
golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs=
|
||||
golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE=
|
||||
github.com/yuin/goldmark/v2 v2.1.16 h1:MXvCVo+Cb2SVJ5cwJUzXetDjI7HECRJCkcqylEQtcJo=
|
||||
github.com/yuin/goldmark/v2 v2.1.16/go.mod h1:G6M4/qOFtfn01/o14BU1UR2Lo5N3S9Qo7xCuz/sHjGQ=
|
||||
go.maximumdirect.net/releasekit v0.10.0 h1:3GOgaIigXTkvYaRkntWZASE//2NTR1+IhkoKmt64aJo=
|
||||
go.maximumdirect.net/releasekit v0.10.0/go.mod h1:cT5NZNEcf7SKDx4MPG40YNK9V4bNyIxcLLFuNlbGQ90=
|
||||
go.yaml.in/yaml/v4 v4.0.0 h1:/LG1pNO84Z4l603j/xMn69CcS5OYhMQ/f7l2LoQUGuw=
|
||||
go.yaml.in/yaml/v4 v4.0.0/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
|
||||
golang.org/x/mod v0.43.0 h1:MFuq5J6s35W9D3IjkwyWc9vHh0nENOrt5K8Iof4ofmg=
|
||||
golang.org/x/mod v0.43.0/go.mod h1:4ec1JnuyBz5+FIVhg86UsA39YG8BpnrZdJYSNHmGzHY=
|
||||
|
||||
@@ -20,6 +20,8 @@ type tierAcquisitionState struct {
|
||||
|
||||
type inputAcquisitionRequest struct {
|
||||
input loadInput
|
||||
resolved *resolvedFilesystemContext
|
||||
withoutBase bool
|
||||
role sourceVersionRole
|
||||
directiveContext rootDirectiveContext
|
||||
protectionRule *VersionRule
|
||||
@@ -33,27 +35,23 @@ type importAcquisitionRequest struct {
|
||||
}
|
||||
|
||||
func acquireInput(request inputAcquisitionRequest, policy acquisitionPolicy, state *acquisitionState, tier *tierAcquisitionState) (assembledInput, []Diagnostic) {
|
||||
if request.withoutBase && request.input.mainRelative.RequireBase {
|
||||
return assembledInput{}, []Diagnostic{optionDiagnostic(CodeOptionsInvalid, "main-relative input requires a filesystem base")}
|
||||
}
|
||||
source := request.input.source
|
||||
destination := request.input.destination
|
||||
accounting := state.accounting
|
||||
versionState := state.versionState
|
||||
sourceID := "source-" + strconv.Itoa(accounting.sources+1)
|
||||
selectedSource := source
|
||||
selectedSource, failedSource, selectionDiagnostics := selectInputSource(source, sourceID, request.input.filesystem)
|
||||
if len(selectionDiagnostics) != 0 {
|
||||
if failedSource != nil {
|
||||
failedSource.Destination = destination.clone()
|
||||
failedSource.placementMode = request.input.placementMode
|
||||
}
|
||||
return assembledInput{source: selectedSource, sources: sourceInfos(failedSource), versionState: versionState, accounting: accounting}, selectionDiagnostics
|
||||
}
|
||||
if source.kind == sourceSearch {
|
||||
resolved, failedSource, diagnostics := resolveSearchInput(source, sourceID, defaultDiscoveryDirectoryHelpers(), defaultDiscoveryHostProbe())
|
||||
if len(diagnostics) != 0 {
|
||||
if failedSource != nil {
|
||||
failedSource.Destination = destination.clone()
|
||||
failedSource.placementMode = request.input.placementMode
|
||||
}
|
||||
return assembledInput{source: resolved, sources: sourceInfos(failedSource), versionState: versionState, accounting: accounting}, diagnostics
|
||||
}
|
||||
selectedSource = resolved
|
||||
if request.input.filesystem != nil {
|
||||
if diagnostics := filesystemOptionDiagnostics(selectedSource, request.input.filesystem); len(diagnostics) != 0 {
|
||||
return assembledInput{source: selectedSource, versionState: versionState, accounting: accounting}, diagnostics
|
||||
}
|
||||
}
|
||||
if selectedSource.kind == sourceNone && activeOverlay(request.ordinaryOverlay) && request.input.filesystem == nil {
|
||||
return assembledInput{source: selectedSource, versionState: versionState, accounting: accounting}, []Diagnostic{optionDiagnostic(CodeOptionsInvalid, "NoSource overlays require explicit filesystem context")}
|
||||
}
|
||||
@@ -80,6 +78,13 @@ func acquireInput(request inputAcquisitionRequest, policy acquisitionPolicy, sta
|
||||
}
|
||||
return input, diagnostics
|
||||
}
|
||||
if selectedSource.captured != nil {
|
||||
resolved, diagnostic := resolveFilesystemContext(selectedSource, request.input.filesystem, parsed, tier.hostToken)
|
||||
if diagnostic != nil {
|
||||
return input, []Diagnostic{*diagnostic}
|
||||
}
|
||||
request.resolved = &resolved
|
||||
}
|
||||
directiveContext := request.directiveContext
|
||||
if directiveContext == 0 {
|
||||
directiveContext = rootDirectiveContextImportsOnly
|
||||
@@ -101,7 +106,12 @@ func acquireInput(request inputAcquisitionRequest, policy acquisitionPolicy, sta
|
||||
return input, diagnostics
|
||||
}
|
||||
request.input.source = selectedSource
|
||||
if request.input.imports && selectedSource.kind != sourceNone {
|
||||
if request.input.imports && selectedSource.kind != sourceNone && request.withoutBase {
|
||||
input, diagnostics = acquireContextlessInput(input, request, versionProcessing, policy)
|
||||
if len(diagnostics) != 0 {
|
||||
return input, diagnostics
|
||||
}
|
||||
} else if request.input.imports && selectedSource.kind != sourceNone {
|
||||
importRequest := importAcquisitionRequest{input: request, main: parsed, processing: versionProcessing}
|
||||
input.composition, input.sources, input.resolvedFilesystem, diagnostics = acquireImportedInput(importRequest, &policy, state, tier)
|
||||
if len(diagnostics) != 0 {
|
||||
@@ -126,6 +136,14 @@ func acquireStandaloneInput(input assembledInput, request inputAcquisitionReques
|
||||
if processing != nil {
|
||||
input.document = processing.payload
|
||||
}
|
||||
if request.resolved != nil {
|
||||
if input.source.captured == nil || request.input.filesystem != nil {
|
||||
if diagnostic := validateResolvedFilesystemContext(*request.resolved); diagnostic != nil {
|
||||
return input, []Diagnostic{*diagnostic}
|
||||
}
|
||||
}
|
||||
input.resolvedFilesystem = request.resolved
|
||||
}
|
||||
if request.input.filesystem != nil && (input.source.kind == sourceNone || !activeOverlay(request.ordinaryOverlay)) {
|
||||
resolved, diagnostic := validateFilesystemContext(input.source, request.input.filesystem, parsed, tier.hostToken)
|
||||
if diagnostic != nil {
|
||||
|
||||
72
internal/engine/contextless_imports.go
Normal file
72
internal/engine/contextless_imports.go
Normal file
@@ -0,0 +1,72 @@
|
||||
package engine
|
||||
|
||||
import "go.maximumdirect.net/configkit/internal/document"
|
||||
|
||||
func acquireContextlessInput(input assembledInput, request inputAcquisitionRequest, processing *sourceVersionProcessingResult, policy acquisitionPolicy) (assembledInput, []Diagnostic) {
|
||||
parsed := input.parsed
|
||||
var body *document.Node
|
||||
var declarations []importDeclarationSpec
|
||||
var sequences []sequenceDeclarationSpec
|
||||
var diagnostics []Diagnostic
|
||||
if processing != nil {
|
||||
body, declarations = processing.payload, processing.imports
|
||||
sequences = cloneSequenceDeclarations(processing.sequences)
|
||||
} else {
|
||||
body, declarations, diagnostics = splitImportDirectives(parsed.document, request.role)
|
||||
}
|
||||
destination := request.input.destination
|
||||
localDestination := destination
|
||||
if request.input.placementMode == PlacementModeSequenceItem {
|
||||
localDestination = Path{}
|
||||
}
|
||||
if len(diagnostics) == 0 {
|
||||
var policies []resolvedImportPolicy
|
||||
policies, diagnostics = prepareImportDeclarations(declarations, policy.importDefaults, localDestination)
|
||||
if len(diagnostics) == 0 {
|
||||
for i, spec := range declarations {
|
||||
if !policies[i].required || spec.selector == importSelectorPath && len(spec.paths) == 0 {
|
||||
continue
|
||||
}
|
||||
site := spec.fieldSites["path"]
|
||||
if spec.selector == importSelectorPath && len(spec.selectorSites) != 0 {
|
||||
site = spec.selectorSites[0]
|
||||
}
|
||||
if spec.selector == importSelectorDirectory {
|
||||
site = spec.fieldSites["dir"]
|
||||
}
|
||||
if spec.selector == importSelectorGlob {
|
||||
site = spec.fieldSites["glob"]
|
||||
}
|
||||
diagnostics = []Diagnostic{{Code: CodeImportMissing, Severity: SeverityError, Path: site.path.clone(), Message: "import cannot be selected because no filesystem base is available", Primary: cloneLocation(&site.location)}}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(diagnostics) != 0 {
|
||||
if request.input.placementMode == PlacementModeSequenceItem {
|
||||
diagnostics = prependCompositionDiagnosticPaths(diagnostics, destination.Index(0))
|
||||
}
|
||||
return input, diagnostics
|
||||
}
|
||||
accounting, limits := input.accounting, policy.importLimits
|
||||
if diagnostic := chargeDeclaringImport(parsed, accounting, limits); diagnostic != nil {
|
||||
return input, []Diagnostic{*diagnostic}
|
||||
}
|
||||
key := importKeyForMainSource(parsed.source)
|
||||
root := acquiredContribution{
|
||||
source: cloneSourceInfo(*parsed.source), payload: body, identity: key,
|
||||
role: importRoleMain, scopeOwner: key, processing: processing, sequenceDeclarations: sequences,
|
||||
}
|
||||
scope, diagnostic := prepareDeclaringImportScope(root, accounting, limits)
|
||||
if diagnostic != nil {
|
||||
return input, []Diagnostic{*diagnostic}
|
||||
}
|
||||
scope, diagnostic = finalizeDeclaringImportScope(scope, root, accounting, limits)
|
||||
if diagnostic != nil {
|
||||
return input, []Diagnostic{*diagnostic}
|
||||
}
|
||||
input.document = body
|
||||
input.composition = &composedDocument{acquisition: []acquisitionScope{scope}, importGraph: newImportInclusionGraph(), inputBytes: accounting.bytes, inputNodes: accounting.nodes}
|
||||
input.acquisition = cloneAcquisitionScopes(input.composition.acquisition)
|
||||
return input, nil
|
||||
}
|
||||
@@ -129,7 +129,7 @@ parent: true
|
||||
betaPath := writeImportFile(t, directory, "fragments/b.yml", "beta: true\n")
|
||||
|
||||
main := parseImportMain(t, mainPath)
|
||||
_, declarations, diagnostics := splitImportDirectives(main.document)
|
||||
_, declarations, diagnostics := splitImportDirectives(main.document, sourceVersionMain)
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatalf("main directive diagnostics = %#v", diagnostics)
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package engine
|
||||
|
||||
import (
|
||||
"reflect"
|
||||
"runtime"
|
||||
"testing"
|
||||
|
||||
"go.maximumdirect.net/configkit/internal/document"
|
||||
@@ -18,7 +19,7 @@ records:
|
||||
configkit: {imports: [{path: absent.yaml}]}
|
||||
_configkit: ordinary
|
||||
`)
|
||||
extracted, diagnostics := extractRootDirectives(root, rootDirectiveContextSource)
|
||||
extracted, diagnostics := extractRootDirectives(root, rootDirectiveContextSource, sourceVersionContribution)
|
||||
if len(diagnostics) != 0 || len(extracted.imports) != 1 {
|
||||
t.Fatalf("extraction = %#v, diagnostics = %#v", extracted, diagnostics)
|
||||
}
|
||||
@@ -59,7 +60,7 @@ func TestDocumentRootControlValidation(t *testing.T) {
|
||||
{"bad imports", "config: {imports: wrong}\n", CodeImportInvalid, "/config/imports"},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
_, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, test.input), rootDirectiveContextSource)
|
||||
_, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, test.input), rootDirectiveContextSource, sourceVersionContribution)
|
||||
if len(diagnostics) == 0 || diagnostics[0].Code != test.code || diagnostics[0].Path.String() != test.path {
|
||||
t.Fatalf("diagnostics = %#v", diagnostics)
|
||||
}
|
||||
@@ -87,7 +88,101 @@ func TestDocumentRootControlGuards(t *testing.T) {
|
||||
if got := overlayDirectiveDiagnostics(sequences, Path{}, true); len(got) != 0 {
|
||||
t.Fatalf("overlay sequences diagnostics = %#v", got)
|
||||
}
|
||||
if _, got := extractRootDirectives(sequences, rootDirectiveContextImportsOnly); len(got) == 0 || got[0].Code != CodeSequenceInvalid {
|
||||
if _, got := extractRootDirectives(sequences, rootDirectiveContextImportsOnly, sourceVersionContribution); len(got) == 0 || got[0].Code != CodeSequenceInvalid {
|
||||
t.Fatalf("imports-only extraction diagnostics = %#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBootstrapControlExtraction(t *testing.T) {
|
||||
root := parseRootDirectiveDocument(t, "config:\n imports: invalid\n secrets_dir: ../secrets\n secrets_overwrite: false\n")
|
||||
settings, diagnostics := extractBootstrapSettings(root)
|
||||
if len(diagnostics) != 0 || !settings.directoryDeclared || settings.directory != "../secrets" || !settings.overwriteDeclared || settings.overwrite || settings.directoryLocation.Line != 3 || settings.overwriteLocation.Line != 4 {
|
||||
t.Fatalf("settings = %#v, diagnostics = %#v", settings, diagnostics)
|
||||
}
|
||||
if _, diagnostics := extractRootDirectives(root, rootDirectiveContextSource, sourceVersionMain); len(diagnostics) == 0 {
|
||||
t.Fatal("normal extraction did not validate unrelated import grammar")
|
||||
}
|
||||
for _, test := range []struct {
|
||||
input string
|
||||
code Code
|
||||
path string
|
||||
}{
|
||||
{"config: {secrets_dir: ''}", CodeSecretsInvalidPath, "/config/secrets_dir"},
|
||||
{"config: {secrets_dir: /absolute}", CodeSecretsInvalidPath, "/config/secrets_dir"},
|
||||
{"config: {secrets_dir: null}", CodeSecretsInvalidPath, "/config/secrets_dir"},
|
||||
{"config: {secrets_dir: 123}", CodeSecretsInvalidPath, "/config/secrets_dir"},
|
||||
{"config: {secrets_overwrite: null}", CodeSecretsInvalidValue, "/config/secrets_overwrite"},
|
||||
{"config: {secrets_overwrite: 'true'}", CodeSecretsInvalidValue, "/config/secrets_overwrite"},
|
||||
{"config: invalid", CodeImportInvalid, "/config"},
|
||||
} {
|
||||
t.Run(test.input, func(t *testing.T) {
|
||||
root := parseRootDirectiveDocument(t, test.input+"\n")
|
||||
_, preparation := extractBootstrapSettings(root)
|
||||
_, normal := extractRootDirectives(root, rootDirectiveContextSource, sourceVersionMain)
|
||||
for _, got := range [][]Diagnostic{preparation, normal} {
|
||||
if len(got) != 1 || got[0].Code != test.code || got[0].Path.String() != test.path || got[0].Primary == nil || got[0].Primary.Line != 1 {
|
||||
t.Fatalf("diagnostics = %#v", got)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestBootstrapDirectoryRejectsWindowsRootedPaths(t *testing.T) {
|
||||
if runtime.GOOS != "windows" {
|
||||
t.Skip("host path syntax differs")
|
||||
}
|
||||
for _, path := range []string{`C:relative`, `\rooted`} {
|
||||
root := parseRootDirectiveDocument(t, "config: {secrets_dir: '"+path+"'}\n")
|
||||
_, diagnostics := extractBootstrapSettings(root)
|
||||
if len(diagnostics) != 1 || diagnostics[0].Code != CodeSecretsInvalidPath {
|
||||
t.Fatalf("path %q: %#v", path, diagnostics)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestBootstrapControlsRequireMainSource(t *testing.T) {
|
||||
root := parseRootDirectiveDocument(t, "config: {secrets_dir: secrets, secrets_overwrite: true}\nvalue: ordinary\n")
|
||||
for _, context := range []rootDirectiveContext{rootDirectiveContextSource, rootDirectiveContextLayered} {
|
||||
main, diagnostics := extractRootDirectives(root, context, sourceVersionMain)
|
||||
if len(diagnostics) != 0 || len(main.body.Mapping) != 1 || main.body.Mapping[0].Key != "value" {
|
||||
t.Fatalf("main extraction = %#v, diagnostics = %#v", main, diagnostics)
|
||||
}
|
||||
_, diagnostics = extractRootDirectives(root, context, sourceVersionContribution)
|
||||
if len(diagnostics) != 2 || diagnostics[0].Code != CodeImportInvalid || diagnostics[1].Code != CodeImportInvalid {
|
||||
t.Fatalf("contribution diagnostics = %#v", diagnostics)
|
||||
}
|
||||
}
|
||||
_, diagnostics := extractRootDirectives(root, rootDirectiveContextOverlay, sourceVersionContribution)
|
||||
if len(diagnostics) != 2 || diagnostics[0].Code != CodeOverlayDirective || diagnostics[1].Code != CodeOverlayDirective {
|
||||
t.Fatalf("overlay diagnostics = %#v", diagnostics)
|
||||
}
|
||||
for _, name := range []string{"secrets_dir", "secrets_overwrite"} {
|
||||
if !sourceVersionControlOverlap(root, Keys("config", name)) {
|
||||
t.Errorf("version overlap not detected for %s", name)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestBootstrapControlsKeepSourceVersionChecksInLoad(t *testing.T) {
|
||||
root := parseRootDirectiveDocument(t, "config: {secrets_dir: secrets, secrets_overwrite: false}\nversion: 1\n")
|
||||
called := false
|
||||
rule := &VersionRule{Path: Keys("version"), Check: func(Version, *Validation) error {
|
||||
called = true
|
||||
return nil
|
||||
}}
|
||||
if _, diagnostics := extractBootstrapSettings(root); len(diagnostics) != 0 || called {
|
||||
t.Fatalf("preparation diagnostics = %#v, checker called = %v", diagnostics, called)
|
||||
}
|
||||
result := processSourceVersionWithDirectiveContext(root, rule, sourceVersionMain, Path{}, sourceVersionModeRequired, rootDirectiveContextSource)
|
||||
if len(result.diagnostics) != 0 || !called {
|
||||
t.Fatalf("load diagnostics = %#v, checker called = %v", result.diagnostics, called)
|
||||
}
|
||||
for _, name := range []string{"secrets_dir", "secrets_overwrite"} {
|
||||
rule.Path = Keys("config", name)
|
||||
result = processSourceVersionWithDirectiveContext(root, rule, sourceVersionMain, Path{}, sourceVersionModeRequired, rootDirectiveContextSource)
|
||||
if len(result.diagnostics) != 1 || result.diagnostics[0].Code != CodeVersionError {
|
||||
t.Errorf("overlap %s diagnostics = %#v", name, result.diagnostics)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"go.maximumdirect.net/configkit/internal/document"
|
||||
@@ -24,15 +26,71 @@ type rootDirectiveExtraction struct {
|
||||
sequences []sequenceDeclarationSpec
|
||||
}
|
||||
|
||||
func splitImportDirectives(root *document.Node) (*document.Node, []importDeclarationSpec, []Diagnostic) {
|
||||
extracted, diagnostics := extractRootDirectives(root, rootDirectiveContextImportsOnly)
|
||||
// bootstrapSettings retains only source-local control facts, never credentials.
|
||||
type bootstrapSettings struct {
|
||||
directoryDeclared bool
|
||||
directory string
|
||||
directoryLocation document.Location
|
||||
overwriteDeclared bool
|
||||
overwrite bool
|
||||
overwriteLocation document.Location
|
||||
}
|
||||
|
||||
// extractBootstrapSettings validates only the controls needed for preparation;
|
||||
// normal loading remains responsible for the rest of the directive grammar.
|
||||
func extractBootstrapSettings(root *document.Node) (bootstrapSettings, []Diagnostic) {
|
||||
var settings bootstrapSettings
|
||||
if root == nil || root.Kind != document.Mapping {
|
||||
return settings, nil
|
||||
}
|
||||
for _, entry := range root.Mapping {
|
||||
if entry.Key != directiveKey {
|
||||
continue
|
||||
}
|
||||
if entry.Value == nil || entry.Value.Kind != document.Mapping {
|
||||
return settings, []Diagnostic{nodeImportDiagnostic(CodeImportInvalid, Keys(directiveKey), "configuration directive must be a mapping", entry.Value)}
|
||||
}
|
||||
var diagnostics []Diagnostic
|
||||
for _, field := range entry.Value.Mapping {
|
||||
if field.Key == "secrets_dir" || field.Key == "secrets_overwrite" {
|
||||
if diagnostic := parseBootstrapField(&settings, field); diagnostic != nil {
|
||||
diagnostics = append(diagnostics, *diagnostic)
|
||||
}
|
||||
}
|
||||
}
|
||||
return settings, canonicalDiagnostics(diagnostics)
|
||||
}
|
||||
return settings, nil
|
||||
}
|
||||
|
||||
func parseBootstrapField(settings *bootstrapSettings, entry document.Entry) *Diagnostic {
|
||||
value := entry.Value
|
||||
fieldPath := Keys(directiveKey, entry.Key)
|
||||
if entry.Key == "secrets_dir" {
|
||||
if value == nil || value.Kind != document.String || value.Text == "" || os.IsPathSeparator(value.Text[0]) || filepath.IsAbs(value.Text) || filepath.VolumeName(value.Text) != "" {
|
||||
diagnostic := nodeImportDiagnostic(CodeSecretsInvalidPath, fieldPath, "secrets directory must be a nonempty relative host path", value)
|
||||
return &diagnostic
|
||||
}
|
||||
settings.directoryDeclared, settings.directory, settings.directoryLocation = true, value.Text, value.Location
|
||||
return nil
|
||||
}
|
||||
if value == nil || value.Kind != document.Boolean {
|
||||
diagnostic := nodeImportDiagnostic(CodeSecretsInvalidValue, fieldPath, "secrets overwrite setting must be a Boolean", value)
|
||||
return &diagnostic
|
||||
}
|
||||
settings.overwriteDeclared, settings.overwrite, settings.overwriteLocation = true, value.Text == "true", value.Location
|
||||
return nil
|
||||
}
|
||||
|
||||
func splitImportDirectives(root *document.Node, role sourceVersionRole) (*document.Node, []importDeclarationSpec, []Diagnostic) {
|
||||
extracted, diagnostics := extractRootDirectives(root, rootDirectiveContextImportsOnly, role)
|
||||
if len(diagnostics) != 0 {
|
||||
return nil, nil, diagnostics
|
||||
}
|
||||
return extracted.body, extracted.imports, nil
|
||||
}
|
||||
|
||||
func extractRootDirectives(root *document.Node, context rootDirectiveContext) (rootDirectiveExtraction, []Diagnostic) {
|
||||
func extractRootDirectives(root *document.Node, context rootDirectiveContext, role sourceVersionRole) (rootDirectiveExtraction, []Diagnostic) {
|
||||
if root == nil {
|
||||
return rootDirectiveExtraction{}, nil
|
||||
}
|
||||
@@ -43,7 +101,7 @@ func extractRootDirectives(root *document.Node, context rootDirectiveContext) (r
|
||||
continue
|
||||
}
|
||||
directiveIndex = index
|
||||
extracted, diagnostics := parseRootDirectiveBlock(entry.Value, Keys(directiveKey), context)
|
||||
extracted, diagnostics := parseRootDirectiveBlock(entry.Value, Keys(directiveKey), context, role)
|
||||
if len(diagnostics) != 0 {
|
||||
return rootDirectiveExtraction{}, diagnostics
|
||||
}
|
||||
@@ -56,7 +114,7 @@ func extractRootDirectives(root *document.Node, context rootDirectiveContext) (r
|
||||
return rootDirectiveExtraction{body: body}, nil
|
||||
}
|
||||
|
||||
func parseRootDirectiveBlock(node *document.Node, directivePath Path, context rootDirectiveContext) (rootDirectiveExtraction, []Diagnostic) {
|
||||
func parseRootDirectiveBlock(node *document.Node, directivePath Path, context rootDirectiveContext, role sourceVersionRole) (rootDirectiveExtraction, []Diagnostic) {
|
||||
if node == nil || node.Kind != document.Mapping {
|
||||
return rootDirectiveExtraction{}, []Diagnostic{nodeImportDiagnostic(CodeImportInvalid, directivePath, "configuration directive must be a mapping", node)}
|
||||
}
|
||||
@@ -89,6 +147,19 @@ func parseRootDirectiveBlock(node *document.Node, directivePath Path, context ro
|
||||
parsed, issues := parseSequenceDeclarationDirective(entry.Value, fieldPath)
|
||||
extracted.sequences = append(extracted.sequences, parsed...)
|
||||
diagnostics = append(diagnostics, issues...)
|
||||
case "secrets_dir", "secrets_overwrite":
|
||||
if role != sourceVersionMain || context == rootDirectiveContextOverlay {
|
||||
code := CodeImportInvalid
|
||||
if context == rootDirectiveContextOverlay {
|
||||
code = CodeOverlayDirective
|
||||
}
|
||||
diagnostics = append(diagnostics, nodeImportDiagnostic(code, fieldPath, "secrets bootstrap controls are only permitted in the main document", entry.Value))
|
||||
continue
|
||||
}
|
||||
var settings bootstrapSettings
|
||||
if diagnostic := parseBootstrapField(&settings, entry); diagnostic != nil {
|
||||
diagnostics = append(diagnostics, *diagnostic)
|
||||
}
|
||||
default:
|
||||
diagnostics = append(diagnostics, nodeImportDiagnostic(CodeImportInvalid, fieldPath, "configuration directive field is not recognized", entry.Value))
|
||||
}
|
||||
|
||||
@@ -17,23 +17,30 @@ func validateFilesystemContext(source Source, context *FilesystemContext, main p
|
||||
}
|
||||
return resolvedFilesystemContext{}, diagnostic
|
||||
}
|
||||
if diagnostic := validateResolvedFilesystemDirectories(resolved); diagnostic != nil {
|
||||
if diagnostic := validateResolvedFilesystemContext(resolved); diagnostic != nil {
|
||||
return resolvedFilesystemContext{}, diagnostic
|
||||
}
|
||||
return resolved, nil
|
||||
}
|
||||
|
||||
func validateResolvedFilesystemContext(resolved resolvedFilesystemContext) *Diagnostic {
|
||||
if diagnostic := validateResolvedFilesystemDirectories(resolved); diagnostic != nil {
|
||||
return diagnostic
|
||||
}
|
||||
if resolved.native != nil {
|
||||
return resolved, nil
|
||||
return nil
|
||||
}
|
||||
root, err := os.OpenRoot(resolved.rootPath)
|
||||
if err != nil {
|
||||
value := globFilesystemDiagnostic(err, "configuration root could not be opened", Location{})
|
||||
value.Primary = nil
|
||||
return resolvedFilesystemContext{}, &value
|
||||
return &value
|
||||
}
|
||||
if err := root.Close(); err != nil {
|
||||
value := importDiagnostic(CodeImportRead, "configuration root could not be closed", nil)
|
||||
return resolvedFilesystemContext{}, &value
|
||||
return &value
|
||||
}
|
||||
return resolved, nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func filesystemOptionDiagnostics(source Source, context *FilesystemContext) []Diagnostic {
|
||||
|
||||
@@ -17,6 +17,9 @@ type resolvedFilesystemContext struct {
|
||||
}
|
||||
|
||||
func resolveFilesystemContext(source Source, context *FilesystemContext, main parsedSource, hostToken *namespaceToken) (resolvedFilesystemContext, *Diagnostic) {
|
||||
if source.captured != nil {
|
||||
return resolveCapturedFilesystemContext(source, context, main, hostToken)
|
||||
}
|
||||
if source.kind == sourceNone && context != nil {
|
||||
return resolveAbsentFilesystemContext(context)
|
||||
}
|
||||
@@ -26,6 +29,30 @@ func resolveFilesystemContext(source Source, context *FilesystemContext, main pa
|
||||
return resolveHostFilesystemContext(source, context, main, hostToken)
|
||||
}
|
||||
|
||||
func resolveCapturedFilesystemContext(source Source, context *FilesystemContext, main parsedSource, hostToken *namespaceToken) (resolvedFilesystemContext, *Diagnostic) {
|
||||
captured := source.captured
|
||||
resolved := resolvedFilesystemContext{hostToken: hostToken, rootPath: captured.rootPath, basePath: captured.basePath, mainPath: captured.mainPath}
|
||||
if context == nil {
|
||||
return resolved, nil
|
||||
}
|
||||
if context.FS != nil || context.BaseDir != "" {
|
||||
value := optionDiagnostic(CodeOptionsInvalid, "prepared source requires a compatible host filesystem context")
|
||||
return resolvedFilesystemContext{}, &value
|
||||
}
|
||||
// The source record carries the captured canonical main path, so this does
|
||||
// not follow the original filename again after preparation.
|
||||
explicit, diagnostic := resolveHostFilesystemContext(source, context, main, hostToken)
|
||||
if diagnostic != nil || !sameHostPath(explicit.rootPath, resolved.rootPath) || !sameHostPath(explicit.basePath, resolved.basePath) || !sameHostPath(explicit.mainPath, resolved.mainPath) {
|
||||
value := optionDiagnostic(CodeOptionsInvalid, "prepared source requires a compatible host filesystem context")
|
||||
return resolvedFilesystemContext{}, &value
|
||||
}
|
||||
return resolved, nil
|
||||
}
|
||||
|
||||
func sameHostPath(left, right string) bool {
|
||||
return containedPath(left, right) && containedPath(right, left)
|
||||
}
|
||||
|
||||
func resolveAbsentFilesystemContext(context *FilesystemContext) (resolvedFilesystemContext, *Diagnostic) {
|
||||
if context.FS != nil {
|
||||
return resolveNativeFilesystemContext(Source{kind: sourceNone}, context)
|
||||
|
||||
@@ -38,26 +38,30 @@ func acquireImportedInput(request importAcquisitionRequest, policy *acquisitionP
|
||||
source := request.input.input.source
|
||||
context := request.input.input.filesystem
|
||||
main := request.main
|
||||
resolved, diagnostic := resolveFilesystemContext(source, context, main, tier.hostToken)
|
||||
if diagnostic != nil {
|
||||
return nil, sourceInfos(main.source), nil, []Diagnostic{*diagnostic}
|
||||
resolved := request.input.resolved
|
||||
if resolved == nil {
|
||||
value, diagnostic := resolveFilesystemContext(source, context, main, tier.hostToken)
|
||||
if diagnostic != nil {
|
||||
return nil, sourceInfos(main.source), nil, []Diagnostic{*diagnostic}
|
||||
}
|
||||
resolved = &value
|
||||
}
|
||||
if resolved.native == nil {
|
||||
if diagnostic := validateResolvedFilesystemDirectories(resolved); diagnostic != nil {
|
||||
if diagnostic := validateResolvedFilesystemDirectories(*resolved); diagnostic != nil {
|
||||
return nil, sourceInfos(main.source), nil, []Diagnostic{*diagnostic}
|
||||
}
|
||||
}
|
||||
access, err := openResolvedFilesystemAccess(resolved)
|
||||
access, err := openResolvedFilesystemAccess(*resolved)
|
||||
if err != nil {
|
||||
diagnostic := globFilesystemDiagnostic(err, "configuration root could not be opened", Location{})
|
||||
diagnostic.Primary = nil
|
||||
return nil, sourceInfos(main.source), nil, []Diagnostic{diagnostic}
|
||||
}
|
||||
composition, sources, diagnostics := acquireImportedWithAccess(request, policy, state, tier, access, resolved)
|
||||
composition, sources, diagnostics := acquireImportedWithAccess(request, policy, state, tier, access, *resolved)
|
||||
if len(diagnostics) != 0 {
|
||||
return composition, sources, nil, diagnostics
|
||||
}
|
||||
return composition, sources, &resolved, nil
|
||||
return composition, sources, resolved, nil
|
||||
}
|
||||
|
||||
func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisitionPolicy, loadState *acquisitionState, tier *tierAcquisitionState, access *filesystemAccess, resolved resolvedFilesystemContext) (*composedDocument, []SourceInfo, []Diagnostic) {
|
||||
@@ -107,9 +111,6 @@ func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisi
|
||||
_ = closeAccess()
|
||||
return nil, sourceInfos(main.source), []Diagnostic{importRepeatedDiagnostic(Location{SourceID: main.source.ID}, previous, importRoute{})}
|
||||
}
|
||||
accounting.sources++
|
||||
accounting.bytes += main.bytes
|
||||
accounting.nodes += countInputNodes(main.document)
|
||||
directiveContext := request.input.directiveContext
|
||||
if directiveContext == 0 {
|
||||
directiveContext = rootDirectiveContextImportsOnly
|
||||
@@ -120,7 +121,6 @@ func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisi
|
||||
request.input.directiveContext = directiveContext
|
||||
state := importTraversal{
|
||||
access: access, request: request, policy: policy, state: loadState, tier: tier,
|
||||
scope: acquisitionScope{owner: mainNodeKey, destination: destination.clone()},
|
||||
sources: []SourceInfo{mainInfo},
|
||||
active: make(map[resourceIdentity]int),
|
||||
importGraph: newImportInclusionGraph(),
|
||||
@@ -129,11 +129,10 @@ func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisi
|
||||
state.itemScope = true
|
||||
state.itemPrefix = destination.clone()
|
||||
state.itemFallback = destination.clone()
|
||||
state.scope.destination = Path{}
|
||||
state.sources[0] = cloneSourceInfo(mainInfo)
|
||||
}
|
||||
|
||||
if diagnostic := state.checkInitialLimits(); diagnostic != nil {
|
||||
if diagnostic := chargeDeclaringImport(main, accounting, limits); diagnostic != nil {
|
||||
_ = closeAccess()
|
||||
return nil, cloneSourceInfos(state.sources), []Diagnostic{*diagnostic}
|
||||
}
|
||||
@@ -157,33 +156,20 @@ func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisi
|
||||
declarations = processing.imports
|
||||
sequenceDeclarations = cloneSequenceDeclarations(processing.sequences)
|
||||
} else {
|
||||
body, declarations, diagnostics = splitImportDirectives(main.document)
|
||||
body, declarations, diagnostics = splitImportDirectives(main.document, request.input.role)
|
||||
}
|
||||
root := acquiredContribution{
|
||||
source: cloneSourceInfo(mainInfo), payload: body, identity: mainNodeKey,
|
||||
role: importRoleMain, scopeOwner: mainNodeKey, processing: processing,
|
||||
sequenceDeclarations: sequenceDeclarations,
|
||||
}
|
||||
if len(diagnostics) == 0 {
|
||||
if mainIsItem {
|
||||
state.scope.contributions = append(state.scope.contributions, acquiredContribution{
|
||||
source: cloneSourceInfo(mainInfo), identity: mainNodeKey, role: importRoleMain,
|
||||
scopeOwner: mainNodeKey, payload: body, document: body, processing: processing,
|
||||
sequenceDeclarations: cloneSequenceDeclarations(sequenceDeclarations),
|
||||
})
|
||||
diagnostics = state.walkDeclarations(basePath, declarations, 0, Path{}, 0)
|
||||
scope, diagnostic := prepareDeclaringImportScope(root, accounting, limits)
|
||||
if diagnostic != nil {
|
||||
diagnostics = []Diagnostic{*diagnostic}
|
||||
} else {
|
||||
_, placed, err := placeDocument(body, destination, body.Location, maxDocumentDepth, maxDocumentNodes)
|
||||
placementNodes := destinationWrapperNodeCount(destination)
|
||||
if err != nil {
|
||||
diagnostics = []Diagnostic{sourceDiagnostic(CodeSourceLimitExceeded, main.source.ID, "configuration exceeds the source depth or node limit after destination placement")}
|
||||
} else if accounting.nodes+placementNodes > limits.nodes {
|
||||
diagnostics = []Diagnostic{importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the aggregate node limit", nil)}
|
||||
} else {
|
||||
accounting.nodes += placementNodes
|
||||
state.scope.contributions = append(state.scope.contributions, acquiredContribution{
|
||||
source: cloneSourceInfo(mainInfo), payload: body, document: placed,
|
||||
identity: mainNodeKey, role: importRoleMain, scopeOwner: mainNodeKey,
|
||||
destination: destination.clone(), processing: processing,
|
||||
sequenceDeclarations: cloneSequenceDeclarations(sequenceDeclarations),
|
||||
})
|
||||
diagnostics = state.walkDeclarations(basePath, declarations, 0, destination, 0)
|
||||
}
|
||||
state.scope = scope
|
||||
diagnostics = state.walkDeclarations(basePath, declarations, 0, scope.destination, 0)
|
||||
}
|
||||
}
|
||||
if len(diagnostics) == 0 {
|
||||
@@ -200,19 +186,8 @@ func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisi
|
||||
if closeErr != nil {
|
||||
return nil, cloneSourceInfos(state.sources), []Diagnostic{importDiagnostic(CodeImportRead, "configuration root could not be closed", nil)}
|
||||
}
|
||||
acquisition := state.scope
|
||||
if mainIsItem {
|
||||
localScope := state.scope
|
||||
acquisition = acquisitionScope{
|
||||
owner: mainNodeKey, destination: destination.clone(),
|
||||
contributions: []acquiredContribution{{
|
||||
source: cloneSourceInfo(mainInfo), payload: body, identity: mainNodeKey,
|
||||
role: importRoleMain, scopeOwner: mainNodeKey, destination: destination.clone(),
|
||||
processing: processing, sequenceDeclarations: cloneSequenceDeclarations(sequenceDeclarations), pendingItem: &localScope,
|
||||
}},
|
||||
}
|
||||
}
|
||||
if diagnostic := reservePendingItemPlacements(&acquisition, limits, accounting); diagnostic != nil {
|
||||
acquisition, diagnostic := finalizeDeclaringImportScope(state.scope, root, accounting, limits)
|
||||
if diagnostic != nil {
|
||||
return nil, cloneSourceInfos(state.sources), []Diagnostic{*diagnostic}
|
||||
}
|
||||
return &composedDocument{
|
||||
@@ -221,35 +196,27 @@ func acquireImportedWithAccess(request importAcquisitionRequest, policy *acquisi
|
||||
}, cloneSourceInfos(state.sources), nil
|
||||
}
|
||||
|
||||
func (s *importTraversal) checkInitialLimits() *Diagnostic {
|
||||
if s.state.accounting.sources > s.policy.importLimits.sources {
|
||||
value := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the source-count limit", nil)
|
||||
return &value
|
||||
}
|
||||
if s.state.accounting.bytes > s.policy.importLimits.bytes {
|
||||
value := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the aggregate byte limit", nil)
|
||||
return &value
|
||||
}
|
||||
if s.state.accounting.nodes > s.policy.importLimits.nodes {
|
||||
value := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the aggregate node limit", nil)
|
||||
return &value
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *importTraversal) walkDeclarations(basePath string, declarations []importDeclarationSpec, depth int, parentDestination Path, sourceIndex int) []Diagnostic {
|
||||
func prepareImportDeclarations(declarations []importDeclarationSpec, defaults ImportDefaults, parentDestination Path) ([]resolvedImportPolicy, []Diagnostic) {
|
||||
policies := make([]resolvedImportPolicy, len(declarations))
|
||||
for index, spec := range declarations {
|
||||
policy, diagnostics := resolveImportPolicy(spec, s.policy.importDefaults)
|
||||
policy, diagnostics := resolveImportPolicy(spec, defaults)
|
||||
if len(diagnostics) != 0 {
|
||||
return diagnostics
|
||||
return nil, diagnostics
|
||||
}
|
||||
if policy.placement == PlacementModeSequenceItem && len(appendDestination(parentDestination, policy.destination).segments) == 0 {
|
||||
site := spec.fieldSites["placement"]
|
||||
return []Diagnostic{{Code: CodeImportInvalid, Severity: SeverityError, Path: site.path.clone(), Message: "sequence-item placement requires a nonempty destination", Primary: cloneLocation(&site.location)}}
|
||||
return nil, []Diagnostic{{Code: CodeImportInvalid, Severity: SeverityError, Path: site.path.clone(), Message: "sequence-item placement requires a nonempty destination", Primary: cloneLocation(&site.location)}}
|
||||
}
|
||||
policies[index] = policy
|
||||
}
|
||||
return policies, nil
|
||||
}
|
||||
|
||||
func (s *importTraversal) walkDeclarations(basePath string, declarations []importDeclarationSpec, depth int, parentDestination Path, sourceIndex int) []Diagnostic {
|
||||
policies, diagnostics := prepareImportDeclarations(declarations, s.policy.importDefaults, parentDestination)
|
||||
if len(diagnostics) != 0 {
|
||||
return diagnostics
|
||||
}
|
||||
for index, spec := range declarations {
|
||||
policy := policies[index]
|
||||
var selection importSelection
|
||||
|
||||
@@ -285,3 +285,58 @@ func importedVersionClaim(documents []*document.Node, scope acquisitionScope, co
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// The declaring payload contributes once even when there are no admitted imports.
|
||||
func chargeDeclaringImport(parsed parsedSource, accounting *importAccounting, limits importLimits) *Diagnostic {
|
||||
accounting.sources++
|
||||
accounting.bytes += parsed.bytes
|
||||
accounting.nodes += countInputNodes(parsed.document)
|
||||
if accounting.sources > limits.sources {
|
||||
value := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the source-count limit", nil)
|
||||
return &value
|
||||
}
|
||||
if accounting.bytes > limits.bytes {
|
||||
value := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the aggregate byte limit", nil)
|
||||
return &value
|
||||
}
|
||||
if accounting.nodes > limits.nodes {
|
||||
value := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the aggregate node limit", nil)
|
||||
return &value
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func prepareDeclaringImportScope(root acquiredContribution, accounting *importAccounting, limits importLimits) (acquisitionScope, *Diagnostic) {
|
||||
scope := acquisitionScope{owner: root.identity}
|
||||
if root.source.placementMode == PlacementModeSequenceItem {
|
||||
root.document = root.payload
|
||||
} else {
|
||||
destination := root.source.Destination
|
||||
_, placed, err := placeDocument(root.payload, destination, root.payload.Location, maxDocumentDepth, maxDocumentNodes)
|
||||
if err != nil {
|
||||
diagnostic := sourceDiagnostic(CodeSourceLimitExceeded, root.source.ID, "configuration exceeds the source depth or node limit after destination placement")
|
||||
return acquisitionScope{}, &diagnostic
|
||||
}
|
||||
placementNodes := destinationWrapperNodeCount(destination)
|
||||
if accounting.nodes+placementNodes > limits.nodes {
|
||||
diagnostic := importDiagnostic(CodeImportLimitExceeded, "configuration exceeds the aggregate node limit", nil)
|
||||
return acquisitionScope{}, &diagnostic
|
||||
}
|
||||
accounting.nodes += placementNodes
|
||||
root.document, root.destination = placed, destination.clone()
|
||||
scope.destination = destination.clone()
|
||||
}
|
||||
scope.contributions = []acquiredContribution{root}
|
||||
return scope, nil
|
||||
}
|
||||
|
||||
func finalizeDeclaringImportScope(scope acquisitionScope, root acquiredContribution, accounting *importAccounting, limits importLimits) (acquisitionScope, *Diagnostic) {
|
||||
if root.source.placementMode == PlacementModeSequenceItem {
|
||||
root.destination = root.source.Destination.clone()
|
||||
localScope := scope
|
||||
root.pendingItem = &localScope
|
||||
scope = acquisitionScope{owner: root.identity, destination: root.destination.clone(), contributions: []acquiredContribution{root}}
|
||||
}
|
||||
diagnostic := reservePendingItemPlacements(&scope, limits, accounting)
|
||||
return scope, diagnostic
|
||||
}
|
||||
|
||||
@@ -124,7 +124,8 @@ func resolveImportPolicy(spec importDeclarationSpec, defaults ImportDefaults) (r
|
||||
if spec.patternSet {
|
||||
policy.pattern = cloneStrings(spec.pattern)
|
||||
} else {
|
||||
policy.pattern = cloneStrings(defaults.Pattern)
|
||||
// Defaults belong to the load's snapshot. Selectors only read them.
|
||||
policy.pattern = defaults.Pattern
|
||||
}
|
||||
}
|
||||
if spec.depthSet && !policy.recursive {
|
||||
|
||||
@@ -232,7 +232,7 @@ func parseImportSpecsYAML(t *testing.T, declarations string) ([]importDeclaratio
|
||||
if len(diagnostics) != 0 {
|
||||
return nil, diagnostics
|
||||
}
|
||||
extracted, diagnostics := extractRootDirectives(parsed.document, rootDirectiveContextSource)
|
||||
extracted, diagnostics := extractRootDirectives(parsed.document, rootDirectiveContextSource, sourceVersionContribution)
|
||||
if len(diagnostics) != 0 {
|
||||
return nil, diagnostics
|
||||
}
|
||||
|
||||
@@ -1558,6 +1558,6 @@ func parseImportSpecificationYAML(input string) ([]importDeclarationSpec, []Diag
|
||||
if len(diagnostics) != 0 {
|
||||
return nil, diagnostics
|
||||
}
|
||||
_, declarations, diagnostics := splitImportDirectives(parsed.document)
|
||||
_, declarations, diagnostics := splitImportDirectives(parsed.document, sourceVersionMain)
|
||||
return declarations, diagnostics
|
||||
}
|
||||
|
||||
@@ -7,10 +7,16 @@ type Input struct {
|
||||
Source Source
|
||||
Imports bool
|
||||
Filesystem *FilesystemContext
|
||||
MainRelative *MainRelativeContext
|
||||
Destination Path
|
||||
PlacementMode PlacementMode
|
||||
}
|
||||
|
||||
type MainRelativeContext struct {
|
||||
Fallback *FilesystemContext
|
||||
RequireBase bool
|
||||
}
|
||||
|
||||
// Underlay contains strictly composed contributions at one precedence tier.
|
||||
type Underlay struct{ Inputs []Input }
|
||||
|
||||
@@ -22,6 +28,7 @@ type LayeredOptions[T any] struct {
|
||||
Underlays []Underlay
|
||||
Overlay string
|
||||
OverlayFilesystem *FilesystemContext
|
||||
OverlayFallback *FilesystemContext
|
||||
Overrides []Override
|
||||
}
|
||||
|
||||
@@ -37,13 +44,14 @@ func LoadLayered[T any](main Input, secrets SecretBinding, supplied ...LayeredOp
|
||||
}
|
||||
request := loadRequest[T]{
|
||||
main: loadInput{
|
||||
source: main.Source, imports: main.Imports, filesystem: main.Filesystem,
|
||||
source: main.Source, imports: main.Imports, filesystem: main.Filesystem, mainRelative: main.MainRelative,
|
||||
destination: main.Destination.clone(), placementMode: main.PlacementMode,
|
||||
},
|
||||
definition: options.Definition, sourceVersionMode: options.SourceVersionMode,
|
||||
importDefaults: options.ImportDefaults,
|
||||
overlay: options.Overlay,
|
||||
overlayFilesystem: options.OverlayFilesystem,
|
||||
overlayFallback: options.OverlayFallback,
|
||||
overrides: append([]Override(nil), options.Overrides...),
|
||||
underlays: make([]loadGroup, len(options.Underlays)),
|
||||
}
|
||||
@@ -51,7 +59,7 @@ func LoadLayered[T any](main Input, secrets SecretBinding, supplied ...LayeredOp
|
||||
request.underlays[index].inputs = make([]loadInput, len(underlay.Inputs))
|
||||
for inputIndex, input := range underlay.Inputs {
|
||||
request.underlays[index].inputs[inputIndex] = loadInput{
|
||||
source: input.Source, imports: input.Imports, filesystem: input.Filesystem,
|
||||
source: input.Source, imports: input.Imports, filesystem: input.Filesystem, mainRelative: input.MainRelative,
|
||||
destination: input.Destination.clone(), placementMode: input.PlacementMode,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ type loadRequest[T any] struct {
|
||||
effectiveVersion *VersionRule
|
||||
overlay string
|
||||
overlayFilesystem *FilesystemContext
|
||||
overlayFallback *FilesystemContext
|
||||
overrides []Override
|
||||
ordinary bool
|
||||
}
|
||||
@@ -31,6 +32,7 @@ type loadInput struct {
|
||||
source Source
|
||||
imports bool
|
||||
filesystem *FilesystemContext
|
||||
mainRelative *MainRelativeContext
|
||||
destination Path
|
||||
placementMode PlacementMode
|
||||
}
|
||||
@@ -57,6 +59,9 @@ func loadGroupedWithSecretLookupLimit[T any](request loadRequest[T], secrets Sec
|
||||
request.importDefaults = defaults
|
||||
request.sequencePolicy = policy
|
||||
request.definition.sequenceIdentityRegistrations = nil
|
||||
if request.main.mainRelative != nil && request.main.filesystem == nil {
|
||||
diagnostics = append(diagnostics, optionDiagnostic(CodeOptionsInvalid, "main input cannot use main-relative context"))
|
||||
}
|
||||
main, mainDiagnostics := normalizeInput(request.main, "")
|
||||
request.main = main
|
||||
diagnostics = append(diagnostics, mainDiagnostics...)
|
||||
@@ -64,6 +69,13 @@ func loadGroupedWithSecretLookupLimit[T any](request loadRequest[T], secrets Sec
|
||||
for groupIndex := range request.underlays {
|
||||
for inputIndex := range request.underlays[groupIndex].inputs {
|
||||
input := &request.underlays[groupIndex].inputs[inputIndex]
|
||||
if input.mainRelative != nil && input.filesystem == nil {
|
||||
if input.source.kind == sourceFile || input.source.kind == sourceFilesystem || input.source.kind == sourceSearch {
|
||||
diagnostics = append(diagnostics, optionDiagnostic(CodeOptionsInvalid, "file and search underlays cannot use main-relative context"))
|
||||
} else if input.mainRelative.Fallback != nil {
|
||||
diagnostics = append(diagnostics, filesystemOptionDiagnostics(Source{kind: sourceBytes}, input.mainRelative.Fallback)...)
|
||||
}
|
||||
}
|
||||
normalized, inputDiagnostics := normalizeInput(*input, "")
|
||||
*input = normalized
|
||||
diagnostics = append(diagnostics, inputDiagnostics...)
|
||||
@@ -71,10 +83,10 @@ func loadGroupedWithSecretLookupLimit[T any](request loadRequest[T], secrets Sec
|
||||
}
|
||||
diagnostics = append(diagnostics, overlayOptionDiagnostics(request.overlay)...)
|
||||
if activeOverlay(request.overlay) {
|
||||
if request.overlayFilesystem == nil {
|
||||
diagnostics = append(diagnostics, optionDiagnostic(CodeOptionsInvalid, "selected overlay requires explicit filesystem context"))
|
||||
} else {
|
||||
if request.overlayFilesystem != nil {
|
||||
diagnostics = append(diagnostics, filesystemOptionDiagnostics(Source{kind: sourceBytes}, request.overlayFilesystem)...)
|
||||
} else if request.overlayFallback != nil {
|
||||
diagnostics = append(diagnostics, filesystemOptionDiagnostics(Source{kind: sourceBytes}, request.overlayFallback)...)
|
||||
}
|
||||
}
|
||||
if len(diagnostics) != 0 {
|
||||
@@ -90,7 +102,7 @@ func assembleLayeredInput[T any](request loadRequest[T], input assembledInput, p
|
||||
projectVersion := sequenceVersionPath(request.protectionVersion())
|
||||
for index, group := range request.underlays {
|
||||
evidenceStart := len(input.versionState.evidenceSince(0))
|
||||
acquired, diagnostics := acquireUnderlayGroupScopes(group, index+1, request.protectionVersion(), state, policy)
|
||||
acquired, diagnostics := acquireUnderlayGroupScopes(group, index+1, request.protectionVersion(), state, policy, input.resolvedFilesystem)
|
||||
mergeResourceContexts(&input.contexts, acquired.contexts)
|
||||
if len(diagnostics) != 0 {
|
||||
input.sources = append(input.sources, acquired.sources...)
|
||||
@@ -178,10 +190,20 @@ func assembleLayeredInput[T any](request loadRequest[T], input assembledInput, p
|
||||
assembly.current.inputBytes = state.accounting.bytes
|
||||
assembly.current.inputNodes = state.accounting.nodes
|
||||
if activeOverlay(request.overlay) {
|
||||
if request.overlayFilesystem == nil {
|
||||
return input, append(versionDiagnostics, optionDiagnostic(CodeOptionsInvalid, "selected overlay requires explicit filesystem context"))
|
||||
var resolved resolvedFilesystemContext
|
||||
var diagnostic *Diagnostic
|
||||
useBase := false
|
||||
if request.overlayFilesystem != nil {
|
||||
resolved, diagnostic = resolveAbsentFilesystemContext(request.overlayFilesystem)
|
||||
} else if input.resolvedFilesystem != nil {
|
||||
resolved = *input.resolvedFilesystem
|
||||
useBase = true
|
||||
} else if request.overlayFallback != nil {
|
||||
resolved, diagnostic = resolveAbsentFilesystemContext(request.overlayFallback)
|
||||
useBase = true
|
||||
} else {
|
||||
return input, append(versionDiagnostics, optionDiagnostic(CodeOptionsInvalid, "selected overlay requires a filesystem context"))
|
||||
}
|
||||
resolved, diagnostic := resolveAbsentFilesystemContext(request.overlayFilesystem)
|
||||
if diagnostic != nil {
|
||||
return input, append(versionDiagnostics, *diagnostic)
|
||||
}
|
||||
@@ -192,6 +214,9 @@ func assembleLayeredInput[T any](request loadRequest[T], input assembledInput, p
|
||||
name: request.overlay, protectionRule: request.protectionVersion(),
|
||||
sequencePolicy: policy.sequencePolicy, limits: defaultImportLimits(), versionState: input.versionState,
|
||||
}
|
||||
if useBase {
|
||||
overlayRequest.lookupDirectory = resolved.basePath
|
||||
}
|
||||
var diagnostics []Diagnostic
|
||||
access, diagnostic := openSelectedOverlayAccess(resolved)
|
||||
if diagnostic != nil {
|
||||
@@ -248,12 +273,31 @@ func applyCompletedTier(
|
||||
return operations, nil
|
||||
}
|
||||
|
||||
func acquireUnderlayGroupScopes(group loadGroup, index int, rule *VersionRule, state *acquisitionState, policy acquisitionPolicy) (*acquiredUnderlayGroup, []Diagnostic) {
|
||||
func acquireUnderlayGroupScopes(group loadGroup, index int, rule *VersionRule, state *acquisitionState, policy acquisitionPolicy, mainContext *resolvedFilesystemContext) (*acquiredUnderlayGroup, []Diagnostic) {
|
||||
initialBytes, initialNodes := state.accounting.bytes, state.accounting.nodes
|
||||
tier := &tierAcquisitionState{visited: make(map[resourceIdentity]importRoute), hostToken: &namespaceToken{}}
|
||||
var derived *resolvedFilesystemContext
|
||||
bind := func(input loadInput) (loadInput, *resolvedFilesystemContext) {
|
||||
if input.filesystem != nil || input.mainRelative == nil {
|
||||
return input, nil
|
||||
}
|
||||
if mainContext == nil {
|
||||
input.filesystem = input.mainRelative.Fallback
|
||||
return input, nil
|
||||
}
|
||||
if derived == nil {
|
||||
context := *mainContext
|
||||
context.mainPath = ""
|
||||
context.hostToken = tier.hostToken
|
||||
derived = &context
|
||||
}
|
||||
return input, derived
|
||||
}
|
||||
nativeAnchors := make(map[*namespaceToken]string)
|
||||
for inputIndex, contribution := range group.inputs {
|
||||
if token := nativeTokenForLoadInput(contribution); token != nil {
|
||||
contribution, resolved := bind(contribution)
|
||||
token := nativeTokenForLoadInput(contribution, resolved)
|
||||
if token != nil {
|
||||
if _, exists := nativeAnchors[token]; !exists {
|
||||
nativeAnchors[token] = explicitNamespaceAnchor(index, inputIndex+1)
|
||||
}
|
||||
@@ -262,8 +306,11 @@ func acquireUnderlayGroupScopes(group loadGroup, index int, rule *VersionRule, s
|
||||
acquiredGroup := &acquiredUnderlayGroup{index: index}
|
||||
inclusionGraph := newImportInclusionGraph()
|
||||
for inputIndex, contribution := range group.inputs {
|
||||
contribution, resolved := bind(contribution)
|
||||
acquired, diagnostics := acquireInput(inputAcquisitionRequest{
|
||||
input: contribution, role: sourceVersionContribution,
|
||||
resolved: resolved,
|
||||
withoutBase: contribution.mainRelative != nil && contribution.filesystem == nil && resolved == nil,
|
||||
directiveContext: rootDirectiveContextLayered, protectionRule: rule,
|
||||
}, policy, state, tier)
|
||||
for _, source := range acquired.sources {
|
||||
@@ -282,7 +329,8 @@ func acquireUnderlayGroupScopes(group loadGroup, index int, rule *VersionRule, s
|
||||
kind: "host", host: explicitNamespaceAnchor(index, 0),
|
||||
input: explicitNamespaceAnchor(index, inputIndex+1),
|
||||
}
|
||||
if token := nativeTokenForLoadInput(contribution); token != nil {
|
||||
token := nativeTokenForLoadInput(contribution, resolved)
|
||||
if token != nil {
|
||||
anchors.kind = "native"
|
||||
anchors.native = nativeAnchors[token]
|
||||
}
|
||||
@@ -365,7 +413,10 @@ func composeUnderlayGroup(acquired *acquiredUnderlayGroup, rule *VersionRule, po
|
||||
return composition, nil
|
||||
}
|
||||
|
||||
func nativeTokenForLoadInput(input loadInput) *namespaceToken {
|
||||
func nativeTokenForLoadInput(input loadInput, resolved *resolvedFilesystemContext) *namespaceToken {
|
||||
if resolved != nil && resolved.native != nil {
|
||||
return resolved.native.token
|
||||
}
|
||||
if input.source.kind == sourceFilesystem && input.source.namespace != nil {
|
||||
return input.source.namespace.token
|
||||
}
|
||||
|
||||
@@ -81,7 +81,7 @@ func TestUnderlayGroupAcquisitionRetainsScopesUntilComposition(t *testing.T) {
|
||||
accounting := &importAccounting{}
|
||||
group := loadGroup{inputs: []loadInput{{source: filesystem.File("main.yml"), imports: true}}}
|
||||
state := &acquisitionState{accounting: accounting}
|
||||
acquired, diagnostics := acquireUnderlayGroupScopes(group, 2, nil, state, acquisitionPolicy{importLimits: defaultImportLimits()})
|
||||
acquired, diagnostics := acquireUnderlayGroupScopes(group, 2, nil, state, acquisitionPolicy{importLimits: defaultImportLimits()}, nil)
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatalf("acquire underlay group: %#v", diagnostics)
|
||||
}
|
||||
@@ -109,7 +109,7 @@ func TestUnderlayGroupAcquisitionRetainsScopesUntilComposition(t *testing.T) {
|
||||
t.Fatalf("composed group handoff = %#v", composition)
|
||||
}
|
||||
|
||||
empty, diagnostics := acquireUnderlayGroupScopes(loadGroup{}, 3, nil, state, acquisitionPolicy{importLimits: defaultImportLimits()})
|
||||
empty, diagnostics := acquireUnderlayGroupScopes(loadGroup{}, 3, nil, state, acquisitionPolicy{importLimits: defaultImportLimits()}, nil)
|
||||
if len(diagnostics) != 0 || len(empty.scopes) != 0 {
|
||||
t.Fatalf("empty group acquisition = %#v, %#v", empty, diagnostics)
|
||||
}
|
||||
@@ -471,7 +471,7 @@ func TestGroupedLoadStrictConflictsRepetitionAndBudgets(t *testing.T) {
|
||||
|
||||
func testAcquireUnderlayGroup(group loadGroup, index int, rule *VersionRule, accounting *importAccounting) (*acquiredUnderlayGroup, []Diagnostic) {
|
||||
state := &acquisitionState{accounting: accounting}
|
||||
acquired, diagnostics := acquireUnderlayGroupScopes(group, index, rule, state, acquisitionPolicy{importLimits: defaultImportLimits()})
|
||||
acquired, diagnostics := acquireUnderlayGroupScopes(group, index, rule, state, acquisitionPolicy{importLimits: defaultImportLimits()}, nil)
|
||||
return acquired, diagnostics
|
||||
}
|
||||
|
||||
|
||||
44
internal/engine/main_relative_integration_test.go
Normal file
44
internal/engine/main_relative_integration_test.go
Normal file
@@ -0,0 +1,44 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
)
|
||||
|
||||
func TestMainRelativeAcquisitionClosesHandlesOnFailure(t *testing.T) {
|
||||
for _, fail := range []string{"parse", "read"} {
|
||||
t.Run(fail, func(t *testing.T) {
|
||||
body := "items: [invalid\n"
|
||||
if fail == "read" {
|
||||
body = "items: {key: value}\n"
|
||||
}
|
||||
filesystem := &observedFilesystem{files: fstest.MapFS{"dir/main.yml": {Data: []byte("{}\n")}, "dir/child.yml": {Data: []byte(body)}}}
|
||||
if fail == "read" {
|
||||
filesystem.failRead = "dir/child.yml"
|
||||
}
|
||||
namespace := newNativeNamespace("bundle", filesystem)
|
||||
main := Input{Source: filesystemFile(namespace, "dir/main.yml")}
|
||||
underlay := Input{Source: Bytes("declarations", []byte("config: {imports: [{path: child.yml}]}\n")), Imports: true, MainRelative: &MainRelativeContext{}}
|
||||
_, err := LoadLayered[importTestConfig](main, SecretBinding{}, LayeredOptions[importTestConfig]{Underlays: []Underlay{{Inputs: []Input{underlay}}}})
|
||||
if err == nil {
|
||||
t.Fatal("invalid selected child succeeded")
|
||||
}
|
||||
filesystem.assertClosed(t)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMainRelativeSharesAcquisitionBudget(t *testing.T) {
|
||||
limits := defaultImportLimits()
|
||||
limits.sources = 1
|
||||
accounting := &importAccounting{}
|
||||
state := &acquisitionState{accounting: accounting}
|
||||
group := loadGroup{inputs: []loadInput{
|
||||
{source: Bytes("one", []byte("items: {one: value}\n")), mainRelative: &MainRelativeContext{}},
|
||||
{source: Bytes("two", []byte("items: {two: value}\n")), imports: true, mainRelative: &MainRelativeContext{}},
|
||||
}}
|
||||
_, diagnostics := acquireUnderlayGroupScopes(group, 1, nil, state, acquisitionPolicy{importLimits: limits}, nil)
|
||||
if len(diagnostics) == 0 || diagnostics[0].Code != CodeImportLimitExceeded {
|
||||
t.Fatalf("diagnostics = %#v", diagnostics)
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ func normalizeInput(input loadInput, ordinaryOverlay string) (loadInput, []Diagn
|
||||
if input.source.kind == sourceNone && activeOverlay(ordinaryOverlay) && input.filesystem == nil {
|
||||
diagnostics = append(diagnostics, optionDiagnostic(CodeOptionsInvalid, "NoSource overlays require explicit filesystem context"))
|
||||
}
|
||||
if input.filesystem == nil && (input.source.kind == sourceBytes || input.source.kind == sourceReader || input.source.kind == sourceMapping) && (input.imports || activeOverlay(ordinaryOverlay)) {
|
||||
if input.filesystem == nil && input.mainRelative == nil && (input.source.kind == sourceBytes || input.source.kind == sourceReader || input.source.kind == sourceMapping) && (input.imports || activeOverlay(ordinaryOverlay)) {
|
||||
diagnostics = append(diagnostics, optionDiagnostic(CodeOptionsInvalid, "synthetic-source imports or overlays require filesystem context"))
|
||||
}
|
||||
return input, canonicalDiagnostics(diagnostics)
|
||||
|
||||
103
internal/engine/prepared_context_test.go
Normal file
103
internal/engine/prepared_context_test.go
Normal file
@@ -0,0 +1,103 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"runtime"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
)
|
||||
|
||||
func TestCapturedMainUsesItsContextDuringOrdinaryLoad(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
main := writeImportFile(t, root, "app/main.yml", "settings: {main: retained}\n")
|
||||
writeImportFile(t, root, "app/resource.txt", "resource")
|
||||
writeImportFile(t, root, "overlays/dev.yml", "settings: {overlay: applied}\n")
|
||||
context := &FilesystemContext{Root: root}
|
||||
prepared, _, diagnostics := captureHostMain(File(main), context)
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatal(diagnostics)
|
||||
}
|
||||
options := Options[discoveryLoadConfig]{Filesystem: context, Destination: Keys("service"), Overlay: "dev"}
|
||||
ordinary, err := testLoad(File(main), options)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
options.Filesystem = nil
|
||||
captured, err := testLoad(prepared, options)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !reflect.DeepEqual(captured.Config, ordinary.Config) || !reflect.DeepEqual(captured.Sources(), ordinary.Sources()) {
|
||||
t.Fatalf("ordinary = %#v, captured = %#v, sources = %#v / %#v", ordinary.Config, captured.Config, ordinary.Sources(), captured.Sources())
|
||||
}
|
||||
resource, ok := captured.Inspection.SourceContext("source-1")
|
||||
if !ok || resource.BaseDir != "app" {
|
||||
t.Fatalf("resource context = %#v, %v", resource, ok)
|
||||
}
|
||||
data, err := fs.ReadFile(resource.FS, "app/resource.txt")
|
||||
if err != nil || string(data) != "resource" {
|
||||
t.Fatalf("resource = %q, %v", data, err)
|
||||
}
|
||||
if err := os.Remove(main); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, filesystem := range []*FilesystemContext{nil, {Root: root}} {
|
||||
options.Filesystem = filesystem
|
||||
loaded, err := testLoad(prepared, options)
|
||||
if err != nil || !reflect.DeepEqual(loaded.Config, captured.Config) {
|
||||
t.Fatalf("load after main removal: %#v, %v", loaded, err)
|
||||
}
|
||||
}
|
||||
for _, filesystem := range []*FilesystemContext{{Root: filepath.Join(root, "app")}, {Root: root, BaseDir: root}, {Root: ".", FS: filesystemPointer(NewFilesystem("native", fstest.MapFS{}))}} {
|
||||
for _, imports := range []bool{false, true} {
|
||||
options.Filesystem, options.Imports = filesystem, imports
|
||||
_, err := testLoad(prepared, options)
|
||||
var loadErr *LoadError
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) == 0 || loadErr.Diagnostics()[0].Code != CodeOptionsInvalid {
|
||||
t.Fatalf("incompatible context %#v, imports %v: %v", filesystem, imports, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
_, err = LoadLayered(Input{Source: prepared, Filesystem: &FilesystemContext{Root: filepath.Join(root, "app")}}, testSecretBinding(), LayeredOptions[discoveryLoadConfig]{Overlay: "missing"})
|
||||
var loadErr *LoadError
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) == 0 || loadErr.Diagnostics()[0].Code != CodeOptionsInvalid {
|
||||
t.Fatalf("incompatible layered context: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func filesystemPointer(filesystem Filesystem) *Filesystem { return &filesystem }
|
||||
|
||||
func TestCapturedMainUsesCanonicalTargetAfterSymlinkChanges(t *testing.T) {
|
||||
if runtime.GOOS == "windows" {
|
||||
t.Skip("symlink creation may require privileges")
|
||||
}
|
||||
root := t.TempDir()
|
||||
main := writeImportFile(t, root, "actual/main.yml", "value: original\n")
|
||||
other := writeImportFile(t, root, "other.yml", "value: changed\n")
|
||||
link := filepath.Join(root, "link.yml")
|
||||
if err := os.Symlink(main, link); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
prepared, _, diagnostics := captureHostMain(File(link), &FilesystemContext{Root: root})
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatal(diagnostics)
|
||||
}
|
||||
if err := os.Remove(link); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Symlink(other, link); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
rootAlias := filepath.Join(t.TempDir(), "root-link")
|
||||
if err := os.Symlink(root, rootAlias); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err := testLoad(prepared, Options[discoveryLoadConfig]{Filesystem: &FilesystemContext{Root: rootAlias}})
|
||||
if err != nil || loaded.Config.Value != "original" || loaded.Sources()[0].Path != canonicalTestPath(t, main) {
|
||||
t.Fatalf("load = %#v, %v", loaded, err)
|
||||
}
|
||||
}
|
||||
121
internal/engine/prepared_imports_test.go
Normal file
121
internal/engine/prepared_imports_test.go
Normal file
@@ -0,0 +1,121 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestCapturedMainLoadsLiveImportsWithIndependentEvidence(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
mainBody := "version: 1\nconfig: {imports: [{path: ../shared.yml}]}\nsettings: {main: captured}\n"
|
||||
main := writeImportFile(t, root, "app/main.yml", mainBody)
|
||||
child := writeImportFile(t, root, "shared.yml", "version: 2\nsettings: {child: original}\n")
|
||||
prepared, _, diagnostics := captureHostMain(File(main), &FilesystemContext{Root: root})
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatal(diagnostics)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("settings: {main: changed}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
type config struct {
|
||||
Version int `yaml:"version"`
|
||||
Settings map[string]string `yaml:"settings"`
|
||||
}
|
||||
options := Options[config]{Imports: true, SourceVersionMode: sourceVersionModeRequired,
|
||||
Definition: Definition[config]{Version: &VersionRule{Path: Keys("version"), Check: func(Version, *Validation) error { return nil }}},
|
||||
}
|
||||
for _, value := range []string{"first", "second"} {
|
||||
if err := os.WriteFile(child, []byte("version: 2\nsettings: {child: "+value+"}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err := testLoad(prepared, options)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if loaded.Config.Settings["main"] != "captured" || loaded.Config.Settings["child"] != value {
|
||||
t.Fatalf("configuration = %#v", loaded.Config)
|
||||
}
|
||||
sources := loaded.Sources()
|
||||
if len(sources) != 2 || sources[0].ID != "source-1" || sources[1].ID != "source-2" || sources[0].VersionCheck == nil || sources[0].VersionCheck.Version.Text != "1" || sources[1].VersionCheck == nil || sources[1].VersionCheck.Version.Text != "2" {
|
||||
t.Fatalf("source evidence = %#v", sources)
|
||||
}
|
||||
sources[0].Label = "mutated"
|
||||
if loaded.Sources()[0].Label == "mutated" {
|
||||
t.Fatal("source evidence aliases returned records")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCapturedMainImportIdentityAndAccounting(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
mainBody := "config: {imports: [{path: child.yml}]}\nsettings: {main: captured}\n"
|
||||
childBody := "settings: {child: value}\n"
|
||||
main := writeImportFile(t, root, "main.yml", mainBody)
|
||||
child := writeImportFile(t, root, "child.yml", childBody)
|
||||
prepared, _, diagnostics := captureHostMain(File(main), nil)
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatal(diagnostics)
|
||||
}
|
||||
accounting := &importAccounting{}
|
||||
state := &acquisitionState{accounting: accounting}
|
||||
policy := acquisitionPolicy{importLimits: defaultImportLimits()}
|
||||
input, diagnostics := acquireInput(inputAcquisitionRequest{
|
||||
input: loadInput{source: prepared, imports: true, destination: Keys("service")},
|
||||
role: sourceVersionMain, directiveContext: rootDirectiveContextSource,
|
||||
}, policy, state, &tierAcquisitionState{visited: make(map[resourceIdentity]importRoute)})
|
||||
mainParsed, _ := parseSource(Bytes("main", []byte(mainBody)), "main", defaultParseLimits())
|
||||
childParsed, _ := parseSource(Bytes("child", []byte(childBody)), "child", defaultParseLimits())
|
||||
wantNodes := countInputNodes(mainParsed.document) + countInputNodes(childParsed.document) + destinationWrapperNodeCount(Keys("service"))*2
|
||||
if len(diagnostics) != 0 || len(input.sources) != 2 || accounting.sources != 2 || accounting.bytes != int64(len(mainBody)+len(childBody)) || accounting.nodes != wantNodes {
|
||||
t.Fatalf("acquisition = %#v, diagnostics = %#v, accounting = %#v, want nodes %d", input, diagnostics, accounting, wantNodes)
|
||||
}
|
||||
if err := os.WriteFile(child, []byte("config: {imports: [{path: main.yml}]}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
requireLoadCode(t, prepared, Options[importTestConfig]{Imports: true}, CodeImportCycle)
|
||||
if err := os.WriteFile(child, []byte("settings: {child: value}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
_, err := LoadLayered(Input{Source: NoSource()}, testSecretBinding(), LayeredOptions[importTestConfig]{
|
||||
Underlays: []Underlay{{Inputs: []Input{{Source: prepared, Imports: true}, {Source: prepared, Imports: true}}}},
|
||||
})
|
||||
var loadErr *LoadError
|
||||
if !errors.As(err, &loadErr) || len(loadErr.Diagnostics()) == 0 || loadErr.Diagnostics()[0].Code != CodeImportRepeated {
|
||||
t.Fatalf("repeated captured file: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("changed: true\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for range 2 {
|
||||
if _, err := testLoad(prepared, Options[discoveryLoadConfig]{Imports: true}); err != nil {
|
||||
t.Fatalf("independent load: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestCapturedMainBindsLayeredCompanions(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
main := writeImportFile(t, root, "app/main.yml", "settings: {main: yes-value}\n")
|
||||
writeImportFile(t, root, "app/lower.yml", "settings: {lower: underlay}\n")
|
||||
writeImportFile(t, root, "app/overlays/dev.yml", "settings: {selected: overlay}\n")
|
||||
prepared, _, diagnostics := captureHostMain(File(main), &FilesystemContext{Root: root})
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatal(diagnostics)
|
||||
}
|
||||
underlay := Input{Source: Bytes("companion", []byte("config: {imports: [{path: lower.yml}]}\n")), Imports: true, MainRelative: &MainRelativeContext{RequireBase: true}}
|
||||
loaded, err := LoadLayered(Input{Source: prepared}, testSecretBinding(), LayeredOptions[discoveryLoadConfig]{
|
||||
Underlays: []Underlay{{Inputs: []Input{underlay}}}, Overlay: "dev",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if loaded.Config.Settings["main"] != "yes-value" || loaded.Config.Settings["lower"] != "underlay" || loaded.Config.Settings["selected"] != "overlay" {
|
||||
t.Fatalf("layered configuration = %#v", loaded.Config)
|
||||
}
|
||||
sources := loaded.Inspection.Sources()
|
||||
if len(sources) != 4 || sources[0].Path != canonicalTestPath(t, main) || sources[2].Path != canonicalTestPath(t, filepath.Join(root, "app/lower.yml")) || sources[3].Layer != LayerOverlay {
|
||||
t.Fatalf("layered sources = %#v", sources)
|
||||
}
|
||||
}
|
||||
73
internal/engine/prepared_source.go
Normal file
73
internal/engine/prepared_source.go
Normal file
@@ -0,0 +1,73 @@
|
||||
package engine
|
||||
|
||||
import "go.maximumdirect.net/configkit/internal/document"
|
||||
|
||||
// capturedHostSource contains immutable, passive facts about one selected file.
|
||||
type capturedHostSource struct {
|
||||
document *document.Node
|
||||
bytes int64
|
||||
mainPath string
|
||||
basePath string
|
||||
rootPath string
|
||||
}
|
||||
|
||||
// selectInputSource shares discovery and post-selection option checks with
|
||||
// preparation and ordinary acquisition.
|
||||
func selectInputSource(source Source, sourceID string, context *FilesystemContext) (Source, *SourceInfo, []Diagnostic) {
|
||||
if source.kind != sourceSearch {
|
||||
return source, nil, nil
|
||||
}
|
||||
selected, failed, diagnostics := resolveSearchInput(source, sourceID, defaultDiscoveryDirectoryHelpers(), defaultDiscoveryHostProbe())
|
||||
if len(diagnostics) != 0 {
|
||||
return selected, failed, diagnostics
|
||||
}
|
||||
if context != nil {
|
||||
if diagnostics := filesystemOptionDiagnostics(selected, context); len(diagnostics) != 0 {
|
||||
return selected, nil, diagnostics
|
||||
}
|
||||
}
|
||||
return selected, nil, nil
|
||||
}
|
||||
|
||||
// captureHostMain snapshots a selected host document and canonical context.
|
||||
// Diagnostics retain the same source evidence as ordinary acquisition.
|
||||
func captureHostMain(source Source, context *FilesystemContext) (Source, []SourceInfo, []Diagnostic) {
|
||||
const sourceID = "source-1"
|
||||
if source.kind != sourceFile && source.kind != sourceSearch && source.kind != sourceNone {
|
||||
return Source{}, nil, []Diagnostic{optionDiagnostic(CodeOptionsInvalid, "main preparation requires a host file, search, or absent source")}
|
||||
}
|
||||
if context != nil {
|
||||
if context.FS != nil {
|
||||
return Source{}, nil, []Diagnostic{optionDiagnostic(CodeOptionsInvalid, "main preparation requires a host filesystem context")}
|
||||
}
|
||||
}
|
||||
if _, diagnostics := normalizeInput(loadInput{source: source, filesystem: context}, ""); len(diagnostics) != 0 {
|
||||
return Source{}, nil, diagnostics
|
||||
}
|
||||
selected, failed, diagnostics := selectInputSource(source, sourceID, context)
|
||||
if len(diagnostics) != 0 {
|
||||
return Source{}, sourceInfos(failed), diagnostics
|
||||
}
|
||||
if selected.kind == sourceNone {
|
||||
if context != nil {
|
||||
_, diagnostic := validateFilesystemContext(selected, context, parsedSource{}, nil)
|
||||
if diagnostic != nil {
|
||||
return Source{}, nil, []Diagnostic{*diagnostic}
|
||||
}
|
||||
}
|
||||
return selected, nil, nil
|
||||
}
|
||||
parsed, diagnostics := parseSource(selected, sourceID, defaultParseLimits())
|
||||
if len(diagnostics) != 0 {
|
||||
return Source{}, sourceInfos(parsed.source), diagnostics
|
||||
}
|
||||
resolved, diagnostic := validateFilesystemContext(selected, context, parsed, nil)
|
||||
if diagnostic != nil {
|
||||
return Source{}, sourceInfos(parsed.source), []Diagnostic{*diagnostic}
|
||||
}
|
||||
selected.captured = &capturedHostSource{
|
||||
document: parsed.document, bytes: parsed.bytes, mainPath: resolved.mainPath,
|
||||
basePath: resolved.basePath, rootPath: resolved.rootPath,
|
||||
}
|
||||
return selected, sourceInfos(parsed.source), nil
|
||||
}
|
||||
85
internal/engine/prepared_source_test.go
Normal file
85
internal/engine/prepared_source_test.go
Normal file
@@ -0,0 +1,85 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestCapturedHostSourceRetainsSelectedDocument(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
first := filepath.Join(dir, "first.yml")
|
||||
second := filepath.Join(dir, "second.yml")
|
||||
if err := os.WriteFile(second, []byte("config: {secrets_dir: secrets}\nvalue: original\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
search := SearchConfig("app", Paths(first, second))
|
||||
prepared, sources, diagnostics := captureHostMain(search, nil)
|
||||
if len(diagnostics) != 0 || len(sources) != 1 || prepared.captured == nil || prepared.captured.mainPath != canonicalTestPath(t, second) || prepared.captured.basePath != canonicalTestPath(t, dir) || prepared.captured.rootPath != canonicalTestPath(t, dir) {
|
||||
t.Fatalf("prepared = %#v, sources = %#v, diagnostics = %#v", prepared, sources, diagnostics)
|
||||
}
|
||||
wider, _, diagnostics := captureHostMain(File(second), &FilesystemContext{Root: filepath.Dir(dir)})
|
||||
if len(diagnostics) != 0 || wider.captured == nil || wider.captured.rootPath != canonicalTestPath(t, filepath.Dir(dir)) {
|
||||
t.Fatalf("wider context = %#v, diagnostics = %#v", wider, diagnostics)
|
||||
}
|
||||
if err := os.WriteFile(first, []byte("value: newer-candidate\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(second, []byte("value: changed\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, source := range []Source{prepared, prepared} {
|
||||
parsed, diagnostics := parseSource(source, "another-source", defaultParseLimits())
|
||||
if len(diagnostics) != 0 || parsed.source.Path != canonicalTestPath(t, second) || len(parsed.document.Mapping) != 2 || parsed.document.Mapping[1].Value.Text != "original" || parsed.document.Mapping[0].Value.Location.SourceID != "another-source" {
|
||||
t.Fatalf("parsed = %#v, diagnostics = %#v", parsed, diagnostics)
|
||||
}
|
||||
parsed.document.Mapping[1].Value.Text = "mutated"
|
||||
}
|
||||
ordinary, diagnostics := parseSource(File(second), "ordinary", defaultParseLimits())
|
||||
if len(diagnostics) != 0 || ordinary.document.Mapping[0].Value.Text != "changed" {
|
||||
t.Fatalf("ordinary file after modification = %#v, diagnostics = %#v", ordinary, diagnostics)
|
||||
}
|
||||
if err := os.Remove(second); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
parsed, diagnostics := parseSource(prepared, "after-removal", defaultParseLimits())
|
||||
if len(diagnostics) != 0 || parsed.document.Mapping[1].Value.Text != "original" {
|
||||
t.Fatalf("after removal: parsed = %#v, diagnostics = %#v", parsed, diagnostics)
|
||||
}
|
||||
selected, _, diagnostics := selectInputSource(search, "source-1", nil)
|
||||
if len(diagnostics) != 0 || selected.path != first {
|
||||
t.Fatalf("fresh discovery = %#v, diagnostics = %#v", selected, diagnostics)
|
||||
}
|
||||
parsed, diagnostics = parseSource(File(first), "fresh", defaultParseLimits())
|
||||
if len(diagnostics) != 0 || parsed.document.Mapping[0].Value.Text != "newer-candidate" {
|
||||
t.Fatalf("fresh file = %#v, diagnostics = %#v", parsed, diagnostics)
|
||||
}
|
||||
limits := defaultParseLimits()
|
||||
limits.source.remaining = prepared.captured.bytes - 1
|
||||
if _, diagnostics := parseSource(prepared, "limited", limits); len(diagnostics) != 1 || diagnostics[0].Code != CodeSourceLimitExceeded {
|
||||
t.Fatalf("captured limit diagnostics = %#v", diagnostics)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCaptureHostSourceReportsSelectionAndParsingFailures(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
invalid := filepath.Join(dir, "invalid.yml")
|
||||
if err := os.WriteFile(invalid, []byte("not: [valid\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for _, source := range []Source{File(invalid), File(filepath.Join(dir, "missing.yml"))} {
|
||||
prepared, sources, diagnostics := captureHostMain(source, nil)
|
||||
if prepared.kind != sourceInvalid || len(sources) != 1 || len(diagnostics) == 0 || diagnostics[0].Primary == nil {
|
||||
t.Fatalf("prepared = %#v, sources = %#v, diagnostics = %#v", prepared, sources, diagnostics)
|
||||
}
|
||||
}
|
||||
missing := Paths(filepath.Join(dir, "missing.yml"))
|
||||
prepared, sources, diagnostics := captureHostMain(SearchConfig("app", missing), nil)
|
||||
if prepared.kind != sourceNone || len(sources) != 0 || len(diagnostics) != 0 {
|
||||
t.Fatalf("optional search: prepared = %#v, sources = %#v, diagnostics = %#v", prepared, sources, diagnostics)
|
||||
}
|
||||
prepared, _, diagnostics = captureHostMain(SearchConfig("app", missing, SearchOptions{Required: true}), nil)
|
||||
if prepared.kind != sourceInvalid || len(diagnostics) == 0 {
|
||||
t.Fatalf("required search: prepared = %#v, diagnostics = %#v", prepared, diagnostics)
|
||||
}
|
||||
}
|
||||
@@ -132,14 +132,25 @@ type stagedSecret struct {
|
||||
// once during startup, before concurrent work; Load never calls it.
|
||||
// Dot-prefixed entries are ignored and omitted from the report.
|
||||
func LoadSecretsDir(directory string) (*SecretsReport, error) {
|
||||
return loadSecretsDir(directory, secretsEnvironment{lookup: os.LookupEnv, set: os.Setenv}, secretsAccess{
|
||||
return LoadSecretsDirWithOptions(directory, SecretsDirOptions{})
|
||||
}
|
||||
|
||||
// SecretsDirOptions controls how directory values are applied.
|
||||
type SecretsDirOptions struct {
|
||||
Overwrite bool
|
||||
containmentRoot string
|
||||
}
|
||||
|
||||
// LoadSecretsDirWithOptions loads directory values with the selected policy.
|
||||
func LoadSecretsDirWithOptions(directory string, options SecretsDirOptions) (*SecretsReport, error) {
|
||||
return loadSecretsDir(directory, options, secretsEnvironment{lookup: os.LookupEnv, set: os.Setenv}, secretsAccess{
|
||||
openDirectory: os.Open,
|
||||
lstat: os.Lstat,
|
||||
openFile: os.Open,
|
||||
})
|
||||
}
|
||||
|
||||
func loadSecretsDir(directory string, environment secretsEnvironment, access secretsAccess) (*SecretsReport, error) {
|
||||
func loadSecretsDir(directory string, options SecretsDirOptions, environment secretsEnvironment, access secretsAccess) (*SecretsReport, error) {
|
||||
report := &SecretsReport{}
|
||||
if strings.TrimSpace(directory) == "" {
|
||||
return report, secretsFailure(CodeSecretsInvalidPath, "secrets directory path is required")
|
||||
@@ -149,6 +160,9 @@ func loadSecretsDir(directory string, environment secretsEnvironment, access sec
|
||||
if err != nil {
|
||||
return report, secretsFailure(classifySecretsFilesystemError(err), "secrets directory could not be canonicalized: "+strconv.Quote(cleanAbsolutePath(directory)))
|
||||
}
|
||||
if options.containmentRoot != "" && !containedPath(options.containmentRoot, canonical) {
|
||||
return report, secretsFailure(CodeSecretsInvalidPath, "secrets directory is outside the configuration root")
|
||||
}
|
||||
info, err := os.Stat(canonical)
|
||||
if err != nil {
|
||||
return report, secretsFailure(classifySecretsFilesystemError(err), "secrets directory could not be inspected: "+strconv.Quote(canonical))
|
||||
@@ -204,7 +218,7 @@ func loadSecretsDir(directory string, environment secretsEnvironment, access sec
|
||||
var consumed int64
|
||||
for index := range report.entries {
|
||||
entry := &report.entries[index]
|
||||
if existing, present := environment.lookup(entry.Name); present {
|
||||
if existing, present := environment.lookup(entry.Name); present && !options.Overwrite {
|
||||
entry.Status = SecretFileSkippedExisting
|
||||
entry.ExistingEmpty = existing == ""
|
||||
continue
|
||||
@@ -221,7 +235,7 @@ func loadSecretsDir(directory string, environment secretsEnvironment, access sec
|
||||
|
||||
for _, secret := range staged {
|
||||
entry := &report.entries[secret.entry]
|
||||
if existing, present := environment.lookup(entry.Name); present {
|
||||
if existing, present := environment.lookup(entry.Name); present && !options.Overwrite {
|
||||
entry.Status = SecretFileSkippedExisting
|
||||
entry.ExistingEmpty = existing == ""
|
||||
continue
|
||||
|
||||
67
internal/engine/secrets_from_config.go
Normal file
67
internal/engine/secrets_from_config.go
Normal file
@@ -0,0 +1,67 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
// SecretsFromConfigOptions controls main preparation and bootstrap precedence.
|
||||
type SecretsFromConfigOptions struct {
|
||||
Filesystem *FilesystemContext
|
||||
Overwrite *bool
|
||||
}
|
||||
|
||||
// LoadSecretsDirFromConfig prepares a host main source and explicitly loads
|
||||
// its declared secrets directory before a later configuration load.
|
||||
func LoadSecretsDirFromConfig(main Source, supplied ...SecretsFromConfigOptions) (*SecretsReport, Source, error) {
|
||||
return loadSecretsFromConfig(main, supplied, secretsEnvironment{lookup: os.LookupEnv, set: os.Setenv}, secretsAccess{
|
||||
openDirectory: os.Open, lstat: os.Lstat, openFile: os.Open,
|
||||
})
|
||||
}
|
||||
|
||||
func loadSecretsFromConfig(main Source, supplied []SecretsFromConfigOptions, environment secretsEnvironment, access secretsAccess) (*SecretsReport, Source, error) {
|
||||
emptyReport := &SecretsReport{}
|
||||
if len(supplied) > 1 {
|
||||
return emptyReport, Source{}, (&diagnosticAccumulator{diagnostics: []Diagnostic{optionDiagnostic(CodeOptionsInvalid, "secrets preparation accepts at most one options value")}}).loadError()
|
||||
}
|
||||
var context *FilesystemContext
|
||||
var overwrite *bool
|
||||
if len(supplied) == 1 {
|
||||
if supplied[0].Filesystem != nil {
|
||||
snapshot := *supplied[0].Filesystem
|
||||
if snapshot.FS != nil {
|
||||
filesystem := *snapshot.FS
|
||||
snapshot.FS = &filesystem
|
||||
}
|
||||
context = &snapshot
|
||||
}
|
||||
if supplied[0].Overwrite != nil {
|
||||
value := *supplied[0].Overwrite
|
||||
overwrite = &value
|
||||
}
|
||||
}
|
||||
prepared, sources, diagnostics := captureHostMain(main, context)
|
||||
if len(diagnostics) != 0 {
|
||||
return emptyReport, Source{}, (&diagnosticAccumulator{sources: sources, diagnostics: diagnostics}).loadError()
|
||||
}
|
||||
if prepared.kind == sourceNone {
|
||||
return emptyReport, prepared, nil
|
||||
}
|
||||
settings, diagnostics := extractBootstrapSettings(prepared.captured.document)
|
||||
if len(diagnostics) != 0 {
|
||||
return emptyReport, Source{}, (&diagnosticAccumulator{sources: sources, diagnostics: diagnostics}).loadError()
|
||||
}
|
||||
if !settings.directoryDeclared {
|
||||
return emptyReport, prepared, nil
|
||||
}
|
||||
selectedOverwrite := settings.overwrite
|
||||
if overwrite != nil {
|
||||
selectedOverwrite = *overwrite
|
||||
}
|
||||
directory := filepath.Join(prepared.captured.basePath, settings.directory)
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{Overwrite: selectedOverwrite, containmentRoot: prepared.captured.rootPath}, environment, access)
|
||||
if err != nil {
|
||||
return report, Source{}, err
|
||||
}
|
||||
return report, prepared, nil
|
||||
}
|
||||
225
internal/engine/secrets_from_config_test.go
Normal file
225
internal/engine/secrets_from_config_test.go
Normal file
@@ -0,0 +1,225 @@
|
||||
package engine
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
)
|
||||
|
||||
func TestSecretsFromConfigPreparesWithoutDirectory(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
for _, body := range []string{"value: retained\n", "config: {secrets_overwrite: true, imports: invalid}\nvalue: retained\n"} {
|
||||
main := writeImportFile(t, root, "main.yml", body)
|
||||
values := map[string]string{"EXISTING": "kept"}
|
||||
report, prepared, err := loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
if err != nil || report == nil || len(report.Entries()) != 0 || prepared.captured == nil || values["EXISTING"] != "kept" {
|
||||
t.Fatalf("report = %#v, source = %#v, error = %v", report, prepared, err)
|
||||
}
|
||||
}
|
||||
for _, source := range []Source{NoSource(), SearchConfig("app", Paths(filepath.Join(root, "missing.yml")))} {
|
||||
report, prepared, err := loadSecretsFromConfig(source, nil, mapSecretsEnvironment(nil), testSecretsAccess())
|
||||
if err != nil || report == nil || len(report.Entries()) != 0 || prepared.kind != sourceNone {
|
||||
t.Fatalf("absent: report = %#v, source = %#v, error = %v", report, prepared, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretsFromConfigSelectsOverwritePolicy(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
writeImportFile(t, root, "secrets/EXISTING", "replacement\n")
|
||||
writeImportFile(t, root, "secrets/NEW", "new\n")
|
||||
for _, test := range []struct {
|
||||
name, yaml, want string
|
||||
overwrite *bool
|
||||
}{
|
||||
{"default preserves", "", "old", nil},
|
||||
{"yaml enables", " secrets_overwrite: true\n", "replacement", nil},
|
||||
{"explicit false wins", " secrets_overwrite: true\n", "old", boolPointer(false)},
|
||||
{"explicit true wins", " secrets_overwrite: false\n", "replacement", boolPointer(true)},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
main := writeImportFile(t, root, "main.yml", "config:\n secrets_dir: secrets\n"+test.yaml+"value: fixed\n")
|
||||
values := map[string]string{"EXISTING": "old", "OTHER": "kept"}
|
||||
report, prepared, err := loadSecretsFromConfig(File(main), []SecretsFromConfigOptions{{Overwrite: test.overwrite}}, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
if err != nil || prepared.captured == nil || report == nil || len(report.Entries()) != 2 || values["EXISTING"] != test.want || values["NEW"] != "new" || values["OTHER"] != "kept" {
|
||||
t.Fatalf("report = %#v, source = %#v, values = %#v, error = %v", report, prepared, values, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretsFromConfigAcceptsPreparedMainAgain(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
main := writeImportFile(t, root, "main.yml", "config: {secrets_dir: secrets}\nvalue: captured\n")
|
||||
writeImportFile(t, root, "secrets/SECRET", "value")
|
||||
values := map[string]string{}
|
||||
_, prepared, err := loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: missing}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
delete(values, "SECRET")
|
||||
report, again, err := loadSecretsFromConfig(prepared, nil, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
if err != nil || again.captured == nil || len(report.Entries()) != 1 || values["SECRET"] != "value" {
|
||||
t.Fatalf("report = %#v, source = %#v, error = %v", report, again, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretsFromConfigReportsPreparationFailures(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
malformed := writeImportFile(t, root, "bad.yml", "config: {secrets_overwrite: wrong}\n")
|
||||
badRoot := writeImportFile(t, root, "bad-root.yml", "config: invalid\n")
|
||||
missing := filepath.Join(root, "missing.yml")
|
||||
native := NewFilesystem("native", fstest.MapFS{})
|
||||
for _, test := range []struct {
|
||||
name string
|
||||
main Source
|
||||
opts []SecretsFromConfigOptions
|
||||
code Code
|
||||
}{
|
||||
{"malformed even with override", File(malformed), []SecretsFromConfigOptions{{Overwrite: boolPointer(true)}}, CodeSecretsInvalidValue},
|
||||
{"malformed root", File(badRoot), nil, CodeImportInvalid},
|
||||
{"missing file", File(missing), nil, CodeSourceMissing},
|
||||
{"required search", SearchConfig("app", Paths(missing), SearchOptions{Required: true}), nil, CodeSourceMissing},
|
||||
{"unsupported source", Bytes("main", []byte("{}\n")), nil, CodeOptionsInvalid},
|
||||
{"invalid search options", SearchConfig("app", Paths(malformed), SearchOptions{}, SearchOptions{}), nil, CodeOptionsInvalid},
|
||||
{"native context", File(malformed), []SecretsFromConfigOptions{{Filesystem: &FilesystemContext{Root: ".", FS: &native}}}, CodeOptionsInvalid},
|
||||
{"multiple options", File(malformed), []SecretsFromConfigOptions{{}, {}}, CodeOptionsInvalid},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
report, prepared, err := loadSecretsFromConfig(test.main, test.opts, mapSecretsEnvironment(nil), testSecretsAccess())
|
||||
var failure *LoadError
|
||||
if report == nil || len(report.Entries()) != 0 || prepared.kind != sourceInvalid || !errors.As(err, &failure) || len(failure.Diagnostics()) == 0 || failure.Diagnostics()[0].Code != test.code {
|
||||
t.Fatalf("report = %#v, source = %#v, error = %#v", report, prepared, err)
|
||||
}
|
||||
if test.code == CodeOptionsInvalid && len(failure.Sources()) != 0 {
|
||||
t.Fatalf("option error acquired sources: %#v", failure.Sources())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretsFromConfigChecksDirectoryContainment(t *testing.T) {
|
||||
parent := t.TempDir()
|
||||
root := filepath.Join(parent, "root")
|
||||
writeImportFile(t, root, "inside/SECRET", "safe")
|
||||
writeImportFile(t, parent, "outside/SECRET", "outside")
|
||||
main := writeImportFile(t, root, "main.yml", "config: {secrets_dir: ../outside}\n")
|
||||
values := map[string]string{}
|
||||
report, prepared, err := loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsInvalidPath)
|
||||
if report == nil || len(report.Entries()) != 0 || prepared.kind != sourceInvalid || len(values) != 0 {
|
||||
t.Fatalf("outside: report = %#v, source = %#v, values = %#v", report, prepared, values)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: missing}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
report, prepared, err = loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsMissing)
|
||||
if report == nil || prepared.kind != sourceInvalid || len(values) != 0 {
|
||||
t.Fatalf("missing: report = %#v, source = %#v, values = %#v", report, prepared, values)
|
||||
}
|
||||
if runtime.GOOS == "windows" {
|
||||
return
|
||||
}
|
||||
if err := os.Symlink(filepath.Join(root, "inside"), filepath.Join(root, "linked")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.WriteFile(main, []byte("config: {secrets_dir: linked}\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
report, prepared, err = loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(values), testSecretsAccess())
|
||||
if err != nil || prepared.captured == nil || len(report.Entries()) != 1 || values["SECRET"] != "safe" {
|
||||
t.Fatalf("contained link: report = %#v, source = %#v, error = %v", report, prepared, err)
|
||||
}
|
||||
if err := os.Remove(filepath.Join(root, "linked")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := os.Symlink(filepath.Join(parent, "outside"), filepath.Join(root, "linked")); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
report, prepared, err = loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(map[string]string{}), testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsInvalidPath)
|
||||
if report == nil || len(report.Entries()) != 0 || prepared.kind != sourceInvalid {
|
||||
t.Fatalf("outside link: report = %#v, source = %#v", report, prepared)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretsFromConfigKeepsPartialReportSafe(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
main := writeImportFile(t, root, "main.yml", "config: {secrets_dir: secrets}\n")
|
||||
writeImportFile(t, root, "secrets/A", "FIRST-CANARY")
|
||||
writeImportFile(t, root, "secrets/B", "SECOND-CANARY")
|
||||
writeImportFile(t, root, "secrets/C", "THIRD-CANARY")
|
||||
values := map[string]string{}
|
||||
environment := mapSecretsEnvironment(values)
|
||||
environment.set = func(name, value string) error {
|
||||
if name == "B" {
|
||||
return errors.New("unsafe canary failure")
|
||||
}
|
||||
values[name] = value
|
||||
return nil
|
||||
}
|
||||
report, prepared, err := loadSecretsFromConfig(File(main), nil, environment, testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsApplyFailed)
|
||||
entries := report.Entries()
|
||||
if prepared.kind != sourceInvalid || len(entries) != 3 || entries[0].Status != SecretFileLoaded || entries[1].Status != SecretFileFailed || entries[2].Status != SecretFileNotApplied || values["A"] != "FIRST-CANARY" || strings.Contains(err.Error()+fmt.Sprintf("%#v", entries), "CANARY") {
|
||||
t.Fatalf("report = %#v, source = %#v, error = %v", report, prepared, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSecretsFromConfigClosesOpenedFiles(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
name, contents string
|
||||
fails bool
|
||||
}{
|
||||
{"success", "value", false},
|
||||
{"read failure", "bad\x00value", true},
|
||||
} {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
main := writeImportFile(t, root, "main.yml", "config: {secrets_dir: secrets}\n")
|
||||
writeImportFile(t, root, "secrets/SECRET", test.contents)
|
||||
var opened []*os.File
|
||||
open := func(name string) (*os.File, error) {
|
||||
file, err := os.Open(name)
|
||||
if err == nil {
|
||||
opened = append(opened, file)
|
||||
}
|
||||
return file, err
|
||||
}
|
||||
access := testSecretsAccess()
|
||||
access.openDirectory, access.openFile = open, open
|
||||
_, prepared, err := loadSecretsFromConfig(File(main), nil, mapSecretsEnvironment(map[string]string{}), access)
|
||||
if (err != nil) != test.fails || (prepared.kind == sourceInvalid) != test.fails || len(opened) != 2 {
|
||||
t.Fatalf("source = %#v, error = %v, opened = %d", prepared, err, len(opened))
|
||||
}
|
||||
for _, file := range opened {
|
||||
if _, err := file.Stat(); !errors.Is(err, os.ErrClosed) {
|
||||
t.Fatalf("file %q remains open: %v", file.Name(), err)
|
||||
}
|
||||
}
|
||||
// On systems exposing process descriptors, also check the main file,
|
||||
// whose normal acquisition uses the shared regular-file reader.
|
||||
entries, err := os.ReadDir("/proc/self/fd")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
canonical := canonicalTestPath(t, main)
|
||||
canonicalRoot := canonicalTestPath(t, root)
|
||||
for _, entry := range entries {
|
||||
target, err := os.Readlink(filepath.Join("/proc/self/fd", entry.Name()))
|
||||
if err == nil && (target == canonical || target == canonicalRoot) {
|
||||
t.Fatalf("main or root remains open through descriptor %s", entry.Name())
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -84,12 +84,12 @@ func TestLoadSecretsDirIgnoresDotEntries(t *testing.T) {
|
||||
return os.Lstat(path)
|
||||
}
|
||||
environment := map[string]string{}
|
||||
report, err := loadSecretsDir(directory, mapSecretsEnvironment(environment), access)
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, mapSecretsEnvironment(environment), access)
|
||||
if err != nil || len(report.Entries()) != 0 || len(environment) != 0 {
|
||||
t.Fatalf("hidden-only directory: error = %v, report = %#v, environment = %#v", err, report.Entries(), environment)
|
||||
}
|
||||
writeSecretTestFile(t, directory, "SECRET", "value\n")
|
||||
report, err = loadSecretsDir(directory, mapSecretsEnvironment(environment), access)
|
||||
report, err = loadSecretsDir(directory, SecretsDirOptions{}, mapSecretsEnvironment(environment), access)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -111,7 +111,7 @@ func TestLoadSecretsDirPreservesExistingWithoutReading(t *testing.T) {
|
||||
return nil, errors.New("must not open")
|
||||
}
|
||||
|
||||
report, err := loadSecretsDir(directory, mapSecretsEnvironment(environment), access)
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, mapSecretsEnvironment(environment), access)
|
||||
if err != nil {
|
||||
t.Fatalf("loadSecretsDir() error = %v", err)
|
||||
}
|
||||
@@ -157,7 +157,7 @@ func TestLoadSecretsDirValidatesAllMetadataBeforeReadingOrWriting(t *testing.T)
|
||||
access := testSecretsAccess()
|
||||
opened := 0
|
||||
access.openFile = func(path string) (*os.File, error) { opened++; return os.Open(path) }
|
||||
report, err := loadSecretsDir(directory, secretsEnvironment{
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, secretsEnvironment{
|
||||
lookup: func(string) (string, bool) { return "", false },
|
||||
set: func(string, string) error { writes++; return nil },
|
||||
}, access)
|
||||
@@ -186,7 +186,7 @@ func TestLoadSecretsDirPreflightFailuresDoNotWrite(t *testing.T) {
|
||||
writeSecretTestFile(t, directory, "A_FIRST", "first")
|
||||
writeSecretTestFile(t, directory, "Z_FAILED", test.body)
|
||||
writes := 0
|
||||
report, err := loadSecretsDir(directory, secretsEnvironment{
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, secretsEnvironment{
|
||||
lookup: func(string) (string, bool) { return "", false },
|
||||
set: func(string, string) error { writes++; return nil },
|
||||
}, testSecretsAccess())
|
||||
@@ -218,7 +218,7 @@ func TestLoadSecretsDirClassifiesReadFailuresWithoutLeakingThem(t *testing.T) {
|
||||
access := testSecretsAccess()
|
||||
access.openFile = func(string) (*os.File, error) { return nil, test.err }
|
||||
writes := 0
|
||||
report, err := loadSecretsDir(directory, secretsEnvironment{
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, secretsEnvironment{
|
||||
lookup: func(string) (string, bool) { return "", false },
|
||||
set: func(string, string) error { writes++; return nil },
|
||||
}, access)
|
||||
@@ -239,7 +239,7 @@ func TestLoadSecretsDirEnforcesEnumerationAndTotalBounds(t *testing.T) {
|
||||
for index := 0; index <= secretsEntryLimit; index++ {
|
||||
writeSecretTestFile(t, directory, fmt.Sprintf("SECRET_%04d", index), "")
|
||||
}
|
||||
report, err := loadSecretsDir(directory, mapSecretsEnvironment(map[string]string{}), testSecretsAccess())
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, mapSecretsEnvironment(map[string]string{}), testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsLimitExceeded)
|
||||
if len(report.Entries()) != secretsEntryLimit+1 {
|
||||
t.Fatalf("entries = %d, want %d bounded enumerated entries", len(report.Entries()), secretsEntryLimit+1)
|
||||
@@ -252,7 +252,7 @@ func TestLoadSecretsDirEnforcesEnumerationAndTotalBounds(t *testing.T) {
|
||||
writeSecretTestFile(t, directory, fmt.Sprintf("SECRET_%02d", index), strings.Repeat("x", int(secretFileByteLimit)))
|
||||
}
|
||||
writes := 0
|
||||
report, err := loadSecretsDir(directory, secretsEnvironment{
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, secretsEnvironment{
|
||||
lookup: func(string) (string, bool) { return "", false },
|
||||
set: func(string, string) error { writes++; return nil },
|
||||
}, testSecretsAccess())
|
||||
@@ -288,7 +288,7 @@ func TestLoadSecretsDirApplyReportsPartialFailureAndPresenceRace(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
report, err := loadSecretsDir(directory, environment, testSecretsAccess())
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, environment, testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsApplyFailed)
|
||||
entries := report.Entries()
|
||||
wantStatuses := []SecretFileStatus{SecretFileLoaded, SecretFileSkippedExisting, SecretFileFailed, SecretFileNotApplied}
|
||||
@@ -305,10 +305,79 @@ func TestLoadSecretsDirApplyReportsPartialFailureAndPresenceRace(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadSecretsDirOverwrite(t *testing.T) {
|
||||
directory := t.TempDir()
|
||||
writeSecretTestFile(t, directory, "CK_OVERWRITE_NONEMPTY", "replacement\n")
|
||||
writeSecretTestFile(t, directory, "CK_OVERWRITE_EMPTY", "filled")
|
||||
writeSecretTestFile(t, directory, "CK_OVERWRITE_WITH_EMPTY", "")
|
||||
t.Setenv("CK_OVERWRITE_NONEMPTY", "old")
|
||||
t.Setenv("CK_OVERWRITE_EMPTY", "")
|
||||
t.Setenv("CK_OVERWRITE_WITH_EMPTY", "old")
|
||||
t.Setenv("CK_OVERWRITE_UNRELATED", "untouched")
|
||||
|
||||
report, err := LoadSecretsDirWithOptions(directory, SecretsDirOptions{Overwrite: true})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for name, want := range map[string]string{
|
||||
"CK_OVERWRITE_NONEMPTY": "replacement", "CK_OVERWRITE_EMPTY": "filled",
|
||||
"CK_OVERWRITE_WITH_EMPTY": "", "CK_OVERWRITE_UNRELATED": "untouched",
|
||||
} {
|
||||
if got, ok := os.LookupEnv(name); !ok || got != want {
|
||||
t.Errorf("%s = %q, present %v; want %q", name, got, ok, want)
|
||||
}
|
||||
}
|
||||
for _, entry := range report.Entries() {
|
||||
if entry.Status != SecretFileLoaded || entry.ExistingEmpty {
|
||||
t.Errorf("unexpected result: %#v", entry)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadSecretsDirOverwritePresenceRaceAndPartialFailure(t *testing.T) {
|
||||
directory := t.TempDir()
|
||||
for _, name := range []string{"A_LOADED", "B_RACED", "C_FAILED", "D_WAITING"} {
|
||||
writeSecretTestFile(t, directory, name, "value-"+name)
|
||||
}
|
||||
values := map[string]string{"A_LOADED": "old"}
|
||||
lookups := map[string]int{}
|
||||
environment := secretsEnvironment{
|
||||
lookup: func(name string) (string, bool) {
|
||||
lookups[name]++
|
||||
if name == "B_RACED" && lookups[name] == 2 {
|
||||
values[name] = "raced"
|
||||
}
|
||||
value, present := values[name]
|
||||
return value, present
|
||||
},
|
||||
set: func(name, value string) error {
|
||||
if name == "C_FAILED" {
|
||||
return errors.New("set failure")
|
||||
}
|
||||
values[name] = value
|
||||
return nil
|
||||
},
|
||||
}
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{Overwrite: true}, environment, testSecretsAccess())
|
||||
requireSecretsCode(t, err, CodeSecretsApplyFailed)
|
||||
want := []SecretFileStatus{SecretFileLoaded, SecretFileLoaded, SecretFileFailed, SecretFileNotApplied}
|
||||
for i, entry := range report.Entries() {
|
||||
if entry.Status != want[i] || entry.ExistingEmpty {
|
||||
t.Errorf("entry %d = %#v, want status %s", i, entry, want[i])
|
||||
}
|
||||
}
|
||||
if values["A_LOADED"] != "value-A_LOADED" || values["B_RACED"] != "value-B_RACED" {
|
||||
t.Fatalf("unexpected applied values: %#v", values)
|
||||
}
|
||||
if _, present := values["D_WAITING"]; present {
|
||||
t.Fatal("entry after apply failure was written")
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadSecretsDirFailuresAreSafeAndDetached(t *testing.T) {
|
||||
directory := t.TempDir()
|
||||
writeSecretTestFile(t, directory, "SECRET", "CREDENTIAL-CANARY\x00")
|
||||
report, err := loadSecretsDir(directory, mapSecretsEnvironment(map[string]string{}), testSecretsAccess())
|
||||
report, err := loadSecretsDir(directory, SecretsDirOptions{}, mapSecretsEnvironment(map[string]string{}), testSecretsAccess())
|
||||
secretsErr := requireSecretsCode(t, err, CodeSecretsInvalidValue)
|
||||
diagnostics := secretsErr.Diagnostics()
|
||||
diagnostics[0].Message = "mutated"
|
||||
|
||||
@@ -29,11 +29,12 @@ func validOverlayName(name string) bool {
|
||||
}
|
||||
|
||||
type selectedOverlayRequest struct {
|
||||
name string
|
||||
protectionRule *VersionRule
|
||||
sequencePolicy sequencePolicy
|
||||
limits importLimits
|
||||
versionState *sourceVersionState
|
||||
name string
|
||||
lookupDirectory string
|
||||
protectionRule *VersionRule
|
||||
sequencePolicy sequencePolicy
|
||||
limits importLimits
|
||||
versionState *sourceVersionState
|
||||
}
|
||||
|
||||
func resolveOrdinaryOverlayFilesystem(source Source, context *FilesystemContext, main parsedSource, existing *resolvedFilesystemContext) (resolvedFilesystemContext, *Diagnostic) {
|
||||
@@ -70,13 +71,26 @@ func loadSelectedOverlay(request selectedOverlayRequest, access *filesystemAcces
|
||||
_ = access.close()
|
||||
}
|
||||
}()
|
||||
overlayPath := access.join(access.rootPath, "overlays/"+request.name+".yml")
|
||||
canonical, err := access.canonical(overlayPath)
|
||||
lookupDirectory := request.lookupDirectory
|
||||
if lookupDirectory == "" {
|
||||
lookupDirectory = access.rootPath
|
||||
}
|
||||
overlayPath := access.join(lookupDirectory, "overlays/"+request.name+".yml")
|
||||
links, _ := access.native.(fs.ReadLinkFS)
|
||||
var canonical string
|
||||
var err error
|
||||
if links != nil {
|
||||
canonical, err = resolveNativeImportPath(access, links, overlayPath)
|
||||
} else {
|
||||
canonical, err = access.canonical(overlayPath)
|
||||
}
|
||||
if err != nil {
|
||||
code := CodeOverlayInvalid
|
||||
message := "selected overlay could not be resolved"
|
||||
if errors.Is(err, fs.ErrNotExist) {
|
||||
code, message = CodeOverlayMissing, "selected overlay does not exist"
|
||||
} else if errors.Is(err, errImportPathOutsideRoot) {
|
||||
code, message = CodeOverlayOutsideRoot, "selected overlay resolves outside the configuration root"
|
||||
} else if errors.Is(err, fs.ErrPermission) {
|
||||
code, message = CodeImportPermission, "selected overlay cannot be accessed"
|
||||
}
|
||||
@@ -85,12 +99,8 @@ func loadSelectedOverlay(request selectedOverlayRequest, access *filesystemAcces
|
||||
if !access.contains(canonical) {
|
||||
return cloneSourceInfos(sources), []Diagnostic{importDiagnostic(CodeOverlayOutsideRoot, "selected overlay resolves outside the configuration root", nil)}
|
||||
}
|
||||
for _, existing := range sources {
|
||||
if existing.Path != "" && existing.Path == canonical &&
|
||||
((access.native == nil && existing.Kind == SourceKindFile) ||
|
||||
(access.native != nil && existing.Kind == SourceKindFilesystem && existing.namespace == access.token)) {
|
||||
return cloneSourceInfos(sources), []Diagnostic{importDiagnostic(CodeOverlayRepeated, "selected overlay is already present in the base source graph", nil)}
|
||||
}
|
||||
if overlayRepeatsSource(access, links, canonical, sources) {
|
||||
return cloneSourceInfos(sources), []Diagnostic{importDiagnostic(CodeOverlayRepeated, "selected overlay is already present in the base source graph", nil)}
|
||||
}
|
||||
if len(sources)+1 > limits.sources {
|
||||
return cloneSourceInfos(sources), []Diagnostic{importDiagnostic(CodeOverlayLimitExceeded, "selected overlay exceeds the source-count limit", nil)}
|
||||
@@ -169,6 +179,37 @@ func loadSelectedOverlay(request selectedOverlayRequest, access *filesystemAcces
|
||||
return sources, nil
|
||||
}
|
||||
|
||||
func overlayRepeatsSource(access *filesystemAccess, links fs.ReadLinkFS, canonical string, sources []SourceInfo) bool {
|
||||
// Other inputs can have a wider root. Compare their identities in the
|
||||
// shared native namespace while keeping overlay lookup rooted separately.
|
||||
namespaceAccess := *access
|
||||
namespaceAccess.rootPath = "."
|
||||
for _, source := range sources {
|
||||
if source.Path == "" {
|
||||
continue
|
||||
}
|
||||
if access.native == nil {
|
||||
if source.Kind == SourceKindFile && source.Path == canonical {
|
||||
return true
|
||||
}
|
||||
continue
|
||||
}
|
||||
if source.Kind != SourceKindFilesystem || source.namespace != access.token {
|
||||
continue
|
||||
}
|
||||
if source.Path == canonical {
|
||||
return true
|
||||
}
|
||||
if links != nil {
|
||||
target, err := resolveNativeImportPath(&namespaceAccess, links, source.Path)
|
||||
if err == nil && target == canonical {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func readOverlayFile(access *filesystemAccess, name, sourceID string, remaining int64) ([]byte, *Diagnostic) {
|
||||
limit := min(int64(maxSourceBytes), remaining)
|
||||
if limit < 0 {
|
||||
|
||||
@@ -81,14 +81,14 @@ func TestExtractRootDirectivesAllowsSequencesButRejectsOverlayImports(t *testing
|
||||
_, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, `config:
|
||||
imports: [{path: fragments/base.yaml}]
|
||||
sequences: [{destination: [prompts], key: id}]
|
||||
`), rootDirectiveContextOverlay)
|
||||
`), rootDirectiveContextOverlay, sourceVersionContribution)
|
||||
if len(diagnostics) != 1 || diagnostics[0].Code != CodeOverlayDirective || diagnostics[0].Path.String() != "/config/imports" {
|
||||
t.Fatalf("overlay diagnostics = %#v, want imports-only rejection", diagnostics)
|
||||
}
|
||||
|
||||
extracted, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, `config:
|
||||
sequences: [{destination: [prompts], key: id}]
|
||||
`), rootDirectiveContextOverlay)
|
||||
`), rootDirectiveContextOverlay, sourceVersionContribution)
|
||||
if len(diagnostics) != 0 || len(extracted.sequences) != 1 {
|
||||
t.Fatalf("overlay sequence extraction = %#v, %#v", extracted, diagnostics)
|
||||
}
|
||||
@@ -114,7 +114,7 @@ func TestParseSequenceDeclarationRejectsMalformedForms(t *testing.T) {
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
_, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, test.body), rootDirectiveContextSource)
|
||||
_, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, test.body), rootDirectiveContextSource, sourceVersionContribution)
|
||||
if len(diagnostics) == 0 || diagnostics[0].Code != CodeSequenceInvalid || diagnostics[0].Path.String() != test.path {
|
||||
t.Fatalf("diagnostics = %#v, want %s at %s", diagnostics, CodeSequenceInvalid, test.path)
|
||||
}
|
||||
@@ -155,7 +155,7 @@ version: v1
|
||||
|
||||
func extractSequenceDeclarationsYAML(t *testing.T, input string, context rootDirectiveContext) rootDirectiveExtraction {
|
||||
t.Helper()
|
||||
extracted, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, input), context)
|
||||
extracted, diagnostics := extractRootDirectives(parseRootDirectiveDocument(t, input), context, sourceVersionContribution)
|
||||
if len(diagnostics) != 0 {
|
||||
t.Fatalf("root directive diagnostics = %#v", diagnostics)
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ type Source struct {
|
||||
searchApp string
|
||||
searchRequired bool
|
||||
searchIssues []string
|
||||
captured *capturedHostSource
|
||||
}
|
||||
|
||||
type sourceKind uint8
|
||||
@@ -227,6 +228,15 @@ func readSource(source Source, sourceID string, limits sourceLimits) (sourceRead
|
||||
var input io.Reader
|
||||
switch source.kind {
|
||||
case sourceFile:
|
||||
if source.captured != nil {
|
||||
info.Path = source.captured.mainPath
|
||||
if source.captured.bytes > limit {
|
||||
return sourceRead{info: info}, []Diagnostic{sourceDiagnostic(CodeSourceLimitExceeded, sourceID, "source exceeds the configured byte limit")}
|
||||
}
|
||||
owned := document.Clone(source.captured.document)
|
||||
setDocumentSourceID(owned, sourceID)
|
||||
return sourceRead{document: owned, bytes: source.captured.bytes, info: info}, nil
|
||||
}
|
||||
absolute, err := filepath.Abs(source.path)
|
||||
if err != nil {
|
||||
return sourceRead{info: info}, []Diagnostic{sourceDiagnostic(CodeSourceRead, sourceID, "source path could not be resolved")}
|
||||
|
||||
@@ -220,7 +220,7 @@ func processSourceVersionWithDirectiveContext(root *document.Node, rule *Version
|
||||
return sourceVersionProcessingResult{}
|
||||
}
|
||||
|
||||
extracted, diagnostics := extractRootDirectives(root, directiveContext)
|
||||
extracted, diagnostics := extractRootDirectives(root, directiveContext, role)
|
||||
if len(diagnostics) != 0 {
|
||||
return sourceVersionProcessingResult{diagnostics: diagnostics}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"go.yaml.in/yaml/v4"
|
||||
"go.yaml.in/yaml/v4/plugin/limit"
|
||||
"go.yaml.in/yaml/v4/plugin/loaderlimits"
|
||||
|
||||
"go.maximumdirect.net/configkit/internal/document"
|
||||
)
|
||||
@@ -60,7 +60,7 @@ func Parse(input io.Reader, sourceID string, limits Limits) (*document.Node, []I
|
||||
parserDepth = limits.Depth + 2
|
||||
}
|
||||
depthExceeded := false
|
||||
plugin := limit.New(limit.DepthFunc(func(depth int, _ *limit.DepthContext) error {
|
||||
plugin := loaderlimits.New(loaderlimits.DepthFunc(func(depth int, _ *loaderlimits.DepthContext) error {
|
||||
if depth > parserDepth {
|
||||
depthExceeded = true
|
||||
return errParserDepth
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"testing"
|
||||
|
||||
"go.yaml.in/yaml/v4"
|
||||
"go.yaml.in/yaml/v4/plugin/limit"
|
||||
"go.yaml.in/yaml/v4/plugin/loaderlimits"
|
||||
|
||||
"go.maximumdirect.net/configkit/internal/document"
|
||||
)
|
||||
@@ -167,7 +167,7 @@ func TestParserDepthCalibrationForBlockAndFlow(t *testing.T) {
|
||||
func observedParserDepth(t *testing.T, input string) int {
|
||||
t.Helper()
|
||||
maximum := 0
|
||||
depthPlugin := limit.New(limit.DepthFunc(func(depth int, _ *limit.DepthContext) error {
|
||||
depthPlugin := loaderlimits.New(loaderlimits.DepthFunc(func(depth int, _ *loaderlimits.DepthContext) error {
|
||||
maximum = max(maximum, depth)
|
||||
return nil
|
||||
}))
|
||||
|
||||
26
layered.go
26
layered.go
@@ -19,15 +19,29 @@ type Input struct {
|
||||
PlacementMode PlacementMode
|
||||
Imports bool
|
||||
Filesystem *FilesystemContext
|
||||
// MainRelative binds a non-file underlay to the main input's context when
|
||||
// Filesystem is nil. It does not enable imports.
|
||||
MainRelative *MainRelativeContext
|
||||
}
|
||||
|
||||
// MainRelativeContext selects the main input's resolved context for an underlay.
|
||||
// Fallback is used when the main has no usable context; RequireBase requires one.
|
||||
type MainRelativeContext struct {
|
||||
Fallback *FilesystemContext
|
||||
RequireBase bool
|
||||
}
|
||||
|
||||
// MainRelative returns a fresh default main-relative binding description.
|
||||
func MainRelative() *MainRelativeContext { return &MainRelativeContext{} }
|
||||
|
||||
// Underlay contains inputs that must compose strictly within one tier. Tiers
|
||||
// appear in lowest-to-highest precedence order; an empty tier is a no-op.
|
||||
type Underlay struct{ Inputs []Input }
|
||||
|
||||
// LayeredOptions selects lower-priority tiers and final application rules.
|
||||
// An active Overlay requires an explicit OverlayFilesystem; an inactive overlay
|
||||
// ignores it. Overrides remain explicit CLI records, not general mappings.
|
||||
// An active Overlay uses OverlayFilesystem, then the main input's resolved
|
||||
// context, then OverlayFallback. An inactive overlay ignores both contexts.
|
||||
// Overrides remain explicit CLI records, not general mappings.
|
||||
// SourceVersionMode applies one declaration policy to main, underlay, import,
|
||||
// and selected overlay documents. Enabled modes interpret the version path
|
||||
// source-locally, consume accepted non-main declarations, and protect main's
|
||||
@@ -42,7 +56,9 @@ type LayeredOptions[T any] struct {
|
||||
Underlays []Underlay
|
||||
Overlay string
|
||||
OverlayFilesystem *FilesystemContext
|
||||
Overrides []Override
|
||||
// OverlayFallback supplies a context if the main has no usable context.
|
||||
OverlayFallback *FilesystemContext
|
||||
Overrides []Override
|
||||
}
|
||||
|
||||
// LoadLayered acquires the main input first and strictly composes enabled
|
||||
@@ -68,6 +84,9 @@ func toEngineInput(input Input) engine.Input {
|
||||
Filesystem: toEngineFilesystemContext(input.Filesystem), Destination: toEnginePath(input.Destination),
|
||||
PlacementMode: engine.PlacementMode(input.PlacementMode),
|
||||
}
|
||||
if input.MainRelative != nil {
|
||||
result.MainRelative = &engine.MainRelativeContext{Fallback: toEngineFilesystemContext(input.MainRelative.Fallback), RequireBase: input.MainRelative.RequireBase}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
@@ -77,6 +96,7 @@ func toEngineLayeredOptions[T any](options LayeredOptions[T]) engine.LayeredOpti
|
||||
SourceVersionMode: engine.SourceVersionModeFromFacade(uint8(options.SourceVersionMode)),
|
||||
Overlay: options.Overlay,
|
||||
OverlayFilesystem: toEngineFilesystemContext(options.OverlayFilesystem),
|
||||
OverlayFallback: toEngineFilesystemContext(options.OverlayFallback),
|
||||
ImportDefaults: toEngineImportDefaults(options.ImportDefaults),
|
||||
}
|
||||
if options.Underlays != nil {
|
||||
|
||||
72
secrets.go
72
secrets.go
@@ -7,8 +7,8 @@ import (
|
||||
"go.maximumdirect.net/configkit/internal/engine"
|
||||
)
|
||||
|
||||
// SecretFileStatus describes the outcome for one file considered by
|
||||
// LoadSecretsIntoEnvironment.
|
||||
// SecretFileStatus describes the outcome for one file considered by an
|
||||
// explicit secrets bootstrap helper.
|
||||
type SecretFileStatus string
|
||||
|
||||
const (
|
||||
@@ -92,13 +92,75 @@ func (e *SecretsError) Diagnostics() []Diagnostic {
|
||||
// roll back values already applied.
|
||||
func LoadSecretsIntoEnvironment(directory string) (*SecretsReport, error) {
|
||||
report, err := engine.LoadSecretsDir(directory)
|
||||
return &SecretsReport{value: report}, fromEngineSecretsError(err)
|
||||
}
|
||||
|
||||
// SecretsOptions selects the policy for an explicit directory bootstrap.
|
||||
type SecretsOptions struct {
|
||||
// Overwrite replaces existing environment variables, including empty values.
|
||||
Overwrite bool
|
||||
}
|
||||
|
||||
// LoadSecretsIntoEnvironmentWithOptions loads immediate regular files into the
|
||||
// environment using the selected policy. With Overwrite false it preserves
|
||||
// existing variables, including empty values. Dot-prefixed entries are ignored.
|
||||
// It returns a report even on error; applied values are not rolled back.
|
||||
// Errors are reported as *SecretsError.
|
||||
func LoadSecretsIntoEnvironmentWithOptions(directory string, options SecretsOptions) (*SecretsReport, error) {
|
||||
report, err := engine.LoadSecretsDirWithOptions(directory, engine.SecretsDirOptions{Overwrite: options.Overwrite})
|
||||
return &SecretsReport{value: report}, fromEngineSecretsError(err)
|
||||
}
|
||||
|
||||
// SecretsFromConfigOptions configures preparation of a host main source.
|
||||
type SecretsFromConfigOptions struct {
|
||||
// Filesystem selects the main file's host containment root when supplied.
|
||||
Filesystem *FilesystemContext
|
||||
// Overwrite, when non-nil, overrides the main document's Boolean setting.
|
||||
// A nil value uses that setting, or false when it is absent.
|
||||
Overwrite *bool
|
||||
}
|
||||
|
||||
// LoadSecretsIntoEnvironmentFromConfig explicitly prepares a host File or
|
||||
// SearchConfig main and loads its declared secrets directory before loading.
|
||||
// Passing a previously prepared source reuses its captured main document and
|
||||
// explicitly repeats bootstrap. Loading that source with Load or LoadLayered
|
||||
// does not repeat bootstrap.
|
||||
// NoSource and an optional search with no match return NoSource and an empty
|
||||
// report. The returned source owns a reusable main-document snapshot and its
|
||||
// host context; imports and environment lookup remain part of each later load.
|
||||
// A later explicit host context must match the captured root and base.
|
||||
// At most one options value is accepted. A non-nil report accompanies every
|
||||
// result. Preparation failures return *LoadError; directory or environment
|
||||
// failures return *SecretsError. Any error returns a zero Source and does not
|
||||
// roll back prior environment writes.
|
||||
func LoadSecretsIntoEnvironmentFromConfig(main Source, supplied ...SecretsFromConfigOptions) (*SecretsReport, Source, error) {
|
||||
options := make([]engine.SecretsFromConfigOptions, len(supplied))
|
||||
for index, option := range supplied {
|
||||
options[index].Filesystem = toEngineFilesystemContext(option.Filesystem)
|
||||
if option.Overwrite != nil {
|
||||
value := *option.Overwrite
|
||||
options[index].Overwrite = &value
|
||||
}
|
||||
}
|
||||
report, prepared, err := engine.LoadSecretsDirFromConfig(main.toEngine(), options...)
|
||||
result := &SecretsReport{value: report}
|
||||
if err == nil {
|
||||
return result, nil
|
||||
return result, Source{value: prepared}, nil
|
||||
}
|
||||
var loadError *engine.LoadError
|
||||
if errors.As(err, &loadError) {
|
||||
return result, Source{}, &LoadError{value: loadError}
|
||||
}
|
||||
return result, Source{}, fromEngineSecretsError(err)
|
||||
}
|
||||
|
||||
func fromEngineSecretsError(err error) error {
|
||||
if err == nil {
|
||||
return nil
|
||||
}
|
||||
var secretsError *engine.SecretsError
|
||||
if errors.As(err, &secretsError) {
|
||||
return result, &SecretsError{value: secretsError}
|
||||
return &SecretsError{value: secretsError}
|
||||
}
|
||||
return result, &SecretsError{}
|
||||
return &SecretsError{}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,10 @@ import (
|
||||
// Source is an opaque configuration input. Construct sources with File,
|
||||
// Filesystem.File, SearchConfig, Bytes, Reader, Mapping, or NoSource; the zero
|
||||
// value is invalid. SearchConfig selects a host file when a load consumes it.
|
||||
// LoadSecretsIntoEnvironmentFromConfig returns a reusable source that retains
|
||||
// the selected main document and context: later loads neither rediscover nor
|
||||
// reread that main or repeat bootstrap. Reusing File or SearchConfig selects
|
||||
// and reads the main again. Imports and resources remain live on each load.
|
||||
type Source struct{ value engine.Source }
|
||||
|
||||
// Filesystem is a reusable opaque namespace for a caller-owned fs.FS. Copies
|
||||
|
||||
Reference in New Issue
Block a user