add append && add retry

bucket_accelerate.go

@@ -20,7 +20,7 @@ func (s *BucketService) PutAccelerate(ctx context.Context, opt *BucketPutAcceler
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -32,6 +32,6 @@ func (s *BucketService) GetAccelerate(ctx context.Context) (*BucketGetAccelerate
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }

bucket_accelerate_test.go

@@ -51,6 +51,7 @@ func TestBucketService_PutAccelerate(t *testing.T) {
 		Type:    "COS",
 	}
 
+	rt := 0
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "PUT")
 		vs := values{
@@ -65,6 +66,10 @@ func TestBucketService_PutAccelerate(t *testing.T) {
 		if !reflect.DeepEqual(body, want) {
 			t.Errorf("Bucket.PutAccelerate request\n body: %+v\n, want %+v\n", body, want)
 		}
+		rt++
+		if rt < 3 {
+			w.WriteHeader(http.StatusBadGateway)
+		}
 	})
 
 	_, err := client.Bucket.PutAccelerate(context.Background(), opt)

bucket_acl.go

@@ -19,7 +19,7 @@ func (s *BucketService) GetACL(ctx context.Context) (*BucketGetACLResult, *Respo
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	if err == nil {
 		decodeACL(resp, &res)
 	}
@@ -60,6 +60,6 @@ func (s *BucketService) PutACL(ctx context.Context, opt *BucketPutACLOptions) (*
 		body:      body,
 		optHeader: header,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }

bucket_cors.go

@@ -33,11 +33,11 @@ func (s *BucketService) GetCORS(ctx context.Context) (*BucketGetCORSResult, *Res
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }
 
-// BucketPutCORSOptions is the option of PutBucketCORS 
+// BucketPutCORSOptions is the option of PutBucketCORS
 type BucketPutCORSOptions struct {
 	XMLName xml.Name         `xml:"CORSConfiguration"`
 	Rules   []BucketCORSRule `xml:"CORSRule,omitempty"`
@@ -53,7 +53,7 @@ func (s *BucketService) PutCORS(ctx context.Context, opt *BucketPutCORSOptions)
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -66,6 +66,6 @@ func (s *BucketService) DeleteCORS(ctx context.Context) (*Response, error) {
 		uri:     "/?cors",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }

bucket_domain.go

@@ -22,7 +22,7 @@ func (s *BucketService) PutDomain(ctx context.Context, opt *BucketPutDomainOptio
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -34,6 +34,6 @@ func (s *BucketService) GetDomain(ctx context.Context) (*BucketGetDomainResult,
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }

bucket_domain_test.go

@@ -13,12 +13,18 @@ func TestBucketService_GetDomain(t *testing.T) {
 	setup()
 	defer teardown()
 
+	rt := 0
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "GET")
 		vs := values{
 			"domain": "",
 		}
 		testFormValues(t, r, vs)
+		rt++
+		if rt < 3 {
+			w.WriteHeader(http.StatusGatewayTimeout)
+		}
+
 		fmt.Fprint(w, `<DomainConfiguration>
   	<DomainRule>
     	<Status>ENABLED</Status>
@@ -59,13 +65,17 @@ func TestBucketService_PutDomain(t *testing.T) {
 		ForcedReplacement: "CNAME",
 	}
 
+	rt := 0
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, "PUT")
 		vs := values{
 			"domain": "",
 		}
 		testFormValues(t, r, vs)
-
+		rt++
+		if rt < 3 {
+			w.WriteHeader(http.StatusGatewayTimeout)
+		}
 		body := new(BucketPutDomainOptions)
 		xml.NewDecoder(r.Body).Decode(body)
 		want := opt
@@ -87,6 +97,7 @@ func TestBucketService_DeleteDomain(t *testing.T) {
 
 	opt := &BucketPutDomainOptions{}
 
+	rt := 0
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodPut)
 		vs := values{
@@ -94,6 +105,11 @@ func TestBucketService_DeleteDomain(t *testing.T) {
 		}
 		testFormValues(t, r, vs)
 
+		rt++
+		if rt < 3 {
+			w.WriteHeader(http.StatusGatewayTimeout)
+			return
+		}
 		body := new(BucketPutDomainOptions)
 		xml.NewDecoder(r.Body).Decode(body)
 		want := opt

bucket_encryption.go

@@ -24,7 +24,7 @@ func (s *BucketService) PutEncryption(ctx context.Context, opt *BucketPutEncrypt
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -36,7 +36,7 @@ func (s *BucketService) GetEncryption(ctx context.Context) (*BucketGetEncryption
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }
 
@@ -46,6 +46,6 @@ func (s *BucketService) DeleteEncryption(ctx context.Context) (*Response, error)
 		uri:     "/?encryption",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }

bucket_intelligenttiering.go

@@ -29,7 +29,7 @@ func (s *BucketService) PutIntelligentTiering(ctx context.Context, opt *BucketPu
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -41,7 +41,7 @@ func (s *BucketService) GetIntelligentTiering(ctx context.Context) (*BucketGetIn
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 
 }

bucket_inventory.go

@@ -74,7 +74,7 @@ func (s *BucketService) PutInventory(ctx context.Context, id string, opt *Bucket
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 
 }
@@ -89,7 +89,7 @@ func (s *BucketService) GetInventory(ctx context.Context, id string) (*BucketGet
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }
 
@@ -101,7 +101,7 @@ func (s *BucketService) DeleteInventory(ctx context.Context, id string) (*Respon
 		uri:     u,
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -120,7 +120,7 @@ func (s *BucketService) ListInventoryConfigurations(ctx context.Context, token s
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 
 }

bucket_logging.go

@@ -31,7 +31,7 @@ func (s *BucketService) PutLogging(ctx context.Context, opt *BucketPutLoggingOpt
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -44,7 +44,7 @@ func (s *BucketService) GetLogging(ctx context.Context) (*BucketGetLoggingResult
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 
 }

bucket_origin.go

@@ -64,7 +64,7 @@ func (s *BucketService) PutOrigin(ctx context.Context, opt *BucketPutOriginOptio
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -76,7 +76,7 @@ func (s *BucketService) GetOrigin(ctx context.Context) (*BucketGetOriginResult,
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }
 
@@ -86,6 +86,6 @@ func (s *BucketService) DeleteOrigin(ctx context.Context) (*Response, error) {
 		uri:     "/?origin",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }

bucket_policy.go

@@ -53,7 +53,7 @@ func (s *BucketService) GetPolicy(ctx context.Context) (*BucketGetPolicyResult,
 		method:  http.MethodGet,
 		result:  &bs,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	if err == nil {
 		err = json.Unmarshal(bs.Bytes(), &res)
 	}
@@ -66,6 +66,6 @@ func (s *BucketService) DeletePolicy(ctx context.Context) (*Response, error) {
 		uri:     "/?policy",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }

bucket_referer.go

@@ -23,7 +23,7 @@ func (s *BucketService) PutReferer(ctx context.Context, opt *BucketPutRefererOpt
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -35,6 +35,6 @@ func (s *BucketService) GetReferer(ctx context.Context) (*BucketGetRefererResult
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }

bucket_replication.go

@@ -38,7 +38,7 @@ func (s *BucketService) PutBucketReplication(ctx context.Context, opt *PutBucket
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 
 }
@@ -52,7 +52,7 @@ func (s *BucketService) GetBucketReplication(ctx context.Context) (*GetBucketRep
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 
 }
@@ -64,6 +64,6 @@ func (s *BucketService) DeleteBucketReplication(ctx context.Context) (*Response,
 		uri:     "/?replication",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }

bucket_tagging.go

@@ -29,7 +29,7 @@ func (s *BucketService) GetTagging(ctx context.Context) (*BucketGetTaggingResult
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }
 
@@ -51,7 +51,7 @@ func (s *BucketService) PutTagging(ctx context.Context, opt *BucketPutTaggingOpt
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -64,6 +64,6 @@ func (s *BucketService) DeleteTagging(ctx context.Context) (*Response, error) {
 		uri:     "/?tagging",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }

bucket_version.go

@@ -24,7 +24,7 @@ func (s *BucketService) PutVersioning(ctx context.Context, opt *BucketPutVersion
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -37,6 +37,6 @@ func (s *BucketService) GetVersioning(ctx context.Context) (*BucketGetVersionRes
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }

bucket_website.go

@@ -44,7 +44,7 @@ func (s *BucketService) PutWebsite(ctx context.Context, opt *BucketPutWebsiteOpt
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -56,7 +56,7 @@ func (s *BucketService) GetWebsite(ctx context.Context) (*BucketGetWebsiteResult
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }
 
@@ -66,6 +66,6 @@ func (s *BucketService) DeleteWebsite(ctx context.Context) (*Response, error) {
 		uri:     "/?website",
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }

ci_doc_test.go

@@ -192,7 +192,7 @@ func TestCIService_DocPreview(t *testing.T) {
 	})
 
 	opt := &DocPreviewOptions{
-		Page: 1,
+		Page:        1,
 		ImageParams: "imageMogr2/thumbnail/!50p|watermark/2/text/5pWw5o2u5LiH6LGh/fill/I0ZGRkZGRg==/fontsize/30/dx/20/dy/20",
 	}
 

ci_media_test.go

@@ -159,8 +159,8 @@ func TestCIService_DescribeMediaProcessBuckets(t *testing.T) {
 	})
 
 	opt := &DescribeMediaProcessBucketsOptions{
-		Regions:     regions,
-		BucketName:  bucketName,
+		Regions:    regions,
+		BucketName: bucketName,
 	}
 
 	_, _, err := client.CI.DescribeMediaProcessBuckets(context.Background(), opt)

ci_test.go

@@ -589,10 +589,10 @@ func TestCIService_GenerateQRcode(t *testing.T) {
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
 		vs := values{
-			"ci-process": "qrcode-generate",
+			"ci-process":     "qrcode-generate",
 			"qrcode-content": "<https://www.example.com>",
-			"mode": "1",
-			"width": "200",
+			"mode":           "1",
+			"width":          "200",
 		}
 		testFormValues(t, r, vs)
 	})
@@ -616,10 +616,10 @@ func TestCIService_GenerateQRcodeToFile(t *testing.T) {
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
 		vs := values{
-			"ci-process": "qrcode-generate",
+			"ci-process":     "qrcode-generate",
 			"qrcode-content": "<https://www.example.com>",
-			"mode": "1",
-			"width": "200",
+			"mode":           "1",
+			"width":          "200",
 		}
 		testFormValues(t, r, vs)
 	})

cos.go

@@ -22,7 +22,7 @@ import (
 
 const (
 	// Version current go sdk version
-	Version               = "0.7.29"
+	Version               = "0.7.30"
 	userAgent             = "cos-go-sdk-v5/" + Version
 	contentTypeXML        = "application/xml"
 	defaultServiceBaseURL = "http://service.cos.myqcloud.com"
@@ -244,6 +244,10 @@ func (c *Client) doAPI(ctx context.Context, req *http.Request, result interface{
 
 	err = checkResponse(resp)
 	if err != nil {
+		// StatusCode != 2xx when Get Object
+		if !closeBody {
+			resp.Body.Close()
+		}
 		// even though there was an error, we still return the response
 		// in case the caller wants to inspect it further
 		return response, err
@@ -251,7 +255,7 @@ func (c *Client) doAPI(ctx context.Context, req *http.Request, result interface{
 
 	// need CRC64 verification
 	if reader, ok := req.Body.(*teeReader); ok {
-		if c.Conf.EnableCRC && reader.writer != nil {
+		if c.Conf.EnableCRC && reader.writer != nil && !reader.disableCheckSum {
 			localcrc := reader.Crc64()
 			scoscrc := response.Header.Get("x-cos-hash-crc64ecma")
 			icoscrc, _ := strconv.ParseUint(scoscrc, 10, 64)
@@ -298,7 +302,8 @@ type sendOptions struct {
 func (c *Client) doRetry(ctx context.Context, opt *sendOptions) (resp *Response, err error) {
 	if opt.body != nil {
 		if _, ok := opt.body.(io.Reader); ok {
-			return c.send(ctx, opt)
+			resp, err = c.send(ctx, opt)
+			return
 		}
 	}
 	nr := 0

costesting/ci_test.go

@@ -2,6 +2,7 @@ package cos
 
 // Basic imports
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io/ioutil"
@@ -812,6 +813,21 @@ func (s *CosTestSuite) TestMultiUpload() {
 	assert.Nil(s.T(), err, "remove tmp file failed")
 }
 
+func (s *CosTestSuite) TestAppend() {
+	name := "append" + time.Now().Format(time.RFC3339)
+	b1 := make([]byte, 1024*1024*10)
+	_, err := rand.Read(b1)
+	pos, _, err := s.Client.Object.Append(context.Background(), name, 0, bytes.NewReader(b1), nil)
+	assert.Nil(s.T(), err, "append object failed")
+	assert.Equal(s.T(), len(b1), pos, "append object pos error")
+
+	b2 := make([]byte, 12345)
+	rand.Read(b2)
+	pos, _, err = s.Client.Object.Append(context.Background(), name, pos, bytes.NewReader(b2), nil)
+	assert.Nil(s.T(), err, "append object failed")
+	assert.Equal(s.T(), len(b1)+len(b2), pos, "append object pos error")
+}
+
 /*
 func (s *CosTestSuite) TestBatch() {
 	client := cos.NewClient(s.Client.BaseURL, &http.Client{

error_test.go

@@ -89,12 +89,12 @@ func Test_checkResponse_with_error(t *testing.T) {
 }
 
 func Test_IsNotFoundError(t *testing.T) {
-    setup()
-    defer teardown()
+	setup()
+	defer teardown()
 
-    mux.HandleFunc("/test_404", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/test_404", func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusNotFound)
-        fmt.Fprint(w, `<?xml version='1.0' encoding='utf-8' ?>
+		fmt.Fprint(w, `<?xml version='1.0' encoding='utf-8' ?>
 <Error>
     <Code>NoSuchKey</Code>
     <Message>The specified key does not exist.</Message>
@@ -108,15 +108,15 @@ func Test_IsNotFoundError(t *testing.T) {
 	resp, _ := client.client.Do(req)
 	err := checkResponse(resp)
 
-    e, ok := IsCOSError(err)
-    if !ok {
-        t.Errorf("IsCOSError Return Failed")
-    }
-    ok = IsNotFoundError(e)
-    if !ok {
-        t.Errorf("IsNotFoundError Return Failed")
-    }
-    if e.Code != "NoSuchKey" {
-        t.Errorf("Expected NoSuchKey error, got %+v", e.Code)
-    }
+	e, ok := IsCOSError(err)
+	if !ok {
+		t.Errorf("IsCOSError Return Failed")
+	}
+	ok = IsNotFoundError(e)
+	if !ok {
+		t.Errorf("IsNotFoundError Return Failed")
+	}
+	if e.Code != "NoSuchKey" {
+		t.Errorf("Expected NoSuchKey error, got %+v", e.Code)
+	}
 }

example/object/append.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"os"
+	"strings"
+	"time"
+
+	"net/http"
+
+	"github.com/agin719/cos-go-sdk-v5"
+	"github.com/tencentyun/cos-go-sdk-v5/debug"
+)
+
+func log_status(err error) {
+	if err == nil {
+		return
+	}
+	if cos.IsNotFoundError(err) {
+		// WARN
+		fmt.Println("WARN: Resource is not existed")
+	} else if e, ok := cos.IsCOSError(err); ok {
+		fmt.Printf("ERROR: Code: %v\n", e.Code)
+		fmt.Printf("ERROR: Message: %v\n", e.Message)
+		fmt.Printf("ERROR: Resource: %v\n", e.Resource)
+		fmt.Printf("ERROR: RequestId: %v\n", e.RequestID)
+		// ERROR
+	} else {
+		fmt.Printf("ERROR: %v\n", err)
+		// ERROR
+	}
+}
+
+func main() {
+	u, _ := url.Parse("http://test-1259654469.cos.ap-guangzhou.myqcloud.com")
+	b := &cos.BaseURL{BucketURL: u}
+	c := cos.NewClient(b, &http.Client{
+		Transport: &cos.AuthorizationTransport{
+			SecretID:  os.Getenv("COS_SECRETID"),
+			SecretKey: os.Getenv("COS_SECRETKEY"),
+			Transport: &debug.DebugRequestTransport{
+				RequestHeader: true,
+				// Notice when put a large file and set need the request body, might happend out of memory error.
+				RequestBody:    false,
+				ResponseHeader: true,
+				ResponseBody:   false,
+			},
+		},
+	})
+
+	opt := &cos.ObjectPutOptions{
+		ObjectPutHeaderOptions: &cos.ObjectPutHeaderOptions{
+			ContentType: "text/html",
+			Listener:    &cos.DefaultProgressListener{},
+		},
+		ACLHeaderOptions: &cos.ACLHeaderOptions{
+			XCosACL: "private",
+		},
+	}
+
+	name := "append" + time.Now().Format(time.RFC3339)
+	str1 := "test append object 1"
+	pos, _, err := c.Object.Append(context.Background(), name, 0, strings.NewReader(str1), opt)
+	log_status(err)
+	fmt.Printf("pos: %d\n", pos)
+
+	str2 := "test append object 2"
+	pos, _, err = c.Object.Append(context.Background(), name, pos, strings.NewReader(str2), opt)
+	log_status(err)
+	fmt.Printf("pos: %d\n", pos)
+
+}

helper.go

@@ -282,16 +282,16 @@ func CloneObjectGetOptions(opt *ObjectGetOptions) *ObjectGetOptions {
 }
 
 func CloneCompleteMultipartUploadOptions(opt *CompleteMultipartUploadOptions) *CompleteMultipartUploadOptions {
-    var res CompleteMultipartUploadOptions
-    if opt != nil {
-        res.XMLName = opt.XMLName
-        if len(opt.Parts) > 0 {
-            res.Parts = make([]Object, len(opt.Parts))
-            copy(res.Parts, opt.Parts)
-        }
-        res.XOptionHeader = cloneHeader(opt.XOptionHeader)
-    }
-    return &res
+	var res CompleteMultipartUploadOptions
+	if opt != nil {
+		res.XMLName = opt.XMLName
+		if len(opt.Parts) > 0 {
+			res.Parts = make([]Object, len(opt.Parts))
+			copy(res.Parts, opt.Parts)
+		}
+		res.XOptionHeader = cloneHeader(opt.XOptionHeader)
+	}
+	return &res
 }
 
 type RangeOptions struct {

object.go

@@ -3,6 +3,7 @@ package cos
 import (
 	"context"
 	"crypto/md5"
+	"encoding/hex"
 	"encoding/json"
 	"encoding/xml"
 	"errors"
@@ -72,7 +73,7 @@ func (s *ObjectService) Get(ctx context.Context, name string, opt *ObjectGetOpti
 		optHeader:        opt,
 		disableCloseBody: true,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 
 	if opt != nil && opt.Listener != nil {
 		if err == nil && resp != nil {
@@ -349,7 +350,7 @@ func (s *ObjectService) Copy(ctx context.Context, name, sourceURL string, opt *O
 		optHeader: copyOpt,
 		result:    &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	// If the error occurs during the copy operation, the error response is embedded in the 200 OK response. This means that a 200 OK response can contain either a success or an error.
 	if err == nil && resp.StatusCode == 200 {
 		if res.ETag == "" {
@@ -389,7 +390,7 @@ func (s *ObjectService) Delete(ctx context.Context, name string, opt ...*ObjectD
 		optHeader: optHeader,
 		optQuery:  optHeader,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -422,7 +423,7 @@ func (s *ObjectService) Head(ctx context.Context, name string, opt *ObjectHeadOp
 		method:    http.MethodHead,
 		optHeader: opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	if resp != nil && resp.Header["X-Cos-Object-Type"] != nil && resp.Header["X-Cos-Object-Type"][0] == "appendable" {
 		resp.Header.Add("x-cos-next-append-position", resp.Header["Content-Length"][0])
 	}
@@ -478,13 +479,11 @@ func (s *ObjectService) PostRestore(ctx context.Context, name string, opt *Objec
 		body:      opt,
 		optHeader: opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 
 	return resp, err
 }
 
-// TODO Append 接口在优化未开放使用
-//
 // Append请求可以将一个文件（Object）以分块追加的方式上传至 Bucket 中。使用Append Upload的文件必须事前被设定为Appendable。
 // 当Appendable的文件被执行Put Object的操作以后，文件被覆盖，属性改变为Normal。
 //
@@ -498,21 +497,59 @@ func (s *ObjectService) PostRestore(ctx context.Context, name string, opt *Objec
 // 当 r 不是 bytes.Buffer/bytes.Reader/strings.Reader 时，必须指定 opt.ObjectPutHeaderOptions.ContentLength
 //
 // https://www.qcloud.com/document/product/436/7741
-// func (s *ObjectService) Append(ctx context.Context, name string, position int, r io.Reader, opt *ObjectPutOptions) (*Response, error) {
-// 	u := fmt.Sprintf("/%s?append&position=%d", encodeURIComponent(name), position)
-// 	if position != 0{
-// 		opt = nil
-// 	}
-// 	sendOpt := sendOptions{
-// 		baseURL:   s.client.BaseURL.BucketURL,
-// 		uri:       u,
-// 		method:    http.MethodPost,
-// 		optHeader: opt,
-// 		body:      r,
-// 	}
-// 	resp, err := s.client.send(ctx, &sendOpt)
-// 	return resp, err
-// }
+func (s *ObjectService) Append(ctx context.Context, name string, position int, r io.Reader, opt *ObjectPutOptions) (int, *Response, error) {
+	res := position
+	if r == nil {
+		return res, nil, fmt.Errorf("reader is nil")
+	}
+	if err := CheckReaderLen(r); err != nil {
+		return res, nil, err
+	}
+	opt = CloneObjectPutOptions(opt)
+	totalBytes, err := GetReaderLen(r)
+	if err != nil && opt != nil && opt.Listener != nil {
+		if opt.ContentLength == 0 {
+			return res, nil, err
+		}
+		totalBytes = opt.ContentLength
+	}
+	if err == nil {
+		// 与 go http 保持一致, 非bytes.Buffer/bytes.Reader/strings.Reader需用户指定ContentLength
+		if opt != nil && opt.ContentLength == 0 && IsLenReader(r) {
+			opt.ContentLength = totalBytes
+		}
+	}
+	reader := TeeReader(r, nil, totalBytes, nil)
+	if s.client.Conf.EnableCRC {
+		reader.writer = md5.New() // MD5校验
+		reader.disableCheckSum = true
+	}
+	if opt != nil && opt.Listener != nil {
+		reader.listener = opt.Listener
+	}
+	u := fmt.Sprintf("/%s?append&position=%d", encodeURIComponent(name), position)
+	sendOpt := sendOptions{
+		baseURL:   s.client.BaseURL.BucketURL,
+		uri:       u,
+		method:    http.MethodPost,
+		optHeader: opt,
+		body:      reader,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+
+	if err == nil {
+		// 数据校验
+		if s.client.Conf.EnableCRC && reader.writer != nil {
+			wanted := hex.EncodeToString(reader.Sum())
+			if wanted != resp.Header.Get("x-cos-content-sha1") {
+				return res, resp, fmt.Errorf("append verification failed, want:%v, return:%v", wanted, resp.Header.Get("x-cos-content-sha1"))
+			}
+		}
+		np, err := strconv.ParseInt(resp.Header.Get("x-cos-next-append-position"), 10, 64)
+		return int(np), resp, err
+	}
+	return res, resp, err
+}
 
 // ObjectDeleteMultiOptions is the option of DeleteMulti
 type ObjectDeleteMultiOptions struct {
@@ -547,7 +584,7 @@ func (s *ObjectService) DeleteMulti(ctx context.Context, opt *ObjectDeleteMultiO
 		body:    opt,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }
 
@@ -1256,7 +1293,7 @@ func (s *ObjectService) Download(ctx context.Context, name string, filepath stri
 			}
 			job := &Jobs{
 				Name:       name,
-				RetryTimes: 3,
+				RetryTimes: 1,
 				FilePath:   filepath,
 				Chunk:      chunk,
 				DownOpt:    &downOpt,
@@ -1340,7 +1377,7 @@ func (s *ObjectService) PutTagging(ctx context.Context, name string, opt *Object
 		method:  http.MethodPut,
 		body:    opt,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }
 
@@ -1361,7 +1398,7 @@ func (s *ObjectService) GetTagging(ctx context.Context, name string, id ...strin
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }
 
@@ -1380,6 +1417,6 @@ func (s *ObjectService) DeleteTagging(ctx context.Context, name string, id ...st
 		uri:     u,
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return resp, err
 }

object_acl.go

@@ -19,7 +19,7 @@ func (s *ObjectService) GetACL(ctx context.Context, name string) (*ObjectGetACLR
 		method:  http.MethodGet,
 		result:  &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	if err == nil {
 		decodeACL(resp, &res)
 	}
@@ -61,6 +61,6 @@ func (s *ObjectService) PutACL(ctx context.Context, name string, opt *ObjectPutA
 		optHeader: header,
 		body:      body,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }

object_part.go

@@ -40,7 +40,7 @@ func (s *ObjectService) InitiateMultipartUpload(ctx context.Context, name string
 		optHeader: opt,
 		result:    &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }
 
@@ -148,7 +148,7 @@ func (s *ObjectService) ListParts(ctx context.Context, name, uploadID string, op
 		result:   &res,
 		optQuery: opt,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return &res, resp, err
 }
 
@@ -209,7 +209,7 @@ func (s *ObjectService) CompleteMultipartUpload(ctx context.Context, name, uploa
 		body:      opt,
 		result:    &res,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	// If the error occurs during the copy operation, the error response is embedded in the 200 OK response. This means that a 200 OK response can contain either a success or an error.
 	if err == nil && resp.StatusCode == 200 {
 		if res.ETag == "" {
@@ -232,7 +232,7 @@ func (s *ObjectService) AbortMultipartUpload(ctx context.Context, name, uploadID
 		uri:     u,
 		method:  http.MethodDelete,
 	}
-	resp, err := s.client.send(ctx, &sendOpt)
+	resp, err := s.client.doRetry(ctx, &sendOpt)
 	return resp, err
 }
 
@@ -328,7 +328,7 @@ func (s *ObjectService) ListUploads(ctx context.Context, opt *ObjectListUploadsO
 		optQuery: opt,
 		result:   &res,
 	}
-	resp, err := s.client.send(ctx, sendOpt)
+	resp, err := s.client.doRetry(ctx, sendOpt)
 	return &res, resp, err
 }
 

object_test.go

@@ -12,6 +12,7 @@ import (
 	"io"
 	"io/ioutil"
 	math_rand "math/rand"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
@@ -101,6 +102,68 @@ func TestObjectService_GetToFile(t *testing.T) {
 	}
 }
 
+func TestObjectService_GetRetry(t *testing.T) {
+	setup()
+	defer teardown()
+	u, _ := url.Parse(server.URL)
+	client := NewClient(&BaseURL{u, u, u, u}, &http.Client{
+		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+			DialContext: (&net.Dialer{
+				Timeout:   30 * time.Second,
+				KeepAlive: 30 * time.Second,
+				DualStack: true,
+			}).DialContext,
+			IdleConnTimeout:       90 * time.Second,
+			TLSHandshakeTimeout:   10 * time.Second,
+			ExpectContinueTimeout: 1 * time.Second,
+			ResponseHeaderTimeout: 1 * time.Second,
+		},
+	})
+	name := "test/hello.txt"
+	contentLength := 1024 * 1024 * 10
+	data := make([]byte, contentLength)
+	index := 0
+	mux.HandleFunc("/test/hello.txt", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "GET")
+		vs := values{
+			"response-content-type": "text/html",
+		}
+		index++
+		if index%3 != 0 {
+			time.Sleep(time.Second * 2)
+		}
+		testFormValues(t, r, vs)
+		strRange := r.Header.Get("Range")
+		slice1 := strings.Split(strRange, "=")
+		slice2 := strings.Split(slice1[1], "-")
+		start, _ := strconv.ParseInt(slice2[0], 10, 64)
+		end, _ := strconv.ParseInt(slice2[1], 10, 64)
+		io.Copy(w, bytes.NewBuffer(data[start:end+1]))
+	})
+	for i := 0; i < 3; i++ {
+		math_rand.Seed(time.Now().UnixNano())
+		rangeStart := math_rand.Intn(contentLength)
+		rangeEnd := rangeStart + math_rand.Intn(contentLength-rangeStart)
+		if rangeEnd == rangeStart || rangeStart >= contentLength-1 {
+			continue
+		}
+		opt := &ObjectGetOptions{
+			ResponseContentType: "text/html",
+			Range:               fmt.Sprintf("bytes=%v-%v", rangeStart, rangeEnd),
+		}
+		resp, err := client.Object.Get(context.Background(), name, opt)
+		if err != nil {
+			t.Fatalf("Object.Get returned error: %v", err)
+		}
+
+		b, _ := ioutil.ReadAll(resp.Body)
+		if bytes.Compare(b, data[rangeStart:rangeEnd+1]) != 0 {
+			t.Errorf("Object.Get Failed")
+		}
+	}
+}
+
 func TestObjectService_GetPresignedURL(t *testing.T) {
 	setup()
 	defer teardown()
@@ -347,46 +410,52 @@ func TestObjectService_PostRestore(t *testing.T) {
 
 }
 
-// func TestObjectService_Append(t *testing.T) {
-// 	setup()
-// 	defer teardown()
-
-// 	opt := &ObjectPutOptions{
-// 		ObjectPutHeaderOptions: &ObjectPutHeaderOptions{
-// 			ContentType: "text/html",
-// 		},
-// 		ACLHeaderOptions: &ACLHeaderOptions{
-// 			XCosACL: "private",
-// 		},
-// 	}
-// 	name := "test/hello.txt"
-// 	position := 0
-
-// 	mux.HandleFunc("/test/hello.txt", func(w http.ResponseWriter, r *http.Request) {
-// 		vs := values{
-// 			"append":   "",
-// 			"position": "0",
-// 		}
-// 		testFormValues(t, r, vs)
-
-// 		testMethod(t, r, http.MethodPost)
-// 		testHeader(t, r, "x-cos-acl", "private")
-// 		testHeader(t, r, "Content-Type", "text/html")
-
-// 		b, _ := ioutil.ReadAll(r.Body)
-// 		v := string(b)
-// 		want := "hello"
-// 		if !reflect.DeepEqual(v, want) {
-// 			t.Errorf("Object.Append request body: %#v, want %#v", v, want)
-// 		}
-// 	})
-
-// 	r := bytes.NewReader([]byte("hello"))
-// 	_, err := client.Object.Append(context.Background(), name, position, r, opt)
-// 	if err != nil {
-// 		t.Fatalf("Object.Append returned error: %v", err)
-// 	}
-// }
+func TestObjectService_Append_Simple(t *testing.T) {
+	setup()
+	defer teardown()
+
+	opt := &ObjectPutOptions{
+		ObjectPutHeaderOptions: &ObjectPutHeaderOptions{
+			ContentType: "text/html",
+		},
+		ACLHeaderOptions: &ACLHeaderOptions{
+			XCosACL: "private",
+		},
+	}
+	name := "test/hello.txt"
+	position := 0
+
+	mux.HandleFunc("/test/hello.txt", func(w http.ResponseWriter, r *http.Request) {
+		vs := values{
+			"append":   "",
+			"position": "0",
+		}
+		testFormValues(t, r, vs)
+
+		testMethod(t, r, http.MethodPost)
+		testHeader(t, r, "x-cos-acl", "private")
+		testHeader(t, r, "Content-Type", "text/html")
+
+		b, _ := ioutil.ReadAll(r.Body)
+		v := string(b)
+		want := "hello"
+		if !reflect.DeepEqual(v, want) {
+			t.Errorf("Object.Append request body: %#v, want %#v", v, want)
+		}
+		w.Header().Add("x-cos-content-sha1", hex.EncodeToString(calMD5Digest(b)))
+		w.Header().Add("x-cos-next-append-position", strconv.FormatInt(int64(len(b)), 10))
+
+	})
+
+	r := bytes.NewReader([]byte("hello"))
+	p, _, err := client.Object.Append(context.Background(), name, position, r, opt)
+	if err != nil {
+		t.Fatalf("Object.Append returned error: %v", err)
+	}
+	if p != len("hello") {
+		t.Fatalf("Object.Append position error, want: %v, return: %v", len("hello"), p)
+	}
+}
 
 func TestObjectService_DeleteMulti(t *testing.T) {
 	setup()
@@ -519,6 +588,52 @@ func TestObjectService_Copy(t *testing.T) {
 	}
 }
 
+func TestObjectService_Append(t *testing.T) {
+	setup()
+	defer teardown()
+	size := 1111 * 1111 * 63
+	b := make([]byte, size)
+	p := int(math_rand.Int31n(int32(size)))
+	var buf bytes.Buffer
+
+	mux.HandleFunc("/test.append", func(w http.ResponseWriter, r *http.Request) {
+		testMethod(t, r, "POST")
+		bs, _ := ioutil.ReadAll(r.Body)
+		buf.Write(bs)
+		w.Header().Add("x-cos-content-sha1", hex.EncodeToString(calMD5Digest(bs)))
+		w.Header().Add("x-cos-next-append-position", strconv.FormatInt(int64(buf.Len()), 10))
+	})
+
+	pos, _, err := client.Object.Append(context.Background(), "test.append", 0, bytes.NewReader(b[:p]), nil)
+	if err != nil {
+		t.Fatalf("Object.Append return error %v", err)
+	}
+	if pos != p {
+		t.Fatalf("Object.Append pos error, returned:%v, wanted:%v", pos, p)
+	}
+
+	opt := &ObjectPutOptions{
+		ObjectPutHeaderOptions: &ObjectPutHeaderOptions{
+			ContentType: "text/html",
+			Listener:    &DefaultProgressListener{},
+		},
+		ACLHeaderOptions: &ACLHeaderOptions{
+			XCosACL: "private",
+		},
+	}
+
+	pos, _, err = client.Object.Append(context.Background(), "test.append", pos, bytes.NewReader(b[p:]), opt)
+	if err != nil {
+		t.Fatalf("Object.Append return error %v", err)
+	}
+	if pos != size {
+		t.Fatalf("Object.Append pos error, returned:%v, wanted:%v", pos, size)
+	}
+	if bytes.Compare(b, buf.Bytes()) != 0 {
+		t.Fatalf("Object.Append Compare failed")
+	}
+}
+
 func TestObjectService_Upload(t *testing.T) {
 	setup()
 	defer teardown()
@@ -833,6 +948,7 @@ func TestObjectService_DownloadWithCheckPoint(t *testing.T) {
 		t.Fatalf("Object.Download failed, odd:%v, even:%v", oddcount, evencount)
 	}
 }
+
 func TestObjectService_GetTagging(t *testing.T) {
 	setup()
 	defer teardown()

progress.go

@@ -52,11 +52,12 @@ func progressCallback(listener ProgressListener, event *ProgressEvent) {
 }
 
 type teeReader struct {
-	reader        io.Reader
-	writer        io.Writer
-	consumedBytes int64
-	totalBytes    int64
-	listener      ProgressListener
+	reader          io.Reader
+	writer          io.Writer
+	consumedBytes   int64
+	totalBytes      int64
+	listener        ProgressListener
+	disableCheckSum bool
 }
 
 func (r *teeReader) Read(p []byte) (int, error) {
@@ -111,13 +112,23 @@ func (r *teeReader) Crc64() uint64 {
 	return 0
 }
 
+func (r *teeReader) Sum() []byte {
+	if r.writer != nil {
+		if th, ok := r.writer.(hash.Hash); ok {
+			return th.Sum(nil)
+		}
+	}
+	return []byte{}
+}
+
 func TeeReader(reader io.Reader, writer io.Writer, total int64, listener ProgressListener) *teeReader {
 	return &teeReader{
-		reader:        reader,
-		writer:        writer,
-		consumedBytes: 0,
-		totalBytes:    total,
-		listener:      listener,
+		reader:          reader,
+		writer:          writer,
+		consumedBytes:   0,
+		totalBytes:      total,
+		listener:        listener,
+		disableCheckSum: false,
 	}
 }