0ab87c26c17171ae6162ff379a0c704fa57dff2e
- Author
- Vlad Korolev <vlad@v-lad.org>
- Committer
- GitHub <noreply@github.com>
- Date
Message
fix(terraform): use faster method to get workspace (#9709)
Also add tf_prompt_info to the list of prompt functions so theme writers are aware of it
Diff
1diff --git a/lib/prompt_info_functions.zsh b/lib/prompt_info_functions.zsh
2index 5069c4b21751257d07cbdbf574ad5e37bd9ca1c0..48f033da6427f424a0077a2eed948b7da95d99ed 100644
3--- a/lib/prompt_info_functions.zsh
4+++ b/lib/prompt_info_functions.zsh
5@@ -18,6 +18,7 @@ function chruby_prompt_info \
6 vi_mode_prompt_info \
7 virtualenv_prompt_info \
8 jenv_prompt_info \
9+ tf_prompt_info \
10 {
11 return 1
12 }
13diff --git a/plugins/terraform/terraform.plugin.zsh b/plugins/terraform/terraform.plugin.zsh
14index 2c42d394d163cb13103f44110b0f76d750e2b078..997241c9aec6d40ec8f49b5e2e927908c67af56b 100644
15--- a/plugins/terraform/terraform.plugin.zsh
16+++ b/plugins/terraform/terraform.plugin.zsh
17@@ -2,8 +2,8 @@ function tf_prompt_info() {
18 # dont show 'default' workspace in home dir
19 [[ "$PWD" == ~ ]] && return
20 # check if in terraform dir
21- if [ -d .terraform ]; then
22- workspace=$(terraform workspace show 2> /dev/null) || return
23+ if [[ -d .terraform && -r .terraform/environment ]]; then
24+ workspace=$(cat .terraform/environment) || return
25 echo "[${workspace}]"
26 fi
27 }