1
0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-11-24 21:57:41 +00:00

feat(k8s): Add folder detection to the k8s module. (#4157)

Have added configuration options to the k8s module to allow activating
the module only in directories that contains certain files or folders.
To ensure this is backwards compatible and because there are not really
any standard files or folders for Kubernetes I have set the defaults to
empty and will activate the module for all directories.
This commit is contained in:
Thomas O'Donnell 2022-07-10 11:14:54 +02:00 committed by GitHub
parent af15de93c4
commit 5c5969c50b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 195 additions and 9 deletions

View File

@ -767,6 +767,9 @@
"kubernetes": { "kubernetes": {
"default": { "default": {
"context_aliases": {}, "context_aliases": {},
"detect_extensions": [],
"detect_files": [],
"detect_folders": [],
"disabled": true, "disabled": true,
"format": "[$symbol$context( \\($namespace\\))]($style) in ", "format": "[$symbol$context( \\($namespace\\))]($style) in ",
"style": "cyan bold", "style": "cyan bold",
@ -3323,6 +3326,27 @@
"additionalProperties": { "additionalProperties": {
"type": "string" "type": "string"
} }
},
"detect_extensions": {
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"detect_files": {
"default": [],
"type": "array",
"items": {
"type": "string"
}
},
"detect_folders": {
"default": [],
"type": "array",
"items": {
"type": "string"
}
} }
} }
}, },

View File

@ -2084,17 +2084,24 @@ If the `$KUBECONFIG` env var is set the module will use that if not it will use
This module is disabled by default. This module is disabled by default.
To enable it, set `disabled` to `false` in your configuration file. To enable it, set `disabled` to `false` in your configuration file.
When the module is enabled it will always be active, unless any of
`detect_extensions`, `detect_files` or `detect_folders` have been st in which
case the module will only be active in directories that match those conditions.
::: :::
### Options ### Options
| Option | Default | Description | | Option | Default | Description |
| ----------------- | -------------------------------------------------- | --------------------------------------------------------------------- | | ------------------- | -------------------------------------------------- | --------------------------------------------------------------------- |
| `symbol` | `"☸ "` | A format string representing the symbol displayed before the Cluster. | | `symbol` | `"☸ "` | A format string representing the symbol displayed before the Cluster. |
| `format` | `'[$symbol$context( \($namespace\))]($style) in '` | The format for the module. | | `format` | `'[$symbol$context( \($namespace\))]($style) in '` | The format for the module. |
| `style` | `"cyan bold"` | The style for the module. | | `style` | `"cyan bold"` | The style for the module. |
| `context_aliases` | | Table of context aliases to display. | | `context_aliases` | | Table of context aliases to display. |
| `user_aliases` | | Table of user aliases to display. | | `user_aliases` | | Table of user aliases to display. |
| `detect_extensions` | `[]` | Which extensions should trigger this module. |
| `detect_files` | `[]` | Which filenames should trigger this module. |
| `detect_folders` | `[]` | Which folders should trigger this modules. |
| `disabled` | `true` | Disables the `kubernetes` module. | | `disabled` | `true` | Disables the `kubernetes` module. |
### Variables ### Variables
@ -2127,6 +2134,16 @@ disabled = false
"root/.*" = "root" "root/.*" = "root"
``` ```
Only show the module in directories that contain a `k8s` file.
```toml
# ~/.config/starship.toml
[kubernetes]
disabled = false
detect_files = ['k8s']
```
#### Regex Matching #### Regex Matching
Additional to simple aliasing, `context_aliases` and `user_aliases` also supports Additional to simple aliasing, `context_aliases` and `user_aliases` also supports

View File

@ -11,6 +11,9 @@ pub struct KubernetesConfig<'a> {
pub disabled: bool, pub disabled: bool,
pub context_aliases: HashMap<String, &'a str>, pub context_aliases: HashMap<String, &'a str>,
pub user_aliases: HashMap<String, &'a str>, pub user_aliases: HashMap<String, &'a str>,
pub detect_extensions: Vec<&'a str>,
pub detect_files: Vec<&'a str>,
pub detect_folders: Vec<&'a str>,
} }
impl<'a> Default for KubernetesConfig<'a> { impl<'a> Default for KubernetesConfig<'a> {
@ -22,6 +25,9 @@ impl<'a> Default for KubernetesConfig<'a> {
disabled: true, disabled: true,
context_aliases: HashMap::new(), context_aliases: HashMap::new(),
user_aliases: HashMap::new(), user_aliases: HashMap::new(),
detect_extensions: vec![],
detect_files: vec![],
detect_folders: vec![],
} }
} }
} }

View File

@ -119,6 +119,23 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
return None; return None;
}; };
// 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 compatability.
let have_scan_config = !(config.detect_files.is_empty()
&& config.detect_folders.is_empty()
&& config.detect_extensions.is_empty());
let is_kube_project = context
.try_begin_scan()?
.set_files(&config.detect_files)
.set_folders(&config.detect_folders)
.set_extensions(&config.detect_extensions)
.is_match();
if have_scan_config && !is_kube_project {
return None;
}
let default_config_file = context.get_home()?.join(".kube").join("config"); let default_config_file = context.get_home()?.join(".kube").join("config");
let kube_cfg = context let kube_cfg = context
@ -197,7 +214,7 @@ mod tests {
use crate::test::ModuleRenderer; use crate::test::ModuleRenderer;
use ansi_term::Color; use ansi_term::Color;
use std::env; use std::env;
use std::fs::File; use std::fs::{create_dir, File};
use std::io::{self, Write}; use std::io::{self, Write};
#[test] #[test]
@ -234,6 +251,128 @@ users: []
dir.close() dir.close()
} }
#[test]
fn test_none_when_no_detected_files_or_folders() -> io::Result<()> {
let dir = tempfile::tempdir()?;
let filename = dir.path().join("config");
let mut file = File::create(&filename)?;
file.write_all(
b"
apiVersion: v1
clusters: []
contexts:
- context:
cluster: test_cluster
user: test_user
name: test_context
current-context: test_context
kind: Config
preferences: {}
users: []
",
)?;
file.sync_all()?;
let actual = ModuleRenderer::new("kubernetes")
.path(dir.path())
.env("KUBECONFIG", filename.to_string_lossy().as_ref())
.config(toml::toml! {
[kubernetes]
disabled = false
detect_files = ["k8s.ext"]
detect_extensions = ["k8s"]
detect_folders = ["k8s_folder"]
})
.collect();
assert_eq!(None, actual);
dir.close()
}
#[test]
fn test_with_detected_files_and_folder() -> io::Result<()> {
let dir = tempfile::tempdir()?;
let filename = dir.path().join("config");
let mut file = File::create(&filename)?;
file.write_all(
b"
apiVersion: v1
clusters: []
contexts:
- context:
cluster: test_cluster
user: test_user
name: test_context
current-context: test_context
kind: Config
preferences: {}
users: []
",
)?;
file.sync_all()?;
let dir_with_file = tempfile::tempdir()?;
File::create(dir_with_file.path().join("k8s.ext"))?.sync_all()?;
let actual_file = ModuleRenderer::new("kubernetes")
.path(dir_with_file.path())
.env("KUBECONFIG", filename.to_string_lossy().as_ref())
.config(toml::toml! {
[kubernetes]
disabled = false
detect_files = ["k8s.ext"]
detect_extensions = ["k8s"]
detect_folders = ["k8s_folder"]
})
.collect();
let dir_with_ext = tempfile::tempdir()?;
File::create(dir_with_ext.path().join("test.k8s"))?.sync_all()?;
let actual_ext = ModuleRenderer::new("kubernetes")
.path(dir_with_ext.path())
.env("KUBECONFIG", filename.to_string_lossy().as_ref())
.config(toml::toml! {
[kubernetes]
disabled = false
detect_files = ["k8s.ext"]
detect_extensions = ["k8s"]
detect_folders = ["k8s_folder"]
})
.collect();
let dir_with_dir = tempfile::tempdir()?;
create_dir(dir_with_dir.path().join("k8s_folder"))?;
let actual_dir = ModuleRenderer::new("kubernetes")
.path(dir_with_dir.path())
.env("KUBECONFIG", filename.to_string_lossy().as_ref())
.config(toml::toml! {
[kubernetes]
disabled = false
detect_files = ["k8s.ext"]
detect_extensions = ["k8s"]
detect_folders = ["k8s_folder"]
})
.collect();
let expected = Some(format!(
"{} in ",
Color::Cyan.bold().paint("☸ test_context")
));
assert_eq!(expected, actual_file);
assert_eq!(expected, actual_ext);
assert_eq!(expected, actual_dir);
dir.close()
}
fn base_test_ctx_alias(ctx_name: &str, config: toml::Value, expected: &str) -> io::Result<()> { fn base_test_ctx_alias(ctx_name: &str, config: toml::Value, expected: &str) -> io::Result<()> {
let dir = tempfile::tempdir()?; let dir = tempfile::tempdir()?;