Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(k8s): don't trigger if scan config is set but env vars are not #5979

Merged
merged 1 commit into from
Jun 9, 2024
Merged

fix(k8s): don't trigger if scan config is set but env vars are not #5979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/modules/kubernetes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None;
};

let have_env_vars = context.detect_env_vars(&config.detect_env_vars);
let have_env_config = !config.detect_env_vars.is_empty();
let have_env_vars = have_env_config.then(|| context.detect_env_vars(&config.detect_env_vars));

// If we have some config for doing the directory scan then we use it but if we don't then we
// assume we should treat it like the module is enabled to preserve backward compatibility.
Expand All @@ -129,7 +130,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
})
});

if !is_kube_project.unwrap_or(true) && !have_env_vars {
if !is_kube_project.or(have_env_vars).unwrap_or(true) {
return None;
}

Expand Down Expand Up @@ -445,6 +446,16 @@ users: []
})
.collect();

let actual_none = ModuleRenderer::new("kubernetes")
.path(empty_dir.path())
.env("KUBECONFIG", filename.to_string_lossy().as_ref())
.config(toml::toml! {
[kubernetes]
disabled = false
detect_files = ["k8s.ext"]
})
.collect();

let expected = Some(format!(
"{} in ",
Color::Cyan.bold().paint("☸ test_context")
Expand All @@ -454,6 +465,7 @@ users: []
assert_eq!(expected, actual_ext);
assert_eq!(expected, actual_dir);
assert_eq!(expected, actual_env_var);
assert_eq!(None, actual_none);

dir.close()
}
Expand Down
Loading