Skip to content

Commit 046e3bd

Browse files
anrsanrs
and
anrs
authored
feat: file relative apis (#286)
Co-authored-by: anrs <anders.hu@shopee.com>
1 parent a310b56 commit 046e3bd

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

engine/virt/virt.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"fmt"
88
"io"
99
"io/ioutil"
10+
"path/filepath"
1011
"strings"
1112

1213
log "github.com/sirupsen/logrus"
@@ -275,9 +276,13 @@ func (v *Virt) VirtualizationUpdateResource(ctx context.Context, ID string, opts
275276
return err
276277
}
277278

278-
// VirtualizationCopyFrom copies from another.
279+
// VirtualizationCopyFrom copies file content from the container.
279280
func (v *Virt) VirtualizationCopyFrom(ctx context.Context, ID, path string) (io.ReadCloser, string, error) {
280-
return nil, "", fmt.Errorf("VirtualizationCopyFrom does not implement")
281+
rd, err := v.client.Cat(ctx, ID, path)
282+
if err != nil {
283+
return nil, "", err
284+
}
285+
return ioutil.NopCloser(rd), filepath.Base(path), nil
281286
}
282287

283288
// VirtualizationExecute executes commands in running virtual unit

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/opencontainers/runc v0.1.1 // indirect
2929
github.com/patrickmn/go-cache v2.1.0+incompatible
3030
github.com/pkg/errors v0.9.1
31-
github.com/projecteru2/libyavirt v0.0.0-20200831030711-2bb3f2ba0cb7
31+
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01
3232
github.com/prometheus/client_golang v1.7.1
3333
github.com/sanity-io/litter v1.3.0
3434
github.com/sethvargo/go-signalcontext v0.1.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
220220
github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
221221
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
222222
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
223-
github.com/projecteru2/libyavirt v0.0.0-20200831030711-2bb3f2ba0cb7 h1:h7p+s1YB6Q3Bsk0+e4bJYjtVLIC5vz/+0ZmxrsDXod0=
224-
github.com/projecteru2/libyavirt v0.0.0-20200831030711-2bb3f2ba0cb7/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
223+
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01 h1:jwdXaoOwm2yG3GdFREt1qMWL9RrumHvcqQpgYieNM3s=
224+
github.com/projecteru2/libyavirt v0.0.0-20201127073250-63c729c0fe01/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
225225
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
226226
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
227227
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

0 commit comments

Comments
 (0)