Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d636b22
feat: add ${env.VAR} syntax for environment variable expansion in con…
gocamille Jan 7, 2026
e6fcaf0
feat: refine new environment variable expansion module
gocamille Jan 7, 2026
9804f0e
feat: Add a changeset for environment variable expansion feature
gocamille Jan 7, 2026
d5e158b
fix formatting errors
gocamille Jan 7, 2026
5ba738b
fix(env): use :- semantics with empty vars using default
gocamille Jan 8, 2026
a09f08c
refactor(env_expansion): replace custom parser with shellexpand for R…
gocamille Jan 9, 2026
1b6a173
refactor(env_expansion): make Error enum private to the parent module
gocamille Jan 9, 2026
a243a0b
Replace rest of workflows with nix-less versions
andrewmcgivery Jan 6, 2026
42efa67
Replace ci job with nix-less setup
andrewmcgivery Jan 6, 2026
eda11fb
Don't need "new" in the name
andrewmcgivery Jan 6, 2026
c6970f2
Use checkout v6, remove head ref from checkout
andrewmcgivery Jan 7, 2026
4688862
Upgrade to actions/checkout@v6
andrewmcgivery Jan 7, 2026
92072c8
Addressing code review feedback
andrewmcgivery Jan 8, 2026
8d8b379
When running apps, make the execute tool executable from the app but …
andrewmcgivery Jan 8, 2026
e365799
Code review feedback
andrewmcgivery Jan 8, 2026
ab6a926
Add support for optional labels for apps for "tool invoking" and "too…
andrewmcgivery Jan 8, 2026
23a6118
refactor(env_expansion): make inner function private to parent module
gocamille Jan 9, 2026
0340a3f
refactor(env_expansion): remove duplicate changeset
gocamille Jan 9, 2026
0c634af
refactor(env_expansion): make EnvExpansionError enum private to paren…
gocamille Jan 9, 2026
7620648
fix: Rename changeset for environment variable expansion feature
gocamille Jan 9, 2026
e9e20d0
fix: Resolve conflicts with changset after rebase to main
gocamille Jan 9, 2026
329b696
Merge branch 'main' into camille/env-var-expansion
gocamille Jan 9, 2026
73d7c7a
fix clippy errors
gocamille Jan 9, 2026
814cc0b
feat(var_expansion): update the changeset for environment var expansi…
gocamille Jan 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .changeset/feat_env_var_expansion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
### feat: add support for custom environment variable expansion - @gocamille PR #539

#### Summary

This PR adds support for `${env.VAR_NAME}` syntax in configuration files, allowing users to reference custom environment variables without being limited to the `APOLLO_MCP_*` naming convention.

Closes #454.

#### Changes

- `runtime/env_expansion.rs` (new module) - parser for variable expansion
- `runtime.rs` (modified) - integrates expansion into the `read_config()` function
- `config-file.mdx` - updated docs with syntax, escaping, and special characters handling

- **Note** The `APOLLO_MCP_*` environment variable(s) will still take precedence over expanded custom config values (no breaking change).
13 changes: 10 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions crates/apollo-mcp-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ rmcp = { version = "0.9", features = [
schemars = { version = "1.0.1", features = ["url2"] }
serde.workspace = true
serde_json.workspace = true
serde_yaml = "0.9.34"
shellexpand = { version = "3.1", default-features = false, features = ["base-0"] }
thiserror.workspace = true
tokio.workspace = true
tokio-util = "0.7.15"
Expand Down
Loading
Loading