Merge pull request #324 from tencentyun/feature_jojoliang_00cb9939

Feature jojoliang 00cb9939

Author: agin719

cos.go

@@ -26,7 +26,7 @@ import (
 
 const (
 	// Version current go sdk version
-	Version               = "0.7.68"
+	Version               = "0.7.69"
 	UserAgent             = "cos-go-sdk-v5/" + Version
 	contentTypeXML        = "application/xml"
 	defaultServiceBaseURL = "http://service.cos.myqcloud.com"

object.go

@@ -2262,6 +2262,18 @@ func (s *ObjectService) PutFromURL(ctx context.Context, name string, downloadURL
 			break
 		}
 	}
+	// 兼容0字节文件，如果没有上传分片，则上传一个空分片
+	if len(comOpt.Parts) == 0 {
+		resp, err := s.UploadPart(ctx, name, uploadId, 1, http.NoBody, nil)
+		if err != nil {
+			isErr = true
+			return nil, resp, err
+		}
+		comOpt.Parts = append(comOpt.Parts, Object{
+			PartNumber: 1,
+			ETag:       resp.Header.Get("ETag"),
+		})
+	}
 	res, resp, err := s.CompleteMultipartUpload(ctx, name, uploadId, comOpt)
 	if err != nil {
 		isErr = true

object_test.go

@@ -2400,6 +2400,10 @@ func TestObjectService_PutFromURL(t *testing.T) {
 			t.Errorf("io.copy failed: %v", err)
 		}
 	})
+	source_empty := "source_empty"
+	mux.HandleFunc("/"+source_empty, func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, http.MethodGet)
+	})
 
 	// 全局crc
 	mux.HandleFunc("/"+dest, func(w http.ResponseWriter, r *http.Request) {
@@ -2513,4 +2517,12 @@ func TestObjectService_PutFromURL(t *testing.T) {
 	if err == nil {
 		t.Errorf("Object.PutFromURL expect error")
 	}
+	initTest()
+	realcrc = 0
+	downloadUrl = client.BaseURL.BucketURL.String() + "/" + source_empty
+	_, _, err = client.Object.PutFromURL(context.Background(), dest, downloadUrl, nil)
+	if err != nil {
+		t.Errorf("Object.PutFromURL expect error")
+	}
+
 }

retry_test.go

@@ -19,7 +19,7 @@ var (
 func retrysetup(host string) *Client {
 	u, _ := url.Parse("http://" + host)
 	cli := NewClient(&BaseURL{u, u, u, u, u, u}, &http.Client{
-		Timeout: 3 * time.Second,
+		Timeout: 6 * time.Second,
 	})
 	cli.Conf.RetryOpt.Count = 2
 	return cli