Replace xz library with newer one

der-eismann · der-eismann · commit 5ca90f737c89 · 2024-04-30T17:25:12.000+02:00
diff --git a/decompression.go b/decompression.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/xi2/xz"
+	"github.com/ulikunitz/xz"
 )
 
 func defaultTarReader(xzReader *xz.Reader) (func() (*tar.Header, error), func() io.Reader) {
@@ -42,7 +42,7 @@ func decompressTarXz(tarReader func(*xz.Reader) (func() (*tar.Header, error), fu
 		}
 	}()
 
-	xzReader, err := xz.NewReader(tarFile, 0)
+	xzReader, err := xz.NewReader(tarFile)
 	if err != nil {
 		return errorUnableToExtract(path, extractPath, err)
 	}
diff --git a/decompression_test.go b/decompression_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/xi2/xz"
+	"github.com/ulikunitz/xz"
 )
 
 func Test_decompressTarXz(t *testing.T) {
@@ -182,7 +182,7 @@ func Test_decompressTarXz_ErrorWhenArchiveCorrupted(t *testing.T) {
 
 	err = decompressTarXz(defaultTarReader, archive, tempDir)
 
-	assert.EqualError(t, err, "unable to extract postgres archive: xz: data is corrupt")
+	assert.EqualError(t, err, "unable to extract postgres archive: writeMatch: distance out of range")
 }
 
 func Test_decompressTarXz_ErrorWithInvalidDestination(t *testing.T) {
diff --git a/embedded_postgres_test.go b/embedded_postgres_test.go
@@ -100,7 +100,7 @@ func Test_ErrorWhenUnableToUnArchiveFile_WrongFormat(t *testing.T) {
 		}
 	}
 
-	assert.EqualError(t, err, fmt.Sprintf(`unable to extract postgres archive %s to %s, if running parallel tests, configure RuntimePath to isolate testing directories, xz: file format not recognized`, jarFile, filepath.Join(filepath.Dir(jarFile), "extracted")))
+	assert.EqualError(t, err, fmt.Sprintf(`unable to extract postgres archive %s to %s, if running parallel tests, configure RuntimePath to isolate testing directories, xz: invalid header magic bytes`, jarFile, filepath.Join(filepath.Dir(jarFile), "extracted")))
 }
 
 func Test_ErrorWhenUnableToInitDatabase(t *testing.T) {
diff --git a/examples/go.mod b/examples/go.mod
@@ -14,7 +14,7 @@ require (
 
 require (
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	github.com/ulikunitz/xz v0.5.11 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 )
diff --git a/examples/go.sum b/examples/go.sum
@@ -38,8 +38,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/lib/pq v1.10.4
 	github.com/stretchr/testify v1.7.0
-	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
+	github.com/ulikunitz/xz v0.5.11
 	go.uber.org/goleak v1.1.12
 )
 
diff --git a/go.sum b/go.sum
@@ -12,8 +12,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
diff --git a/platform-test/go.mod b/platform-test/go.mod
@@ -9,6 +9,6 @@ require github.com/fergusstrange/embedded-postgres v0.0.0
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/lib/pq v1.10.4 // indirect
-	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	github.com/ulikunitz/xz v0.5.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/platform-test/go.sum b/platform-test/go.sum
@@ -4,8 +4,8 @@ github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
-github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	`"path/filepath"`
`9`	`9`
`10`		`- "github.com/xi2/xz"`
	`10`	`+ "github.com/ulikunitz/xz"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`func defaultTarReader(xzReader xz.Reader) (func() (tar.Header, error), func() io.Reader) {`
`@@ -42,7 +42,7 @@ func decompressTarXz(tarReader func(xz.Reader) (func() (tar.Header, error), fu`
`42`	`42`	`}`
`43`	`43`	`}()`
`44`	`44`
`45`		`- xzReader, err := xz.NewReader(tarFile, 0)`
	`45`	`+ xzReader, err := xz.NewReader(tarFile)`
`46`	`46`	`if err != nil {`
`47`	`47`	`return errorUnableToExtract(path, extractPath, err)`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`
`14`	`14`	`"github.com/stretchr/testify/assert"`
`15`	`15`	`"github.com/stretchr/testify/require"`
`16`		`- "github.com/xi2/xz"`
	`16`	`+ "github.com/ulikunitz/xz"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`func Test_decompressTarXz(t *testing.T) {`
`@@ -182,7 +182,7 @@ func Test_decompressTarXz_ErrorWhenArchiveCorrupted(t *testing.T) {`
`182`	`182`
`183`	`183`	`err = decompressTarXz(defaultTarReader, archive, tempDir)`
`184`	`184`
`185`		`- assert.EqualError(t, err, "unable to extract postgres archive: xz: data is corrupt")`
	`185`	`+ assert.EqualError(t, err, "unable to extract postgres archive: writeMatch: distance out of range")`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`func Test_decompressTarXz_ErrorWithInvalidDestination(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func Test_ErrorWhenUnableToUnArchiveFile_WrongFormat(t *testing.T) {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
`103`		- assert.EqualError(t, err, fmt.Sprintf(`unable to extract postgres archive %s to %s, if running parallel tests, configure RuntimePath to isolate testing directories, xz: file format not recognized`, jarFile, filepath.Join(filepath.Dir(jarFile), "extracted")))
	`103`	+ assert.EqualError(t, err, fmt.Sprintf(`unable to extract postgres archive %s to %s, if running parallel tests, configure RuntimePath to isolate testing directories, xz: invalid header magic bytes`, jarFile, filepath.Join(filepath.Dir(jarFile), "extracted")))
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`func Test_ErrorWhenUnableToInitDatabase(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ require (`
`14`	`14`
`15`	`15`	`require (`
`16`	`16`	`github.com/pkg/errors v0.9.1 // indirect`
`17`		`- github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect`
	`17`	`+ github.com/ulikunitz/xz v0.5.11 // indirect`
`18`	`18`	`go.uber.org/atomic v1.7.0 // indirect`
`19`	`19`	`go.uber.org/multierr v1.6.0 // indirect`
`20`	`20`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.18`
`5`	`5`	`require (`
`6`	`6`	`github.com/lib/pq v1.10.4`
`7`	`7`	`github.com/stretchr/testify v1.7.0`
`8`		`- github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8`
	`8`	`+ github.com/ulikunitz/xz v0.5.11`
`9`	`9`	`go.uber.org/goleak v1.1.12`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ require github.com/fergusstrange/embedded-postgres v0.0.0`
`9`	`9`	`require (`
`10`	`10`	`github.com/davecgh/go-spew v1.1.1 // indirect`
`11`	`11`	`github.com/lib/pq v1.10.4 // indirect`
`12`		`- github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect`
	`12`	`+ github.com/ulikunitz/xz v0.5.11 // indirect`
`13`	`13`	`gopkg.in/yaml.v3 v3.0.1 // indirect`
`14`	`14`	`)`