summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorThomas O'Donnell <andytom@users.noreply.github.com>2019-10-05 11:31:23 +0200
committerMatan Kushner <hello@matchai.me>2019-10-05 18:31:23 +0900
commit5a8777ff45e0883befd63066f169f39d5fb4b791 (patch)
tree4f736579cdc19eabe18943ca007930e5bd6800d1 /src/modules
parent1bf60b3dd513a71eed6025ab1db483327e50cced (diff)
fix: Disable Kubernetes module by default (#488)
Given the global nature of the Kubernetes module, the module has been disabled by default. The opportunity has also been taken to refactor the Kubernetes module to use the new config module.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/kubernetes.rs23
1 files changed, 13 insertions, 10 deletions
diff --git a/src/modules/kubernetes.rs b/src/modules/kubernetes.rs
index 5142c7dd6..40de44a98 100644
--- a/src/modules/kubernetes.rs
+++ b/src/modules/kubernetes.rs
@@ -1,4 +1,3 @@
-use ansi_term::Color;
use dirs;
use yaml_rust::YamlLoader;
@@ -6,9 +5,12 @@ use std::env;
use std::path;
use super::{Context, Module};
+
+use crate::config::RootModuleConfig;
+use crate::configs::kubernetes::KubernetesConfig;
use crate::utils;
-const KUBE_CHAR: &str = "☸ ";
+const KUBERNETES_PREFIX: &str = "on ";
fn get_kube_context(contents: &str) -> Option<(String, String)> {
let yaml_docs = YamlLoader::load_from_str(&contents).ok()?;
@@ -50,17 +52,18 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let (kube_ctx, kube_ns) = kube_cfg;
let mut module = context.new_module("kubernetes");
+ let config: KubernetesConfig = KubernetesConfig::try_load(module.config);
- let module_style = module
- .config_value_style("style")
- .unwrap_or_else(|| Color::Cyan.bold());
- module.set_style(module_style);
- module.get_prefix().set_value("on ");
+ module.set_style(config.style);
+ module.get_prefix().set_value(KUBERNETES_PREFIX);
- module.new_segment("symbol", KUBE_CHAR);
- module.new_segment("context", &kube_ctx);
+ module.create_segment("symbol", &config.symbol);
+ module.create_segment("context", &config.context.with_value(&kube_ctx));
if kube_ns != "" {
- module.new_segment("namespace", &format!(" ({})", kube_ns));
+ module.create_segment(
+ "namespace",
+ &config.namespace.with_value(&format!(" ({})", kube_ns)),
+ );
}
Some(module)
}