remove exit error types

hashicorp · Jan 10, 2023 · 512b45a · 512b45a
1 parent e83dcd9
commit 512b45a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 439 deletions.
diff --git a/tfexec/cmd_default.go b/tfexec/cmd_default.go
@@ -44,7 +44,7 @@ func (tf *Terraform) runTerraformCmd(ctx context.Context, cmd *exec.Cmd) error {
 		err = ctx.Err()
 	}
 	if err != nil {
-		return tf.wrapExitError(ctx, err, "")
+		return err
 	}
 
 	var errStdout, errStderr error
@@ -70,15 +70,15 @@ func (tf *Terraform) runTerraformCmd(ctx context.Context, cmd *exec.Cmd) error {
 		err = ctx.Err()
 	}
 	if err != nil {
-		return tf.wrapExitError(ctx, err, errBuf.String())
+		return err
 	}
 
 	// Return error if there was an issue reading the std out/err
 	if errStdout != nil && ctx.Err() != nil {
-		return tf.wrapExitError(ctx, errStdout, errBuf.String())
+		return errStdout
 	}
 	if errStderr != nil && ctx.Err() != nil {
-		return tf.wrapExitError(ctx, errStderr, errBuf.String())
+		return errStderr
 	}
 
 	return nil

diff --git a/tfexec/cmd_linux.go b/tfexec/cmd_linux.go
@@ -49,7 +49,7 @@ func (tf *Terraform) runTerraformCmd(ctx context.Context, cmd *exec.Cmd) error {
 		err = ctx.Err()
 	}
 	if err != nil {
-		return tf.wrapExitError(ctx, err, "")
+		return err
 	}
 
 	var errStdout, errStderr error
@@ -75,15 +75,15 @@ func (tf *Terraform) runTerraformCmd(ctx context.Context, cmd *exec.Cmd) error {
 		err = ctx.Err()
 	}
 	if err != nil {
-		return tf.wrapExitError(ctx, err, errBuf.String())
+		return err
 	}
 
 	// Return error if there was an issue reading the std out/err
 	if errStdout != nil && ctx.Err() != nil {
-		return tf.wrapExitError(ctx, errStdout, errBuf.String())
+		return errStdout
 	}
 	if errStderr != nil && ctx.Err() != nil {
-		return tf.wrapExitError(ctx, errStderr, errBuf.String())
+		return errStderr
 	}
 
 	return nil