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

fix(terraform): use faster method to get workspace (#9709)
0ab87c26 · Vlad Korolev · GitHub · 6fbad5bf · 0ab87c26 · 0ab87c26
Unverified Commit 0ab87c26 authored Mar 08, 2021 by Vlad Korolev Committed by GitHub Mar 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

prompt_info_functions.zsh lib/prompt_info_functions.zsh +1 -0

terraform.plugin.zsh plugins/terraform/terraform.plugin.zsh +2 -2

No files found.
--- a/lib/prompt_info_functions.zsh
+++ b/lib/prompt_info_functions.zsh
@@ -18,6 +18,7 @@ function chruby_prompt_info \
  vi_mode_prompt_info \
  virtualenv_prompt_info \
  jenv_prompt_info \
+  tf_prompt_info \
 {
  return 1
 }

--- a/plugins/terraform/terraform.plugin.zsh
+++ b/plugins/terraform/terraform.plugin.zsh
@@ -2,8 +2,8 @@ function tf_prompt_info() {
    # dont show 'default' workspace in home dir
    [[ "$PWD" == ~ ]] && return
    # check if in terraform dir
-    if [ -d .terraform ]; then
+    if [[ -d .terraform && -r .terraform/environment  ]]; then
-      workspace=$(terraform workspace show 2> /dev/null) || return
+      workspace=$(cat .terraform/environment) || return
      echo "[${workspace}]"
    fi
 }