fix(filer): cp file to volume error

Author: duanhongyi

cmd/volumes.go

@@ -384,11 +384,10 @@ func (d *DryccCmd) volumesClientCp(appID, src, dst string) error {
 			return err
 		}
 		if dirs, _, err := volumes.ListDir(s.Client, appID, volumeID, volumePath, 3000); err == nil {
-			if len(dirs) == 1 && dirs[0].Type == "file" {
+			names := strings.Split(strings.Trim(src, "/"), "/")
+			if len(dirs) == 1 && dirs[0].Type == "file" && strings.HasSuffix(strings.Trim(volumePath, "/"), names[len(names)-1]) {
 				return fmt.Errorf("the volume path cannot be an existing file")
 			}
-		} else if strings.Contains(fmt.Sprint(err), "no such file or directory") {
-			return err
 		}
 		if file, err := os.Stat(src); err == nil && file.IsDir() {
 			volumePath = mergeDestDir(volumePath, src)

go.mod

@@ -5,7 +5,7 @@ go 1.22
 require (
 	github.com/containerd/console v1.0.4
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/drycc/controller-sdk-go v0.0.0-20240905080608-287c054d88fa
+	github.com/drycc/controller-sdk-go v0.0.0-20240914012909-575b73557eda
 	github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f
 	github.com/minio/selfupdate v0.6.0
 	github.com/olekukonko/tablewriter v0.0.5

go.sum

@@ -7,8 +7,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/drycc/controller-sdk-go v0.0.0-20240905080608-287c054d88fa h1:mdr4Z80ioWRP9o/4mpW1NwICPirXvvlyK7cCV3pprvc=
-github.com/drycc/controller-sdk-go v0.0.0-20240905080608-287c054d88fa/go.mod h1:n6eQe1irJqjwLo/7t9+Dhdv6faSESQN+ATnZRBP3/Uc=
+github.com/drycc/controller-sdk-go v0.0.0-20240914012909-575b73557eda h1:mRCAj1UoeNWhwDwLj7VEOHMobziBxjvNJ//n+pfqIXs=
+github.com/drycc/controller-sdk-go v0.0.0-20240914012909-575b73557eda/go.mod h1:n6eQe1irJqjwLo/7t9+Dhdv6faSESQN+ATnZRBP3/Uc=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f h1:kgjvUQJeAszDoU1Vo4vTTE92KI8Av3JPb6Qn890niXg=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f/go.mod h1:n+QxGif6ha9CEoxVnlipxb9IdmerybcUSzTEDFkvjiA=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=