Merge pull request #827 from kinvolk/invidian/terraform-simplification

pkg/terraform: remove OutputBytes

pkg/dns/dns.go

@@ -16,7 +16,6 @@ package dns
 
 import (
 	"bufio"
-	"encoding/json"
 	"fmt"
 	"net"
 	"os"
@@ -107,15 +106,10 @@ func (c *Config) ManualConfigPrompt() terraform.ExecutionHook {
 }
 
 func readDNSEntries(ex *terraform.Executor) ([]dnsEntry, error) {
-	output, err := ex.OutputBytes("dns_entries")
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to get DNS entries")
-	}
-
 	var entries []dnsEntry
 
-	if err := json.Unmarshal(output, &entries); err != nil {
-		return nil, errors.Wrap(err, "failed to parse DNS entries file")
+	if err := ex.Output("dns_entries", &entries); err != nil {
+		return nil, errors.Wrap(err, "failed to get DNS entries")
 	}
 
 	return entries, nil

pkg/terraform/executor.go

@@ -420,16 +420,6 @@ func (ex *Executor) Output(key string, s interface{}) error {
 	return json.Unmarshal(o, s)
 }
 
-// OutputBytes returns the value of the Terraform output key in JSON format as a byte slice.
-func (ex *Executor) OutputBytes(key string) ([]byte, error) {
-	o, err := ex.executeSync("output", "-json", key)
-	if err != nil {
-		return []byte{}, fmt.Errorf("getting Terraform output for key %q: %w", key, err)
-	}
-
-	return o, nil
-}
-
 // GenerateCommand prepares a Terraform command with the given arguments
 // by setting up the command, configuration, working directory
 // (so the files such as terraform.tfstate are stored at the right place) and