tf show command without arguments or with plan works as original

Author: dex4er

run/list.go

@@ -17,6 +17,5 @@ func List(args []string) error {
 		}
 	}
 
-	patternIgnoreFooter := ""
-	return terraformWithoutColors("state", newArgs, patternIgnoreFooter)
+	return terraformWithoutColors("state", newArgs)
 }

run/show.go

@@ -12,40 +12,28 @@ func Show(args []string) error {
 	resources := []string{}
 	newArgs := []string{}
 
-	noOutputs := true
-
 	for _, arg := range args {
-		if arg == "-no-output" || arg == "-no-outputs" {
-			noOutputs = true
-		} else if arg == "-no-output=false" || arg == "-no-outputs=false" {
-			noOutputs = false
-		} else if strings.HasPrefix(arg, "-") {
+		if strings.HasPrefix(arg, "-") {
 			newArgs = append(newArgs, arg)
 		} else if _, err := os.Stat(arg); err == nil {
 			newArgs = append(newArgs, arg)
 		} else {
 			resources = append(resources, util.AddQuotes(arg))
 		}
-
 	}
 
-	patternIgnoreFooter := ""
-
 	if len(resources) > 0 {
 		newArgs = append([]string{"show"}, newArgs...)
 		for i, r := range resources {
 			if i > 0 {
 				fmt.Println()
 			}
-			if err := terraformWithoutColors("state", append(newArgs, r), patternIgnoreFooter); err != nil {
+			if err := terraformWithoutColors("state", append(newArgs, r)); err != nil {
 				return err
 			}
 		}
 		return nil
 	}
 
-	if noOutputs {
-		patternIgnoreFooter = `^Outputs:$`
-	}
-	return terraformWithoutColors("show", newArgs, patternIgnoreFooter)
+	return Terraform("show", newArgs)
 }

run/terraform_without_colors.go

@@ -5,15 +5,12 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"regexp"
 	"syscall"
 
 	"github.com/dex4er/tf/util"
 )
 
-func terraformWithoutColors(command string, args []string, patternIgnoreFooter string) error {
-	reIgnoreFooter := regexp.MustCompile(patternIgnoreFooter)
-
+func terraformWithoutColors(command string, args []string) error {
 	signal.Ignore(syscall.SIGINT)
 
 	cmd := execTerraformCommand(append([]string{command}, args...)...)
@@ -42,12 +39,6 @@ func terraformWithoutColors(command string, args []string, patternIgnoreFooter s
 		line := scanner.Text()
 		line = util.RemoveColors(line)
 
-		// ignore from this line to the end
-		if patternIgnoreFooter != "" && reIgnoreFooter.MatchString(line) {
-			ignoreFooter = true
-			continue
-		}
-
 		fmt.Println(line)
 	}