afero
afero copied to clipboard
Migrating to a new reflection API
Hi.
I was checking whether it is possible to perform a painless migration of your project, on behalf of a farther improvements of the reflection API.
I was able to run your tests, after applying such a patch:
diff --git a/go.mod b/go.mod index abe4fe1..e27cc42 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,11 @@ module github.com/spf13/afero
require (
github.com/goccy/go-reflect v1.1.0 // indirect github.com/pkg/sftp v1.10.1
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 golang.org/x/text v0.3.3
golang.org/x/tools v0.1.0 // indirect
)
go 1.13 diff --git a/go.sum b/go.sum index 89d9bfb..4fdcfa4 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/goccy/go-reflect v1.1.0 h1:kiT3+exv9ULtdpawlMzCGT1y5bWOmuY3jgS86GB9t1s= +github.com/goccy/go-reflect v1.1.0/go.mod h1:n0oYZn8VcV2CkWTxi8B9QjkCoq6GTtCEdfmR66YhFtE= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= @@ -11,18 +13,38 @@ 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.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/tarfs/tarfs_test.go b/tarfs/tarfs_test.go index c588c79..4eb5bf3 100644 --- a/tarfs/tarfs_test.go +++ b/tarfs/tarfs_test.go @@ -8,11 +8,12 @@ import ( "io" "os" "path/filepath"
"reflect" "strings" "syscall" "testing"
reflect "github.com/goccy/go-reflect"
"github.com/spf13/afero"
)
diff --git a/zipfs/zipfs_test.go b/zipfs/zipfs_test.go index bf781cc..4cfdc0e 100644 --- a/zipfs/zipfs_test.go +++ b/zipfs/zipfs_test.go @@ -5,8 +5,9 @@ import (
"archive/zip" "path/filepath"
"reflect" "testing"
reflect "github.com/goccy/go-reflect"
)
func TestZipFS(t *testing.T) {
I tried another alternative - but was not sure why you use DeepEqual() :
diff --git a/go.mod b/go.mod index abe4fe1..8e8067e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/spf13/afero
require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect github.com/pkg/sftp v1.10.1 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 golang.org/x/text v0.3.3
diff --git a/go.sum b/go.sum index 89d9bfb..54dfcf4 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,10 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1 h1:VasscCm72135zRysgrJDKsntdmPN+OuU3+nnHYA9wyc= diff --git a/tarfs/tarfs_test.go b/tarfs/tarfs_test.go index c588c79..236a0ca 100644 --- a/tarfs/tarfs_test.go +++ b/tarfs/tarfs_test.go @@ -8,11 +8,12 @@ import ( "io" "os" "path/filepath"
"reflect" "strings" "syscall" "testing"
reflect2 "github.com/modern-go/reflect2"
"github.com/spf13/afero"
)
@@ -315,7 +316,7 @@ func TestReaddir(t *testing.T) { names = append(names, f.Name()) }
if !reflect.DeepEqual(names, d.children) {
if !reflect2.DeepEqual(names, d.children) { t.Errorf("%v: children, got '%v', expected '%v'", d.name, names, d.children) }
@@ -329,7 +330,7 @@ func TestReaddir(t *testing.T) { names = append(names, f.Name()) }
if !reflect.DeepEqual(names, d.children[0:1]) {
if !reflect2.DeepEqual(names, d.children[0:1]) { t.Errorf("%v: children, got '%v', expected '%v'", d.name, names, d.children[0:1]) } }
@@ -357,7 +358,7 @@ func TestReaddirnames(t *testing.T) { t.Fatal(err) }
if !reflect.DeepEqual(names, d.children) {
if !reflect2.DeepEqual(names, d.children) { t.Errorf("%v: children, got '%v', expected '%v'", d.name, names, d.children) }
@@ -366,7 +367,7 @@ func TestReaddirnames(t *testing.T) { t.Fatal(err) }
if !reflect.DeepEqual(names, d.children[0:1]) {
if !reflect2.DeepEqual(names, d.children[0:1]) { t.Errorf("%v: children, got '%v', expected '%v'", d.name, names, d.children[0:1]) } }
@@ -397,7 +398,7 @@ func TestGlob(t *testing.T) { if err != nil { t.Error(err) }
if reflect.DeepEqual(entries, s.entries) {
if reflect2.DeepEqual(entries, s.entries) { t.Logf("glob: %s: glob ok", s.glob) } else { t.Errorf("glob: %s: got %#v, expected %#v", s.glob, entries, s.entries)
diff --git a/zipfs/zipfs_test.go b/zipfs/zipfs_test.go
index bf781cc..ffc1a66 100644 --- a/zipfs/zipfs_test.go +++ b/zipfs/zipfs_test.go @@ -5,8 +5,9 @@ import (
"archive/zip" "path/filepath"
"reflect" "testing"
reflect2 "github.com/modern-go/reflect2"
)
func TestZipFS(t *testing.T) { @@ -94,7 +95,7 @@ func TestZipFS(t *testing.T) { if err != nil { t.Error(err) }
if reflect.DeepEqual(entries, s.entries) {
if reflect2.DeepEqual(entries, s.entries) { t.Logf("glob: %s: glob ok", s.glob) } else { t.Errorf("glob: %s: got %#v, expected %#v", s.glob, entries, s.entries)
$ go test ./...
github.com/spf13/afero/zipfs [github.com/spf13/afero/zipfs.test]
zipfs/zipfs_test.go:98:6: undefined: reflect2.DeepEqual
github.com/spf13/afero/tarfs [github.com/spf13/afero/tarfs.test]
tarfs/tarfs_test.go:319:7: undefined: reflect2.DeepEqual tarfs/tarfs_test.go:333:7: undefined: reflect2.DeepEqual tarfs/tarfs_test.go:361:7: undefined: reflect2.DeepEqual tarfs/tarfs_test.go:370:7: undefined: reflect2.DeepEqual tarfs/tarfs_test.go:401:6: undefined: reflect2.DeepEqual ok github.com/spf13/afero 4.141s ok github.com/spf13/afero/mem (cached) ok github.com/spf13/afero/sftpfs 5.192s FAIL github.com/spf13/afero/tarfs [build failed] FAIL github.com/spf13/afero/zipfs [build failed] FAIL