Modify some non-standard code styles

oss/bucket_test.go

@@ -59,15 +59,14 @@ func (s *OssBucketSuite) SetUpSuite(c *C) {
 	testLogger.Println("test bucket started")
 }
 
-
 // TearDownSuite runs before each test or benchmark starts running.
 func (s *OssBucketSuite) TearDownSuite(c *C) {
 	for _, bucket := range []*Bucket{s.bucket, s.archiveBucket} {
 		// Delete multipart
 		keyMarker := KeyMarker("")
-		uploadIdMarker := UploadIDMarker("")
+		uploadIDMarker := UploadIDMarker("")
 		for {
-			lmu, err := bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+			lmu, err := bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 			c.Assert(err, IsNil)
 			for _, upload := range lmu.Uploads {
 				imur := InitiateMultipartUploadResult{Bucket: bucketName, Key: upload.Key, UploadID: upload.UploadID}
@@ -75,7 +74,7 @@ func (s *OssBucketSuite) TearDownSuite(c *C) {
 				c.Assert(err, IsNil)
 			}
 			keyMarker = KeyMarker(lmu.NextKeyMarker)
-			uploadIdMarker = UploadIDMarker(lmu.NextUploadIDMarker)
+			uploadIDMarker = UploadIDMarker(lmu.NextUploadIDMarker)
 			if !lmu.IsTruncated {
 				break
 			}
@@ -2290,7 +2289,7 @@ func (s *OssBucketSuite) getObject(objects []ObjectProperties, object string) (b
 }
 
 func (s *OssBucketSuite) detectUploadSpeed(bucket *Bucket, c *C) (upSpeed int) {
-	objectName := objectNamePrefix + getUuid()
+	objectName := objectNamePrefix + randStr(8)
 
 	// 1M byte
 	textBuffer := randStr(1024 * 1024)
@@ -2320,12 +2319,11 @@ func (s *OssBucketSuite) TestPutSingleObjectLimitSpeed(c *C) {
 		// go version is less than go1.7,not support limit upload speed
 		// doesn't run this test
 		return
-	} else {
-		// set unlimited again
-		client.LimitUploadSpeed(0)
 	}
+	// set unlimited again
+	client.LimitUploadSpeed(0)
 
-	bucketName := bucketNamePrefix + randLowStr(5)
+	bucketName := bucketNamePrefix + randLowStr(6)
 	err = client.CreateBucket(bucketName)
 	c.Assert(err, IsNil)
 
@@ -2347,7 +2345,7 @@ func (s *OssBucketSuite) TestPutSingleObjectLimitSpeed(c *C) {
 	err = client.LimitUploadSpeed(limitSpeed / perTokenBandwidthSize)
 	c.Assert(err, IsNil)
 
-	objectName := objectNamePrefix + getUuid()
+	objectName := objectNamePrefix + randStr(8)
 
 	// 1M byte
 	textBuffer := randStr(1024 * 1024)
@@ -2403,12 +2401,11 @@ func (s *OssBucketSuite) TestPutManyObjectLimitSpeed(c *C) {
 		// go version is less than go1.7,not support limit upload speed
 		// doesn't run this test
 		return
-	} else {
-		// set unlimited
-		client.LimitUploadSpeed(0)
 	}
+	// set unlimited
+	client.LimitUploadSpeed(0)
 
-	bucketName := bucketNamePrefix + randLowStr(5)
+	bucketName := bucketNamePrefix + randLowStr(6)
 	err = client.CreateBucket(bucketName)
 	c.Assert(err, IsNil)
 
@@ -2429,8 +2426,8 @@ func (s *OssBucketSuite) TestPutManyObjectLimitSpeed(c *C) {
 	c.Assert(err, IsNil)
 
 	// object1
-	objectNameFirst := objectNamePrefix + getUuid()
-	objectNameSecond := objectNamePrefix + getUuid()
+	objectNameFirst := objectNamePrefix + randStr(8)
+	objectNameSecond := objectNamePrefix + randStr(8)
 
 	// 1M byte
 	textBuffer := randStr(1024 * 1024)
@@ -2494,12 +2491,11 @@ func (s *OssBucketSuite) TestPutMultipartObjectLimitSpeed(c *C) {
 		// go version is less than go1.7,not support limit upload speed
 		// doesn't run this test
 		return
-	} else {
-		// set unlimited
-		client.LimitUploadSpeed(0)
 	}
+	// set unlimited
+	client.LimitUploadSpeed(0)
 
-	bucketName := bucketNamePrefix + randLowStr(5)
+	bucketName := bucketNamePrefix + randLowStr(6)
 	err = client.CreateBucket(bucketName)
 	c.Assert(err, IsNil)
 
@@ -2521,7 +2517,7 @@ func (s *OssBucketSuite) TestPutMultipartObjectLimitSpeed(c *C) {
 	err = client.LimitUploadSpeed(limitSpeed / perTokenBandwidthSize)
 	c.Assert(err, IsNil)
 
-	objectName := objectNamePrefix + getUuid()
+	objectName := objectNamePrefix + randStr(8)
 	fileName := "." + string(os.PathSeparator) + objectName
 
 	// 1M byte
@@ -2597,12 +2593,11 @@ func (s *OssBucketSuite) TestPutObjectFromFileLimitSpeed(c *C) {
 		// go version is less than go1.7,not support limit upload speed
 		// doesn't run this test
 		return
-	} else {
-		// set unlimited
-		client.LimitUploadSpeed(0)
 	}
+	// set unlimited
+	client.LimitUploadSpeed(0)
 
-	bucketName := bucketNamePrefix + randLowStr(5)
+	bucketName := bucketNamePrefix + randLowStr(6)
 	err = client.CreateBucket(bucketName)
 	c.Assert(err, IsNil)
 
@@ -2624,7 +2619,7 @@ func (s *OssBucketSuite) TestPutObjectFromFileLimitSpeed(c *C) {
 	err = client.LimitUploadSpeed(limitSpeed / perTokenBandwidthSize)
 	c.Assert(err, IsNil)
 
-	objectName := objectNamePrefix + getUuid()
+	objectName := objectNamePrefix + randStr(8)
 	fileName := "." + string(os.PathSeparator) + objectName
 
 	// 1M byte
@@ -2702,12 +2697,11 @@ func (s *OssBucketSuite) TestUploadObjectLimitSpeed(c *C) {
 		// go version is less than go1.7,not support limit upload speed
 		// doesn't run this test
 		return
-	} else {
-		// set unlimited
-		client.LimitUploadSpeed(0)
 	}
+	// set unlimited
+	client.LimitUploadSpeed(0)
 
-	bucketName := bucketNamePrefix + randLowStr(5)
+	bucketName := bucketNamePrefix + randLowStr(6)
 	err = client.CreateBucket(bucketName)
 	c.Assert(err, IsNil)
 
@@ -2716,7 +2710,7 @@ func (s *OssBucketSuite) TestUploadObjectLimitSpeed(c *C) {
 
 	//first:upload a object
 	textBuffer := randStr(1024 * 100)
-	objectName := objectNamePrefix + getUuid()
+	objectName := objectNamePrefix + randStr(8)
 	err = bucket.PutObject(objectName, strings.NewReader(textBuffer))
 	c.Assert(err, IsNil)
 

oss/client.go

@@ -650,9 +650,9 @@ func (client Client) GetBucketInfo(bucketName string) (GetBucketInfoResult, erro
 	return out, err
 }
 
-// LimitUploadSpeed: set upload bandwidth limit speed,default is 0,unlimited
-// upSpeed: KB/s, 0 is unlimited,default is 0
-// error:it's nil if success, otherwise failure
+// LimitUploadSpeed set upload bandwidth limit speed,default is 0,unlimited
+// upSpeed KB/s, 0 is unlimited,default is 0
+// error it's nil if success, otherwise failure
 func (client Client) LimitUploadSpeed(upSpeed int) error {
 	if client.Config == nil {
 		return fmt.Errorf("client config is nil")
@@ -789,7 +789,7 @@ func SetLogLevel(LogLevel int) ClientOption {
 }
 
 //
-// SetLogLevel sets the oss sdk log level
+// SetLogger sets the oss sdk logger
 //
 func SetLogger(Logger *log.Logger) ClientOption {
 	return func(client *Client) {

oss/client_test.go

@@ -15,7 +15,6 @@ import (
 	"testing"
 	"time"
 
-	uuid "github.com/satori/go.uuid"
 	. "gopkg.in/check.v1"
 )
 
@@ -47,12 +46,12 @@ var (
 
 var (
 	// prefix of bucket name for bucket ops test
-	bucketNamePrefix = "go-sdk-test-bucket-abcx-"
+	bucketNamePrefix = "go-sdk-test-bucket-"
 	// bucket name for object ops test
-	bucketName        = bucketNamePrefix + "for-object-" + randLowStr(6)
-	archiveBucketName = bucketNamePrefix + "for-archive-" + randLowStr(6)
+	bucketName        = bucketNamePrefix + randLowStr(6)
+	archiveBucketName = bucketNamePrefix + "arch-" + randLowStr(6)
 	// object name for object ops test
-	objectNamePrefix = "go-sdk-test-object-abcx-"
+	objectNamePrefix = "go-sdk-test-object-"
 	// sts region is one and only hangzhou
 	stsRegion = "cn-hangzhou"
 )
@@ -65,10 +64,11 @@ var (
 	timeoutInOperation = 3 * time.Second
 )
 
-var randMarker = rand.New(rand.NewSource(time.Now().UnixNano()))
+//var randMarker = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 func randStr(n int) string {
 	b := make([]rune, n)
+	randMarker := rand.New(rand.NewSource(time.Now().UnixNano()))
 	for i := range b {
 		b[i] = letters[randMarker.Intn(len(letters))]
 	}
@@ -87,12 +87,6 @@ func randLowStr(n int) string {
 	return strings.ToLower(randStr(n))
 }
 
-func getUuid() string {
-	uniqId, _ := uuid.NewV4()
-	uniqKey := uniqId.String()
-	return uniqKey
-}
-
 // SetUpSuite runs once when the suite starts running
 func (s *OssClientSuite) SetUpSuite(c *C) {
 	client, err := New(endpoint, accessID, accessKey)
@@ -144,9 +138,9 @@ func (s *OssClientSuite) deleteBucket(client *Client, bucketName string, c *C) {
 
 	// Delete Part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: bucketName,
@@ -155,7 +149,7 @@ func (s *OssClientSuite) deleteBucket(client *Client, bucketName string, c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}
@@ -242,7 +236,7 @@ func (s *OssClientSuite) TestCreateBucket(c *C) {
 
 	// Create bucket with configuration and test GetBucketInfo
 	for _, storage := range []StorageClassType{StorageStandard, StorageIA, StorageArchive} {
-		bucketNameTest := bucketNamePrefix + randLowStr(5)
+		bucketNameTest := bucketNamePrefix + randLowStr(6)
 		err = client.CreateBucket(bucketNameTest, StorageClass(storage), ACL(ACLPublicRead))
 		c.Assert(err, IsNil)
 		time.Sleep(timeoutInOperation)
@@ -264,7 +258,7 @@ func (s *OssClientSuite) TestCreateBucket(c *C) {
 
 	// Create bucket with configuration and test ListBuckets
 	for _, storage := range []StorageClassType{StorageStandard, StorageIA, StorageArchive} {
-		bucketNameTest := bucketNamePrefix + randLowStr(5)
+		bucketNameTest := bucketNamePrefix + randLowStr(6)
 		err = client.CreateBucket(bucketNameTest, StorageClass(storage))
 		c.Assert(err, IsNil)
 		time.Sleep(timeoutInOperation)
@@ -298,7 +292,7 @@ func (s *OssClientSuite) TestCreateBucketNegative(c *C) {
 	testLogger.Println(err)
 
 	// ACL invalid
-	err = client.CreateBucket(bucketNamePrefix + randLowStr(6), ACL("InvaldAcl"))
+	err = client.CreateBucket(bucketNamePrefix+randLowStr(6), ACL("InvaldAcl"))
 	c.Assert(err, NotNil)
 	testLogger.Println(err)
 }
@@ -1556,7 +1550,7 @@ func (s *OssClientSuite) TestHttpLogNotSignUrl(c *C) {
 
 	client.Config.Logger = log.New(f, "", log.LstdFlags)
 
-	var testBucketName = bucketNamePrefix + strings.ToLower(randStr(5))
+	var testBucketName = bucketNamePrefix + randLowStr(6)
 
 	// CreateBucket
 	err = client.CreateBucket(testBucketName)
@@ -1586,7 +1580,7 @@ func (s *OssClientSuite) TestHttpLogSignUrl(c *C) {
 	client.Config.LogLevel = Debug
 	client.Config.Logger = log.New(f, "", log.LstdFlags)
 
-	var testBucketName = bucketNamePrefix + strings.ToLower(randStr(5))
+	var testBucketName = bucketNamePrefix + randLowStr(6)
 
 	// CreateBucket
 	err = client.CreateBucket(testBucketName)

oss/conf.go

@@ -8,6 +8,7 @@ import (
 	"time"
 )
 
+// Define the level of the output log
 const (
 	LogOff = iota
 	Error
@@ -16,6 +17,7 @@ const (
 	Debug
 )
 
+// LogTag Tag for each level of log
 var LogTag = []string{"[error]", "[warn]", "[info]", "[debug]"}
 
 // HTTPTimeout defines HTTP timeout.
@@ -27,6 +29,7 @@ type HTTPTimeout struct {
 	IdleConnTimeout  time.Duration
 }
 
+// HTTPMaxConns defines max idle connections and max idle connections per host
 type HTTPMaxConns struct {
 	MaxIdleConns        int
 	MaxIdleConnsPerHost int
@@ -59,10 +62,10 @@ type Config struct {
 	UploadLimiter    *OssLimiter  // Bandwidth limit reader for upload
 }
 
-// LimitUploadSpeed, uploadSpeed:KB/s, 0 is unlimited,default is 0
+// LimitUploadSpeed uploadSpeed:KB/s, 0 is unlimited,default is 0
 func (config *Config) LimitUploadSpeed(uploadSpeed int) error {
 	if uploadSpeed < 0 {
-		return fmt.Errorf("erro,speed is less than 0")
+		return fmt.Errorf("invalid argument, the value of uploadSpeed is less than 0")
 	} else if uploadSpeed == 0 {
 		config.UploadLimitSpeed = 0
 		config.UploadLimiter = nil
@@ -77,7 +80,7 @@ func (config *Config) LimitUploadSpeed(uploadSpeed int) error {
 	return err
 }
 
-// WriteLog
+// WriteLog output log function
 func (config *Config) WriteLog(LogLevel int, format string, a ...interface{}) {
 	if config.LogLevel < LogLevel || config.Logger == nil {
 		return

oss/conn.go

@@ -112,7 +112,7 @@ func (conn Conn) DoURL(method HTTPMethod, signedURL string, headers map[string]s
 	publishProgress(listener, event)
 
 	if conn.config.LogLevel >= Debug {
-		conn.LoggerHttpReq(req)
+		conn.LoggerHTTPReq(req)
 	}
 
 	resp, err := conn.client.Do(req)
@@ -125,7 +125,7 @@ func (conn Conn) DoURL(method HTTPMethod, signedURL string, headers map[string]s
 
 	if conn.config.LogLevel >= Debug {
 		//print out http resp
-		conn.LoggerHttpResp(req, resp)
+		conn.LoggerHTTPResp(req, resp)
 	}
 
 	// Transfer completed
@@ -241,7 +241,7 @@ func (conn Conn) doRequest(method string, uri *url.URL, canonicalizedResource st
 	publishProgress(listener, event)
 
 	if conn.config.LogLevel >= Debug {
-		conn.LoggerHttpReq(req)
+		conn.LoggerHTTPReq(req)
 	}
 
 	resp, err := conn.client.Do(req)
@@ -255,7 +255,7 @@ func (conn Conn) doRequest(method string, uri *url.URL, canonicalizedResource st
 
 	if conn.config.LogLevel >= Debug {
 		//print out http resp
-		conn.LoggerHttpResp(req, resp)
+		conn.LoggerHTTPResp(req, resp)
 	}
 
 	// Transfer completed
@@ -457,7 +457,8 @@ func (conn Conn) handleResponse(resp *http.Response, crc hash.Hash64) (*Response
 	}, nil
 }
 
-func (conn Conn) LoggerHttpReq(req *http.Request) {
+// LoggerHTTPReq Print the header information of the http request
+func (conn Conn) LoggerHTTPReq(req *http.Request) {
 	var logBuffer bytes.Buffer
 	logBuffer.WriteString(fmt.Sprintf("[Req:%p]Method:%s\t", req, req.Method))
 	logBuffer.WriteString(fmt.Sprintf("Host:%s\t", req.URL.Host))
@@ -478,7 +479,8 @@ func (conn Conn) LoggerHttpReq(req *http.Request) {
 	conn.config.WriteLog(Debug, "%s\n", logBuffer.String())
 }
 
-func (conn Conn) LoggerHttpResp(req *http.Request, resp *http.Response) {
+// LoggerHTTPResp Print Response to http request
+func (conn Conn) LoggerHTTPResp(req *http.Request, resp *http.Response) {
 	var logBuffer bytes.Buffer
 	logBuffer.WriteString(fmt.Sprintf("[Resp:%p]StatusCode:%d\t", req, resp.StatusCode))
 	logBuffer.WriteString(fmt.Sprintf("Header info:"))

oss/crc_test.go

@@ -40,9 +40,9 @@ func (s *OssCrcSuite) SetUpSuite(c *C) {
 func (s *OssCrcSuite) TearDownSuite(c *C) {
 	// Delete part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
@@ -51,7 +51,7 @@ func (s *OssCrcSuite) TearDownSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}

oss/download_test.go

@@ -36,9 +36,9 @@ func (s *OssDownloadSuite) SetUpSuite(c *C) {
 func (s *OssDownloadSuite) TearDownSuite(c *C) {
 	// Delete part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
@@ -47,7 +47,7 @@ func (s *OssDownloadSuite) TearDownSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}

oss/limit_reader_1_7.go

@@ -15,13 +15,13 @@ const (
 	perTokenBandwidthSize int = 1024
 )
 
-// OssLimiter: wrapper rate.Limiter
+// OssLimiter wrapper rate.Limiter
 type OssLimiter struct {
 	limiter *rate.Limiter
 }
 
-// GetOssLimiter:create OssLimiter
-// uploadSpeed:KB/s
+// GetOssLimiter create OssLimiter
+// uploadSpeed KB/s
 func GetOssLimiter(uploadSpeed int) (ossLimiter *OssLimiter, err error) {
 	limiter := rate.NewLimiter(rate.Limit(uploadSpeed), uploadSpeed)
 
@@ -33,7 +33,7 @@ func GetOssLimiter(uploadSpeed int) (ossLimiter *OssLimiter, err error) {
 	}, nil
 }
 
-// LimitSpeedReader: for limit bandwidth upload
+// LimitSpeedReader for limit bandwidth upload
 type LimitSpeedReader struct {
 	io.ReadCloser
 	reader     io.Reader
@@ -73,10 +73,9 @@ func (r *LimitSpeedReader) Read(p []byte) (n int, err error) {
 			err = fmt.Errorf("LimitSpeedReader.Read() failure,ReserveN error,start:%d,end:%d,burst:%d,perTokenBandwidthSize:%d",
 				start, end, burst, perTokenBandwidthSize)
 			return
-		} else {
-			timeDelay := re.Delay()
-			time.Sleep(timeDelay)
 		}
+		timeDelay := re.Delay()
+		time.Sleep(timeDelay)
 	}
 	return
 }

oss/model.go

@@ -19,6 +19,7 @@ func (r *Response) Read(p []byte) (n int, err error) {
 	return r.Body.Read(p)
 }
 
+// Close close http reponse body
 func (r *Response) Close() error {
 	return r.Body.Close()
 }

oss/multicopy_test.go

@@ -35,9 +35,9 @@ func (s *OssCopySuite) SetUpSuite(c *C) {
 func (s *OssCopySuite) TearDownSuite(c *C) {
 	// Delete Part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: bucketName,
@@ -46,7 +46,7 @@ func (s *OssCopySuite) TearDownSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}

oss/multipart_test.go

@@ -34,9 +34,9 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 
 	// Delete part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
@@ -45,7 +45,7 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}
@@ -73,9 +73,9 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 func (s *OssBucketMultipartSuite) TearDownSuite(c *C) {
 	// Delete part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
@@ -84,7 +84,7 @@ func (s *OssBucketMultipartSuite) TearDownSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}

oss/progress_test.go

@@ -15,7 +15,6 @@ import (
 type OssProgressSuite struct {
 	client *Client
 	bucket *Bucket
-
 }
 
 var _ = Suite(&OssProgressSuite{})
@@ -40,9 +39,9 @@ func (s *OssProgressSuite) SetUpSuite(c *C) {
 func (s *OssProgressSuite) TearDownSuite(c *C) {
 	// Abort multipart uploads
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmu, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmu, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmu.Uploads {
 			imur := InitiateMultipartUploadResult{Bucket: bucketName, Key: upload.Key, UploadID: upload.UploadID}
@@ -50,12 +49,12 @@ func (s *OssProgressSuite) TearDownSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmu.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmu.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmu.NextUploadIDMarker)
 		if !lmu.IsTruncated {
 			break
 		}
 	}
-	
+
 	// Delete objects
 	marker := Marker("")
 	for {

oss/upload_test.go

@@ -36,9 +36,9 @@ func (s *OssUploadSuite) SetUpSuite(c *C) {
 func (s *OssUploadSuite) TearDownSuite(c *C) {
 	// Delete part
 	keyMarker := KeyMarker("")
-	uploadIdMarker := UploadIDMarker("")
+	uploadIDMarker := UploadIDMarker("")
 	for {
-		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := s.bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		c.Assert(err, IsNil)
 		for _, upload := range lmur.Uploads {
 			var imur = InitiateMultipartUploadResult{Bucket: s.bucket.BucketName,
@@ -47,7 +47,7 @@ func (s *OssUploadSuite) TearDownSuite(c *C) {
 			c.Assert(err, IsNil)
 		}
 		keyMarker = KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}