Skip to content

fix: collect canister env vars in BTreeMap #4393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2025
Merged

fix: collect canister env vars in BTreeMap #4393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbd7893
fix: collect canister env vars in BTreeMap
ilbertt Sep 27, 2025
ac55dd9
test: url_encode
ilbertt Sep 29, 2025
0fff949
test: check that all assets are updated
ilbertt Sep 30, 2025
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Use `BTreeMap` instead of `HashMap` for headers to guarantee deterministic order
Sets the `ic_env` cookie for html files, which contains the root key and the canister environment variables that are prefixed with `PUBLIC_`.
Please note that this version of the frontend canister is only compatible with PocketIC **v10** and above.

- Module hash: 5871b95ccb8278f3b817dcec42eb040f7a48949dc7f9bb1ed70108a952960aac
- Module hash: dad567d271e21c9834d2e2dc7508a8428697a3b5e3c8162ccd99eae68cd0eecc
- https://github.com/dfinity/sdk/pull/4392
- https://github.com/dfinity/sdk/pull/4387
- https://github.com/dfinity/sdk/pull/4389
Expand Down
8 changes: 4 additions & 4 deletions src/canisters/frontend/ic-certified-assets/src/system_context/canister_env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::HashMap;
use std::collections::BTreeMap;

use ic_cdk::api::{env_var_count, env_var_name, env_var_value, root_key};

Expand All @@ -15,7 +15,7 @@ pub struct CanisterEnv {
/// for both the key and the value. Total size: 20 * 128 * 2 = 4096 bytes
///
/// Numbers from https://github.com/dfinity/ic/blob/34bd4301f941cdfa1596a0eecf9f58ad6407293c/rs/config/src/execution_environment.rs#L175-L183
pub icp_public_env_vars: HashMap<String, String>,
pub icp_public_env_vars: BTreeMap<String, String>,
}

impl CanisterEnv {
Expand Down Expand Up @@ -45,8 +45,8 @@ impl CanisterEnv {
}
}

fn load_icp_public_env_vars() -> HashMap<String, String> {
let mut public_env_vars = HashMap::new();
fn load_icp_public_env_vars() -> BTreeMap<String, String> {
let mut public_env_vars = BTreeMap::new();
let env_var_count = env_var_count();

for i in 0..env_var_count {
Expand Down
Loading