diff --git a/cos.go b/cos.go index 353d555..85c09db 100644 --- a/cos.go +++ b/cos.go @@ -121,7 +121,6 @@ func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method s var reader io.Reader contentType := "" contentMD5 := "" - xsha1 := "" if body != nil { // 上传文件 if r, ok := body.(io.Reader); ok { @@ -134,7 +133,6 @@ func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method s contentType = contentTypeXML reader = bytes.NewReader(b) contentMD5 = base64.StdEncoding.EncodeToString(calMD5Digest(b)) - //xsha1 = base64.StdEncoding.EncodeToString(calSHA1Digest(b)) } } else { contentType = contentTypeXML @@ -156,9 +154,6 @@ func (c *Client) newRequest(ctx context.Context, baseURL *url.URL, uri, method s if contentMD5 != "" { req.Header["Content-MD5"] = []string{contentMD5} } - if xsha1 != "" { - req.Header.Set("x-cos-sha1", xsha1) - } if c.UserAgent != "" { req.Header.Set("User-Agent", c.UserAgent) } diff --git a/object_test.go b/object_test.go index 4f8e25a..fa63e42 100644 --- a/object_test.go +++ b/object_test.go @@ -140,46 +140,46 @@ func TestObjectService_Options(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(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_DeleteMulti(t *testing.T) { setup()