deps: github.com/hashicorp/terraform@sdk-v0.11-with-go-modules

Updated via: go get github.com/hashicorp/terraform@sdk-v0.11-with-go-modules and go mod tidy

1 files changed, 1 insertions, 63 deletions

diff --git a/vendor/github.com/hashicorp/go-getter/decompress_tbz2.go b/vendor/github.com/hashicorp/go-getter/decompress_tbz2.go
index c46ed44..5391b5c 100644
--- a/vendor/github.com/hashicorp/go-getter/decompress_tbz2.go
+++ b/vendor/github.com/hashicorp/go-getter/decompress_tbz2.go
@@ -1,10 +1,7 @@
 package getter
 
 import (
-        "archive/tar"
         "compress/bzip2"
-        "fmt"
-        "io"
         "os"
         "path/filepath"
 )
@@ -32,64 +29,5 @@ func (d *TarBzip2Decompressor) Decompress(dst, src string, dir bool) error {
 
         // Bzip2 compression is second
         bzipR := bzip2.NewReader(f)
-
-        // Once bzip decompressed we have a tar format
-        tarR := tar.NewReader(bzipR)
-        done := false
-        for {
-                hdr, err := tarR.Next()
-                if err == io.EOF {
-                        if !done {
-                                // Empty archive
-                                return fmt.Errorf("empty archive: %s", src)
-                        }
-
-                        return nil
-                }
-                if err != nil {
-                        return err
-                }
-
-                path := dst
-                if dir {
-                        path = filepath.Join(path, hdr.Name)
-                }
-
-                if hdr.FileInfo().IsDir() {
-                        if dir {
-                                return fmt.Errorf("expected a single file: %s", src)
-                        }
-
-                        // A directory, just make the directory and continue unarchiving...
-                        if err := os.MkdirAll(path, 0755); err != nil {
-                                return err
-                        }
-
-                        continue
-                }
-
-                // We have a file. If we already decoded, then it is an error
-                if !dir && done {
-                        return fmt.Errorf("expected a single file, got multiple: %s", src)
-                }
-
-                // Mark that we're done so future in single file mode errors
-                done = true
-
-                // Open the file for writing
-                dstF, err := os.Create(path)
-                if err != nil {
-                        return err
-                }
-                _, err = io.Copy(dstF, tarR)
-                dstF.Close()
-                if err != nil {
-                        return err
-                }
-
-                // Chmod the file
-                if err := os.Chmod(path, hdr.FileInfo().Mode()); err != nil {
-                        return err
-                }
-        }
+        return untar(bzipR, dst, src, dir)
 }