Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add the ability to store secret dev-only env vars in .env.secret.toml (#15557)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-07-31 12:41:09 -07:00 • committed by GitHub
parent 86f266d37f
commit 3f1c091b87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -29,3 +29,6 @@ DerivedData/
.vscode
.wrangler
.flatpak-builder
# Don't commit any secrets to the repo.
.env.secret.toml

16
crates/collab/src/bin/dotenv.rs
View file

@ -1,20 +1,8 @@
use anyhow::anyhow;
use std::fs;
use collab::env::get_dotenv_vars;
fn main() -> anyhow::Result<()> {
let env: toml::map::Map<String, toml::Value> = toml::de::from_str(
&fs::read_to_string("./.env.toml").map_err(|_| anyhow!("no .env.toml file found"))?,
)?;
for (key, value) in env {
let value = match value {
toml::Value::String(value) => value,
toml::Value::Integer(value) => value.to_string(),
toml::Value::Float(value) => value.to_string(),
_ => panic!("unsupported TOML value in .env.toml for key {}", key),
};
for (key, value) in get_dotenv_vars()? {
println!("export {}=\"{}\"", key, value);
}
Ok(())
}

32
crates/collab/src/env.rs
View file

@ -1,12 +1,29 @@
use anyhow::anyhow;
use anyhow::{anyhow, Result};
use std::fs;
pub fn load_dotenv() -> anyhow::Result<()> {
let env: toml::map::Map<String, toml::Value> = toml::de::from_str(
&fs::read_to_string("./crates/collab/.env.toml")
.map_err(|_| anyhow!("no .env.toml file found"))?,
)?;
pub fn get_dotenv_vars() -> Result<Vec<(String, String)>> {
let mut vars = Vec::new();
let env_content = fs::read_to_string("./crates/collab/.env.toml")
.map_err(|_| anyhow!("no .env.toml file found"))?;
add_vars(env_content, &mut vars)?;
if let Ok(secret_content) = fs::read_to_string("./crates/collab/.env.secret.toml") {
add_vars(secret_content, &mut vars)?;
}
Ok(vars)
}
pub fn load_dotenv() -> Result<()> {
for (key, value) in get_dotenv_vars()? {
std::env::set_var(key, value);
}
Ok(())
}
fn add_vars(env_content: String, vars: &mut Vec<(String, String)>) -> Result<()> {
let env: toml::map::Map<String, toml::Value> = toml::de::from_str(&env_content)?;
for (key, value) in env {
let value = match value {
toml::Value::String(value) => value,
@ -14,8 +31,7 @@ pub fn load_dotenv() -> anyhow::Result<()> {
toml::Value::Float(value) => value.to_string(),
_ => panic!("unsupported TOML value in .env.toml for key {}", key),
};
std::env::set_var(key, value);
vars.push((key, value));
}
Ok(())
}