Properly handle $STELLAR_CONFIG_HOME and $STELLAR_DATA_HOME. (#2311)

Author: fnando

cmd/soroban-cli/src/config/data.rs

@@ -22,17 +22,16 @@ pub enum Error {
     Xdr(#[from] xdr::Error),
 }
 
-pub const XDG_DATA_HOME: &str = "XDG_DATA_HOME";
-
 pub fn project_dir() -> Result<directories::ProjectDirs, Error> {
-    std::env::var(XDG_DATA_HOME)
-        .map_or_else(
-            |_| ProjectDirs::from("org", "stellar", "stellar-cli"),
-            |data_home| {
-                ProjectDirs::from_path(std::path::PathBuf::from(data_home).join("stellar-cli"))
-            },
-        )
-        .ok_or(Error::FailedToFindProjectDirs)
+    let dir = if let Ok(data_home) = std::env::var("STELLAR_DATA_HOME") {
+        ProjectDirs::from_path(std::path::PathBuf::from(data_home))
+    } else if let Ok(data_home) = std::env::var("XDG_DATA_HOME") {
+        ProjectDirs::from_path(std::path::PathBuf::from(data_home).join("stellar-cli"))
+    } else {
+        ProjectDirs::from("org", "stellar", "stellar-cli")
+    };
+
+    dir.ok_or(Error::FailedToFindProjectDirs)
 }
 
 #[allow(clippy::module_name_repetitions)]
@@ -203,7 +202,7 @@ mod test {
     #[test]
     fn test_write_read() {
         let t = assert_fs::TempDir::new().unwrap();
-        std::env::set_var(XDG_DATA_HOME, t.path().to_str().unwrap());
+        std::env::set_var("XDG_DATA_HOME", t.path().to_str().unwrap());
         let rpc_uri = Url::from_str("http://localhost:8000").unwrap();
         let sim = SimulateTransactionResponse::default();
         let original_action: Action = sim.into();

cmd/soroban-cli/src/config/locator.rs

@@ -64,6 +64,8 @@ pub enum Error {
     ConfigSerialization,
     // #[error("Config file failed write")]
     // CannotWriteConfigFile,
+    #[error("STELLAR_CONFIG_HOME env variable is not a valid path. Got {0}")]
+    StellarConfigDir(String),
     #[error("XDG_CONFIG_HOME env variable is not a valid path. Got {0}")]
     XdgConfigHome(String),
     #[error(transparent)]
@@ -625,6 +627,10 @@ impl KeyType {
 }
 
 fn global_config_path() -> Result<PathBuf, Error> {
+    if let Ok(config_home) = std::env::var("STELLAR_CONFIG_HOME") {
+        return PathBuf::from_str(&config_home).map_err(|_| Error::StellarConfigDir(config_home));
+    }
+
     let config_dir = if let Ok(config_home) = std::env::var("XDG_CONFIG_HOME") {
         PathBuf::from_str(&config_home).map_err(|_| Error::XdgConfigHome(config_home))?
     } else {