From d242d40db61ca225be834b0747adf3f91a81bd03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20Vladovi=C4=87?= <d.vladimyr@gmail.com>
Date: Fri, 30 Apr 2021 08:13:51 +0200
Subject: feat(gcloud): honor `CLOUDSDK_CORE_PROJECT` env variable (#2596)

Co-authored-by: Filip Bachul <filip.b@masterborn.com>
---
 src/modules/gcloud.rs | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/modules/gcloud.rs b/src/modules/gcloud.rs
index 444cc7ebc..cb16a562f 100644
--- a/src/modules/gcloud.rs
+++ b/src/modules/gcloud.rs
@@ -128,7 +128,10 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
                             .unwrap_or(region)
                     })
                     .map(Ok),
-                "project" => gcloud_context.get_project().map(Ok),
+                "project" => context
+                    .get_env("CLOUDSDK_CORE_PROJECT")
+                    .or_else(|| gcloud_context.get_project())
+                    .map(Ok),
                 "active" => Some(Ok(gcloud_context.config_name.to_owned())),
                 _ => None,
             })
@@ -302,6 +305,40 @@ project = abc
         dir.close()
     }
 
+    #[test]
+    fn project_set_in_env() -> io::Result<()> {
+        let dir = tempfile::tempdir()?;
+        let active_config_path = dir.path().join("active_config");
+        let mut active_config_file = File::create(&active_config_path)?;
+        active_config_file.write_all(b"default")?;
+
+        create_dir(dir.path().join("configurations"))?;
+        let config_default_path = dir.path().join("configurations").join("config_default");
+        let mut config_default_file = File::create(&config_default_path)?;
+        config_default_file.write_all(
+            b"\
+[core]
+project = abc
+",
+        )?;
+
+        let actual = ModuleRenderer::new("gcloud")
+            .env("CLOUDSDK_CORE_PROJECT", "env_project")
+            .env("CLOUDSDK_CONFIG", dir.path().to_string_lossy())
+            .config(toml::toml! {
+                [gcloud]
+                format = "on [$symbol$project]($style) "
+            })
+            .collect();
+        let expected = Some(format!(
+            "on {} ",
+            Color::Blue.bold().paint("☁️  env_project")
+        ));
+
+        assert_eq!(actual, expected);
+        dir.close()
+    }
+
     #[test]
     fn region_not_set_with_display_region() -> io::Result<()> {
         let dir = tempfile::tempdir()?;
-- 
cgit v1.2.3