From 39e7b78cb26cb580505a95cba99f653584d06404 Mon Sep 17 00:00:00 2001 From: Thomas O'Donnell Date: Mon, 25 Oct 2021 07:54:39 +0200 Subject: [PATCH] feat: also read from DOCKER_MACHINE_NAME (#3175) This adds support to also read the context from `DOCKER_MACHINE_NAME` since it is a bit more user friendly. --- docs/config/README.md | 7 ++++--- src/modules/docker_context.rs | 38 +++++++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/docs/config/README.md b/docs/config/README.md index c68060b7..579467e9 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -836,9 +836,10 @@ truncation_symbol = "…/" ## Docker Context The `docker_context` module shows the currently active -[Docker context](https://docs.docker.com/engine/context/working-with-contexts/) if it's not set to -`default` or if the `DOCKER_HOST` or `DOCKER_CONTEXT` environment variables are set (as they are meant -to override the context in use). +[Docker context](https://docs.docker.com/engine/context/working-with-contexts/) +if it's not set to `default` or if the `DOCKER_MACHINE_NAME`, `DOCKER_HOST` or +`DOCKER_CONTEXT` environment variables are set (as they are meant to override +the context in use). ### Options diff --git a/src/modules/docker_context.rs b/src/modules/docker_context.rs index f0d39e1e..5beb5c64 100644 --- a/src/modules/docker_context.rs +++ b/src/modules/docker_context.rs @@ -41,8 +41,9 @@ pub fn module<'a>(context: &'a Context) -> Option> { ) .join("config.json"); - let docker_context_env = std::array::IntoIter::new(["DOCKER_HOST", "DOCKER_CONTEXT"]) - .find_map(|env| context.get_env(env)); + let docker_context_env = + std::array::IntoIter::new(["DOCKER_MACHINE_NAME", "DOCKER_HOST", "DOCKER_CONTEXT"]) + .find_map(|env| context.get_env(env)); let ctx = match docker_context_env { Some(data) => data, @@ -365,6 +366,39 @@ mod tests { assert_eq!(expected, actual); + cfg_dir.close() + } + #[test] + fn test_docker_machine_name_overrides_other_env_vars_and_conf() -> io::Result<()> { + let cfg_dir = tempfile::tempdir()?; + + let cfg_file = cfg_dir.path().join("config.json"); + + let config_content = serde_json::json!({ + "currentContext": "starship" + }); + + let mut docker_config = File::create(&cfg_file)?; + docker_config.write_all(config_content.to_string().as_bytes())?; + docker_config.sync_all()?; + + let actual = ModuleRenderer::new("docker_context") + .env("DOCKER_MACHINE_NAME", "machine_name") + .env("DOCKER_HOST", "udp://starship@127.0.0.1:53") + .env("DOCKER_CONTEXT", "starship") + .env("DOCKER_CONFIG", cfg_dir.path().to_string_lossy()) + .config(toml::toml! { + [docker_context] + only_with_files = false + }) + .collect(); + let expected = Some(format!( + "via {} ", + Color::Blue.bold().paint("🐳 machine_name") + )); + + assert_eq!(expected, actual); + cfg_dir.close() } }