Skip to content

Commit 1b9e7fe

Browse files
authored
fix:aws oss (#523)
1 parent cf2ce78 commit 1b9e7fe

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

components/file/s3/aws/oss.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func (a *AwsOss) Put(ctx context.Context, st *file.PutFileStu) error {
129129
if err != nil {
130130
return err
131131
}
132-
_, err = client.PutObject(context.TODO(), input, nil)
132+
_, err = client.PutObject(context.TODO(), input)
133133
if err != nil {
134134
return err
135135
}
@@ -171,7 +171,7 @@ func (a *AwsOss) Get(ctx context.Context, st *file.GetFileStu) (io.ReadCloser, e
171171
if err != nil {
172172
return nil, err
173173
}
174-
ob, err := client.GetObject(context.TODO(), input, nil)
174+
ob, err := client.GetObject(context.TODO(), input)
175175
if err != nil {
176176
return nil, err
177177
}
@@ -195,7 +195,7 @@ func (a *AwsOss) List(ctx context.Context, st *file.ListRequest) (*file.ListResp
195195
if err != nil {
196196
return nil, fmt.Errorf("list bucket[%s] fail, err: %s", st.DirectoryName, err.Error())
197197
}
198-
out, err := client.ListObjects(context.TODO(), input, nil)
198+
out, err := client.ListObjects(context.TODO(), input)
199199
if err != nil {
200200
return nil, fmt.Errorf("list bucket[%s] fail, err: %s", st.DirectoryName, err.Error())
201201
}

components/file/s3/aws/oss_test.go

+21
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,27 @@ func TestAwsOss_Put(t *testing.T) {
9696

9797
req.FileName = "/a.txt"
9898
err = oss.Put(context.Background(), req)
99+
}
100+
101+
func TestAwsOss_Get(t *testing.T) {
102+
oss := NewAwsOss()
103+
err := oss.Init(context.TODO(), &file.FileConfig{Metadata: []byte(cfg)})
104+
assert.Equal(t, nil, err)
105+
106+
putReq := &file.PutFileStu{
107+
FileName: "/a.txt",
108+
}
109+
err = oss.Put(context.Background(), putReq)
110+
99111
assert.Equal(t, err.Error(), "awsoss put file[/a.txt] fail,err: invalid fileName format")
100112

113+
req := &file.GetFileStu{
114+
FileName: "",
115+
}
116+
_, err = oss.Get(context.Background(), req)
117+
assert.Equal(t, err.Error(), "awsoss get file[] fail,err: invalid fileName format")
118+
119+
req.FileName = "/a.txt"
120+
_, err = oss.Get(context.Background(), req)
121+
assert.Equal(t, err.Error(), "awsoss get file[/a.txt] fail,err: invalid fileName format")
101122
}

0 commit comments

Comments
 (0)