From 230e85be37a0fc12999d1e6ff1209e7d5f99ecd1 Mon Sep 17 00:00:00 2001 From: Thomas Kintscher Date: Thu, 7 Apr 2022 07:54:50 +0200 Subject: [PATCH] fix(docker_context): ignore the "default" context (#3803) (#3804) Co-authored-by: Thomas Kintscher --- src/modules/docker_context.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/modules/docker_context.rs b/src/modules/docker_context.rs index bc18d834..1237565f 100644 --- a/src/modules/docker_context.rs +++ b/src/modules/docker_context.rs @@ -57,6 +57,10 @@ pub fn module<'a>(context: &'a Context) -> Option> { } }; + if ctx == "default" { + return None; + } + let parsed = StringFormatter::new(config.format).and_then(|formatter| { formatter .map_meta(|variable, _| match variable { @@ -307,6 +311,24 @@ mod tests { cfg_dir.close() } + #[test] + fn test_docker_context_default() -> io::Result<()> { + let cfg_dir = tempfile::tempdir()?; + + let actual = ModuleRenderer::new("docker_context") + .env("DOCKER_CONTEXT", "default") + .config(toml::toml! { + [docker_context] + only_with_files = false + }) + .collect(); + let expected = None; + + assert_eq!(expected, actual); + + cfg_dir.close() + } + #[test] fn test_docker_context_overrides_config() -> io::Result<()> { let cfg_dir = tempfile::tempdir()?;