Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
103 changes: 103 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,109 @@ jobs:
- name: Check feature compilation
run: cargo check --workspace --all-targets --features "fastly cloudflare"

cloudflare-wasm-tests:
name: cloudflare wasm tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Cache Cargo dependencies
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-

- name: Retrieve Rust version
id: rust-version-cloudflare
run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
shell: bash

- name: Set up Rust tool chain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: ${{ steps.rust-version-cloudflare.outputs.rust-version }}

- name: Add wasm32 target
run: rustup target add wasm32-unknown-unknown

- name: Resolve wasm-bindgen CLI version
id: wasm-bindgen-version
shell: bash
run: |
version="$(
awk '
$1 == "name" && $3 == "\"wasm-bindgen\"" { in_pkg=1; next }
in_pkg && $1 == "version" {
gsub(/"/, "", $3)
print $3
exit
}
' Cargo.lock
)"
test -n "$version"
echo "version=$version" >> "$GITHUB_OUTPUT"

- name: Install wasm-bindgen test runner
run: cargo install wasm-bindgen-cli --version "${{ steps.wasm-bindgen-version.outputs.version }}" --locked --force

- name: Fetch dependencies (locked)
run: cargo fetch --locked

- name: Run Cloudflare wasm tests
env:
CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER: wasm-bindgen-test-runner
run: cargo test -p edgezero-adapter-cloudflare --features cloudflare --target wasm32-unknown-unknown --test contract

fastly-wasm-tests:
name: fastly wasm tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Cache Cargo dependencies
uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: |
${{ runner.os }}-cargo-

- name: Retrieve Rust version
id: rust-version-fastly
run: echo "rust-version=$(grep '^rust ' .tool-versions | awk '{print $2}')" >> $GITHUB_OUTPUT
shell: bash

- name: Set up Rust tool chain
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: ${{ steps.rust-version-fastly.outputs.rust-version }}

- name: Add wasm targets
run: rustup target add wasm32-wasip1 wasm32-unknown-unknown

- name: Setup Viceroy
run: cargo install viceroy --locked

- name: Fetch dependencies (locked)
run: cargo fetch --locked

- name: Run Fastly wasm tests
env:
CARGO_TARGET_WASM32_WASIP1_RUNNER: "viceroy run"
run: cargo test -p edgezero-adapter-fastly --features fastly --target wasm32-wasip1 --test contract

- name: Check Fastly wasm target
run: cargo check -p edgezero-adapter-fastly --features fastly --target wasm32-wasip1

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ target/
.wrangler/
.edgezero/

# Node
node_modules/

# env
.env

Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

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

154 changes: 154 additions & 0 deletions crates/edgezero-adapter-axum/src/config_store.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
//! Axum adapter config store: env vars with in-memory defaults fallback.

use std::collections::HashMap;

use edgezero_core::config_store::{ConfigStore, ConfigStoreError};

/// Config store for local dev / Axum. Reads from env vars with manifest
/// defaults as fallback. Env vars take precedence over defaults.
///
/// # Note on `from_env`
///
/// [`AxumConfigStore::from_env`] only reads environment variables for keys
/// declared in `[stores.config.defaults]`. Use an empty-string default when a
/// key should be overrideable from env without carrying a real default value.
pub struct AxumConfigStore {
env: HashMap<String, String>,
defaults: HashMap<String, String>,
}

impl AxumConfigStore {
/// Create from env vars and optional manifest defaults.
pub fn new(
env: impl IntoIterator<Item = (String, String)>,
defaults: impl IntoIterator<Item = (String, String)>,
) -> Self {
Self {
env: env.into_iter().collect(),
defaults: defaults.into_iter().collect(),
}
}

/// Create from the current process environment and manifest defaults.
pub fn from_env(defaults: impl IntoIterator<Item = (String, String)>) -> Self {
Self::from_lookup(defaults, |key| std::env::var(key).ok())
}

fn from_lookup<F>(defaults: impl IntoIterator<Item = (String, String)>, mut lookup: F) -> Self
where
F: FnMut(&str) -> Option<String>,
{
let defaults: HashMap<String, String> = defaults.into_iter().collect();
let env = defaults
.keys()
.filter_map(|key| lookup(key).map(|value| (key.clone(), value)))
.collect();
Self { env, defaults }
}
}

impl ConfigStore for AxumConfigStore {
fn get(&self, key: &str) -> Result<Option<String>, ConfigStoreError> {
Ok(self
.env
.get(key)
.or_else(|| self.defaults.get(key))
.cloned())
}
}

#[cfg(test)]
mod tests {
use super::*;

fn store(env: &[(&str, &str)], defaults: &[(&str, &str)]) -> AxumConfigStore {
AxumConfigStore::new(
env.iter().map(|(k, v)| (k.to_string(), v.to_string())),
defaults.iter().map(|(k, v)| (k.to_string(), v.to_string())),
)
}

#[test]
fn axum_config_store_returns_values() {
let s = store(&[("MY_KEY", "my_val")], &[]);
assert_eq!(
s.get("MY_KEY").expect("config value"),
Some("my_val".to_string())
);
}

#[test]
fn axum_config_store_returns_none_for_missing() {
let s = store(&[], &[]);
assert_eq!(s.get("NOPE").expect("missing config"), None);
}

#[test]
fn axum_config_store_env_overrides_defaults() {
let s = store(&[("KEY", "from_env")], &[("KEY", "from_default")]);
assert_eq!(
s.get("KEY").expect("config value"),
Some("from_env".to_string())
);
}

#[test]
fn axum_config_store_falls_back_to_defaults() {
let s = store(&[], &[("KEY", "default_val")]);
assert_eq!(
s.get("KEY").expect("default config"),
Some("default_val".to_string())
);
}

#[test]
fn axum_config_store_from_env_reads_only_declared_keys() {
let s = AxumConfigStore::from_lookup(
[
("feature.new_checkout".to_string(), "false".to_string()),
("service.timeout_ms".to_string(), "1500".to_string()),
],
|key| match key {
"feature.new_checkout" => Some("true".to_string()),
"DATABASE_URL" => Some("postgres://secret".to_string()),
_ => None,
},
);

assert_eq!(
s.get("feature.new_checkout").expect("allowed env override"),
Some("true".to_string())
);
assert_eq!(
s.get("service.timeout_ms").expect("default fallback"),
Some("1500".to_string())
);
assert_eq!(
s.get("DATABASE_URL")
.expect("undeclared key should stay hidden"),
None
);
}

// Run the shared contract tests against AxumConfigStore (env path).
edgezero_core::config_store_contract_tests!(axum_config_store_env_contract, {
AxumConfigStore::new(
[
("contract.key.a".to_string(), "value_a".to_string()),
("contract.key.b".to_string(), "value_b".to_string()),
],
[],
)
});

// Run the shared contract tests against AxumConfigStore (defaults path).
edgezero_core::config_store_contract_tests!(axum_config_store_defaults_contract, {
AxumConfigStore::new(
[],
[
("contract.key.a".to_string(), "value_a".to_string()),
("contract.key.b".to_string(), "value_b".to_string()),
],
)
});
}
Loading
Loading