Skip to content

Commit c74dbc0

Browse files
saltbosaltbo
committed
fix: exclude invalid for remoteObjects
1 parent f6882aa commit c74dbc0

File tree

10 files changed

+94
-69
lines changed

10 files changed

+94
-69
lines changed

‎engine/engine.go‎

Lines changed: 39 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,19 @@ type Config struct {
1919
Excludes []string `yaml:"excludes"`
2020
}
2121

22+
func (c *Config) buildRemoteExcludes() []string {
23+
return c.buildExcludes(c.SaveRoot)
24+
}
25+
26+
func (c *Config) buildExcludes(root string) []string {
27+
rets := make([]string, 0)
28+
for _, exclude := range c.Excludes {
29+
rets = append(rets, filepath.Join(root, exclude))
30+
}
31+
32+
return c.Excludes
33+
}
34+
2235
// Engine provides the core logic to finish the feature
2336
type Engine struct {
2437
echo
@@ -43,7 +56,10 @@ func (e *Engine) TailRun(paths ...string) {
4356
log.Fatalln(err)
4457
}
4558

46-
if stat.IsDir() {
59+
if stat.IsDir() && e.conf.ForceSync {
60+
e.syncTo(path)
61+
continue
62+
} else if stat.IsDir() {
4763
e.uploadDirectory(path)
4864
continue
4965
}
@@ -52,23 +68,30 @@ func (e *Engine) TailRun(paths ...string) {
5268
}
5369
}
5470

55-
func (e *Engine) uploadDirectory(dirPath string) {
56-
objects, err := e.loadLocalObjects(dirPath)
71+
func (e *Engine) syncTo(dirPath string) {
72+
localObjects, err := e.loadLocalObjects(dirPath)
5773
if err != nil {
5874
log.Fatalln(err)
5975
}
6076

61-
// directory sync
62-
if e.conf.ForceSync {
63-
s := NewSyncer(e.uploader)
64-
if err := s.Sync(objects, e.conf.SaveRoot); err != nil {
65-
log.Fatalln(err)
66-
}
67-
return
77+
remoteObjects, err := e.uploader.ListObjects(e.conf.SaveRoot)
78+
if err != nil {
79+
log.Fatalln(err)
80+
}
81+
82+
s := NewSyncer(e.uploader, e.conf, dirPath)
83+
if err := s.Sync(localObjects, remoteObjects); err != nil {
84+
log.Fatalln(err)
85+
}
86+
}
87+
88+
func (e *Engine) uploadDirectory(dirPath string) {
89+
localObjects, err := e.loadLocalObjects(dirPath)
90+
if err != nil {
91+
log.Fatalln(err)
6892
}
6993

70-
// directory normal upload
71-
for _, obj := range objects {
94+
for _, obj := range localObjects {
7295
e.uploadFile(obj.FilePath, obj.Key)
7396
}
7497
}
@@ -93,7 +116,7 @@ func (e *Engine) loadLocalObjects(dirPath string) ([]uploader.Object, error) {
93116
return err
94117
}
95118

96-
if info.IsDir() || e.shouldExclude(dirPath, filePath) {
119+
if info.IsDir() {
97120
return nil
98121
}
99122

@@ -113,10 +136,9 @@ func (e *Engine) loadLocalObjects(dirPath string) ([]uploader.Object, error) {
113136
return localObjects, nil
114137
}
115138

116-
func (e *Engine) shouldExclude(dirPath, filePath string) bool {
117-
parentPath := strings.TrimPrefix(dirPath, "./")
118-
for _, ePath := range e.conf.Excludes {
119-
if strings.HasPrefix(filePath, parentPath+strings.TrimPrefix(ePath, "/")) {
139+
func shouldExclude(filepath string, excludes []string) bool {
140+
for _, ePath := range excludes {
141+
if strings.HasPrefix(filepath, ePath) {
120142
return true
121143
}
122144
}

‎engine/syncer.go‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,20 @@ import (
99

1010
// Syncer is the syncer to finish the logic
1111
type Syncer struct {
12-
uploader uploader.Driver
12+
uploader uploader.Driver
13+
config Config
14+
localRoot string
1315

1416
tobeUploadedObjects []uploader.Object
1517
tobeDeletedObjects []uploader.Object
1618
}
1719

1820
// NewSyncer returns a new syncer.
19-
func NewSyncer(uploadDriver uploader.Driver) *Syncer {
21+
func NewSyncer(uploadDriver uploader.Driver, conf Config, localRoot string) *Syncer {
2022
return &Syncer{
21-
uploader: uploadDriver,
23+
uploader: uploadDriver,
24+
config: conf,
25+
localRoot: localRoot,
2226

2327
tobeUploadedObjects: make([]uploader.Object, 0),
2428
tobeDeletedObjects: make([]uploader.Object, 0),
@@ -27,11 +31,7 @@ func NewSyncer(uploadDriver uploader.Driver) *Syncer {
2731

2832
// Sync uploads the to be upload objects to the cloud
2933
// and delete the not exist remote objects
30-
func (s *Syncer) Sync(localObjects []uploader.Object, saveRoot string) error {
31-
remoteObjects, err := s.uploader.ListObjects(saveRoot)
32-
if err != nil {
33-
return err
34-
}
34+
func (s *Syncer) Sync(localObjects, remoteObjects []uploader.Object) error {
3535
log.Printf("find %d local objects", len(localObjects))
3636
log.Printf("find %d remote objects", len(remoteObjects))
3737
log.Printf("compare the local files and the remote objects...")
@@ -60,6 +60,11 @@ func (s *Syncer) Sync(localObjects []uploader.Object, saveRoot string) error {
6060
// compareObjects compare local files with the remote objects
6161
func (s *Syncer) compareObjects(localObjects, remoteObjects []uploader.Object) {
6262
for _, localObject := range localObjects {
63+
cleanLocalRoot := strings.TrimPrefix(s.localRoot, "./")
64+
if shouldExclude(localObject.FilePath, s.config.buildExcludes(cleanLocalRoot)) {
65+
continue
66+
}
67+
6368
if !s.objectExist(localObject, remoteObjects) {
6469
localObject.Type = uploader.LocalObjectTypeAdded
6570
s.tobeUploadedObjects = append(s.tobeUploadedObjects, localObject) // the added objects
@@ -73,7 +78,8 @@ func (s *Syncer) compareObjects(localObjects, remoteObjects []uploader.Object) {
7378

7479
// find the deleted objects
7580
for _, remoteObject := range remoteObjects {
76-
if s.objectExist(remoteObject, localObjects) {
81+
if s.objectExist(remoteObject, localObjects) ||
82+
shouldExclude(remoteObject.FilePath, s.config.buildRemoteExcludes()) {
7783
continue
7884
}
7985

‎engine/syncer_test.go‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package engine
33
import (
44
"crypto/md5"
55
"encoding/hex"
6-
"fmt"
6+
"path/filepath"
77
"testing"
88

99
"github.com/stretchr/testify/assert"
@@ -13,43 +13,35 @@ import (
1313

1414
func TestSync(t *testing.T) {
1515
// init test data
16-
files := map[string]string{
17-
"abc1.txt": "abcabc",
18-
"abc2.txt": "112233",
19-
"abc3.txt": "445566",
16+
cfg := Config{SaveRoot: "/test/", Excludes: []string{"./abc"}}
17+
e := New(cfg, &mockUploader{})
18+
localObjects, err := e.loadLocalObjects("./testdata")
19+
assert.NoError(t, err)
20+
21+
// test
22+
syncer := NewSyncer(&mockUploader{}, cfg, "./testdata")
23+
assert.NoError(t, syncer.Sync(localObjects, mockRemoteObjects(cfg.SaveRoot)))
24+
}
25+
26+
func mockRemoteObjects(remoteRoot string) []uploader.Object {
27+
remoteFiles := map[string]string{
28+
"./abc/abc1.txt": "abcabc",
29+
"./aaa/abc2.txt": "112233",
30+
"./bbb/abc3.txt": "445566",
31+
"./testdata/abc/a1.txt": "445566",
32+
"./testdata/abc/a2.txt": "445566",
2033
}
2134

22-
localObjects := make([]uploader.Object, 0)
23-
for name, content := range files {
35+
remoteObjects := make([]uploader.Object, 0)
36+
for name, content := range remoteFiles {
2437
hash := md5.Sum([]byte(content))
25-
localObjects = append(localObjects, uploader.Object{
26-
Key: name,
38+
remoteObjects = append(remoteObjects, uploader.Object{
39+
Key: filepath.Join(remoteRoot, name),
2740
ETag: hex.EncodeToString(hash[:]),
2841
FilePath: name,
2942
Type: "text/plain",
3043
})
3144
}
3245

33-
// test
34-
syncer := NewSyncer(&mockUploader{})
35-
assert.NoError(t, syncer.Sync(localObjects, ""))
36-
}
37-
38-
func TestSync2(t *testing.T) {
39-
objects := []uploader.Object{
40-
{
41-
Key: "test",
42-
FilePath: "test",
43-
Type: "text/plain",
44-
},
45-
}
46-
47-
s := NewSyncer(&mockUploader{listErr: fmt.Errorf("list error")})
48-
assert.Error(t, s.Sync(objects, ""))
49-
50-
s = NewSyncer(&mockUploader{uploadErr: fmt.Errorf("upload error")})
51-
assert.Error(t, s.Sync(objects, ""))
52-
53-
s = NewSyncer(&mockUploader{deleteErr: fmt.Errorf("delete error")})
54-
assert.Error(t, s.Sync(objects, ""))
46+
return remoteObjects
5547
}

‎engine/testdata/abc/a1.txt‎

Whitespace-only changes.

‎engine/testdata/abc/a2.txt‎

Whitespace-only changes.

‎engine/testdata/file1.txt‎

Whitespace-only changes.

‎engine/testdata/file2.txt‎

Whitespace-only changes.

‎engine/testdata/file3.txt‎

Whitespace-only changes.

‎go.sum‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko
55
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
66
github.com/aws/aws-sdk-go v1.30.29 h1:NXNqBS9hjOCpDL8SyCyl38gZX3LLLunKOJc5E7vJ8P0=
77
github.com/aws/aws-sdk-go v1.30.29/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
8+
github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
89
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
910
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8=
1011
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
12+
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
1113
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
1214
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
1315
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
14-
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
1516
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
17+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1618
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1719
github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
1820
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
@@ -53,8 +55,10 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
5355
github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a h1:FaWFmfWdAUKbSCtOU2QjDaorUexogfaMgbipgYATUMU=
5456
github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod h1:UJSiEoRfvx3hP73CvoARgeLjaIOjybY9vj8PUPPFGeU=
5557
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
58+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
5659
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
5760
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
61+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
5862
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
5963
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
6064
github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -65,7 +69,6 @@ github.com/manifoldco/promptui v0.7.0 h1:3l11YT8tm9MnwGFQ4kETwkzpAwY2Jt9lCrumCUW
6569
github.com/manifoldco/promptui v0.7.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ=
6670
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
6771
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
68-
github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
6972
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
7073
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
7174
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -91,8 +94,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
9194
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
9295
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
9396
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
94-
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
9597
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
98+
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
9699
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
97100
github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
98101
github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
@@ -125,12 +128,12 @@ golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLL
125128
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
126129
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
127130
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
131+
golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
128132
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
129133
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
130134
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
131135
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
132136
golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
133-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
134137
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
135138
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
136139
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -139,6 +142,7 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
139142
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
140143
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
141144
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
145+
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
142146
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
143147
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
144148
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -149,15 +153,16 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn
149153
golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
150154
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
151155
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
156+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
152157
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
153158
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
154159
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
155160
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
156161
gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
157162
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
158-
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
159163
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
160164
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
161165
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
166+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
162167
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
163168
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

‎uploader/driver_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ var driverConfigs = []Config{
4040
AccessKey: os.Getenv("UPLOADER_S3_AK"),
4141
SecretKey: os.Getenv("UPLOADER_S3_SK"),
4242
},
43-
{
44-
Name: "google",
45-
Region: "auto",
46-
Bucket: "ut-uptoc",
47-
AccessKey: os.Getenv("UPLOADER_STORAGE_AK"),
48-
SecretKey: os.Getenv("UPLOADER_STORAGE_SK"),
49-
},
43+
//{
44+
// Name: "google",
45+
// Region: "auto",
46+
// Bucket: "ut-uptoc",
47+
// AccessKey: os.Getenv("UPLOADER_STORAGE_AK"),
48+
// SecretKey: os.Getenv("UPLOADER_STORAGE_SK"),
49+
//},
5050
}
5151

5252
func TestUploader(t *testing.T) {

0 commit comments

Comments
 (0)