Update webdav client library (#97)

README.md

@@ -351,19 +351,6 @@ You can populate below template according to your requirements and use it as you
 
 # LOCK_TIMEOUT="60m"
 
-########### HEADER FORMAT USED BY THE TAR ARCHIVE
-
-# By default, tar archive creation will pick a header format that is appropriate
-# for the archive's contents. In case you have special requirements or need to
-# work with tools that do not support all standard header formats, you can use
-# this option to enforce a certain header format. Valid options are "USTAR",
-# "PAX" and "GNU". Be aware that setting this value might create situations where
-# it's not possible to encode the information about a certain file, making the
-# backup fail.
-# In case no value is set, an appropriate format will be selected for each file.
-
-# TAR_ARCHIVE_HEADER_FORMAT="USTAR"
-
 ########### EMAIL NOTIFICATIONS
 
 # ************************************************************************

cmd/backup/archive.go

@@ -18,7 +18,7 @@ import (
 	"strings"
 )
 
-func createArchive(inputFilePath, outputFilePath string, options createArchiveOptions) error {
+func createArchive(inputFilePath, outputFilePath string) error {
 	inputFilePath = stripTrailingSlashes(inputFilePath)
 	inputFilePath, outputFilePath, err := makeAbsolute(inputFilePath, outputFilePath)
 	if err != nil {
@@ -28,7 +28,7 @@ func createArchive(inputFilePath, outputFilePath string, options createArchiveOp
 		return fmt.Errorf("createArchive: error creating output file path: %w", err)
 	}
 
-	if err := compress(inputFilePath, outputFilePath, filepath.Dir(inputFilePath), options); err != nil {
+	if err := compress(inputFilePath, outputFilePath, filepath.Dir(inputFilePath)); err != nil {
 		return fmt.Errorf("createArchive: error creating archive: %w", err)
 	}
 
@@ -52,7 +52,7 @@ func makeAbsolute(inputFilePath, outputFilePath string) (string, string, error)
 	return inputFilePath, outputFilePath, err
 }
 
-func compress(inPath, outFilePath, subPath string, options createArchiveOptions) error {
+func compress(inPath, outFilePath, subPath string) error {
 	file, err := os.Create(outFilePath)
 	if err != nil {
 		return fmt.Errorf("compress: error creating out file: %w", err)
@@ -71,7 +71,7 @@ func compress(inPath, outFilePath, subPath string, options createArchiveOptions)
 	}
 
 	for _, p := range paths {
-		if err := writeTarGz(p, tarWriter, prefix, options.format); err != nil {
+		if err := writeTarGz(p, tarWriter, prefix); err != nil {
 			return fmt.Errorf("compress error writing %s to archive: %w", p, err)
 		}
 	}
@@ -94,7 +94,7 @@ func compress(inPath, outFilePath, subPath string, options createArchiveOptions)
 	return nil
 }
 
-func writeTarGz(path string, tarWriter *tar.Writer, prefix string, format tar.Format) error {
+func writeTarGz(path string, tarWriter *tar.Writer, prefix string) error {
 	fileInfo, err := os.Lstat(path)
 	if err != nil {
 		return fmt.Errorf("writeTarGz: error getting file infor for %s: %w", path, err)
@@ -113,10 +113,6 @@ func writeTarGz(path string, tarWriter *tar.Writer, prefix string, format tar.Fo
 	}
 
 	header, err := tar.FileInfoHeader(fileInfo, link)
-	if format >= 0 {
-		header.Format = format
-	}
-
 	if err != nil {
 		return fmt.Errorf("writeTarGz: error getting file info header: %w", err)
 	}
@@ -144,7 +140,3 @@ func writeTarGz(path string, tarWriter *tar.Writer, prefix string, format tar.Fo
 
 	return nil
 }
-
-type createArchiveOptions struct {
-	format tar.Format
-}

cmd/backup/config.go

@@ -3,11 +3,7 @@
 
 package main
 
-import (
-	"archive/tar"
-	"fmt"
-	"time"
-)
+import "time"
 
 // Config holds all configuration values that are expected to be set
 // by users.
@@ -46,30 +42,4 @@ type Config struct {
 	ExecLabel                  string        `split_words:"true"`
 	ExecForwardOutput          bool          `split_words:"true"`
 	LockTimeout                time.Duration `split_words:"true" default:"60m"`
-	TarArchiveHeaderFormat     TarFormat     `split_words:"true"`
-}
-
-type TarFormat tar.Format
-
-func (t *TarFormat) Decode(value string) error {
-	switch value {
-	case "PAX":
-		*t = TarFormat(tar.FormatPAX)
-		return nil
-	case "USTAR":
-		*t = TarFormat(tar.FormatUSTAR)
-		return nil
-	case "GNU":
-		*t = TarFormat(tar.FormatGNU)
-		return nil
-	case "":
-		*t = TarFormat(-1)
-		return nil
-	default:
-		return fmt.Errorf("tarFormat: unknown format %s", value)
-	}
-}
-
-func (t *TarFormat) Format() tar.Format {
-	return tar.Format(*t)
 }

cmd/backup/script.go

@@ -388,9 +388,7 @@ func (s *script) takeBackup() error {
 		s.logger.Infof("Removed tar file `%s`.", tarFile)
 		return nil
 	})
-	if err := createArchive(backupSources, tarFile, createArchiveOptions{
-		format: s.c.TarArchiveHeaderFormat.Format(),
-	}); err != nil {
+	if err := createArchive(backupSources, tarFile); err != nil {
 		return fmt.Errorf("takeBackup: error compressing backup folder: %w", err)
 	}
 

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/minio/minio-go/v7 v7.0.16
 	github.com/otiai10/copy v1.7.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/studio-b12/gowebdav v0.0.0-20211109083228-3f8721cd4b6f
+	github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )

go.sum

@@ -660,6 +660,8 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/studio-b12/gowebdav v0.0.0-20211109083228-3f8721cd4b6f h1:L2NE7BXnSlSLoNYZ0lCwZDjdnYjCNYC71k9ClZUTFTs=
 github.com/studio-b12/gowebdav v0.0.0-20211109083228-3f8721cd4b6f/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE=
+github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62 h1:b2nJXyPCa9HY7giGM+kYcnQ71m14JnGdQabMPmyt++8=
+github.com/studio-b12/gowebdav v0.0.0-20220128162035-c7b1ff8a5e62/go.mod h1:bHA7t77X/QFExdeAnDzK6vKM34kEZAcE1OX4MfiwjkE=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=