Forráskód Böngészése

fix code that is not concise and safe

hangzws 6 éve
szülő
commit
2eea7e3d00
6 módosított fájl, 32 hozzáadás és 33 törlés
  1. 1 6
      sample/append_object.go
  2. 6 7
      sample/cname_sample.go
  3. 3 3
      sample/comm.go
  4. 5 10
      sample/config.go
  5. 9 5
      sample/get_object.go
  6. 8 2
      sample/sign_url.go

+ 1 - 6
sample/append_object.go

@@ -149,12 +149,7 @@ func AppendObjectSample() {
 	// Case 6: Set the storage classes.OSS provides three storage classes: Standard, Infrequent Access, and Archive.
 	// Upload a strings, and you can append some strings in the behind of object. but the object is 'Archive' storange class.
 	// An object created with the AppendObject operation is an appendable object. set the object storange-class to 'Archive'.
-	nextPos = 0
-	nextPos, err = bucket.AppendObject(archiveObjectAppendKey, strings.NewReader("昨夜雨疏风骤,浓睡不消残酒。试问卷帘人,"), nextPos, oss.ObjectStorageClass("Archive"))
-	if err != nil {
-		HandleError(err)
-	}
-	nextPos, err = bucket.AppendObject(archiveObjectAppendKey, strings.NewReader("却道海棠依旧。知否?知否?应是绿肥红瘦。"), nextPos)
+	nextPos, err = bucket.AppendObject(appendObjectKey, strings.NewReader("昨夜雨疏风骤,浓睡不消残酒。试问卷帘人,"), nextPos, oss.ObjectStorageClass("Archive"))
 	if err != nil {
 		HandleError(err)
 	}

+ 6 - 7
sample/cname_sample.go

@@ -11,26 +11,25 @@ import (
 // CnameSample shows the cname usage
 func CnameSample() {
 	// New client
-	client, err := oss.New(endpoint4Cname, accessID4Cname, accessKey4Cname,
-		oss.UseCname(true))
+	client, err := oss.New(endpoint4Cname, accessID, accessKey, oss.UseCname(true))
 	if err != nil {
 		HandleError(err)
 	}
 
 	// Create bucket
-	err = client.CreateBucket(bucketName4Cname)
+	err = client.CreateBucket(bucketName)
 	if err != nil {
 		HandleError(err)
 	}
 
 	// Set bucket ACL
-	err = client.SetBucketACL(bucketName4Cname, oss.ACLPrivate)
+	err = client.SetBucketACL(bucketName, oss.ACLPrivate)
 	if err != nil {
 		HandleError(err)
 	}
 
 	// Look up bucket ACL
-	gbar, err := client.GetBucketACL(bucketName4Cname)
+	gbar, err := client.GetBucketACL(bucketName)
 	if err != nil {
 		HandleError(err)
 	}
@@ -42,7 +41,7 @@ func CnameSample() {
 		HandleError(err)
 	}
 
-	bucket, err := client.Bucket(bucketName4Cname)
+	bucket, err := client.Bucket(bucketName)
 	if err != nil {
 		HandleError(err)
 	}
@@ -74,7 +73,7 @@ func CnameSample() {
 	}
 
 	// Get object to file
-	err = bucket.GetObjectToFile(objectKey, newPicName)
+	err = bucket.GetObjectToFile(objectKey, localFile)
 	if err != nil {
 		HandleError(err)
 	}

+ 3 - 3
sample/comm.go

@@ -103,9 +103,9 @@ func DeleteTestBucketAndObject(bucketName string) error {
 
 	// Delete part
 	keyMarker := oss.KeyMarker("")
-	uploadIdMarker := oss.UploadIDMarker("")
+	uploadIDMarker := oss.UploadIDMarker("")
 	for {
-		lmur, err := bucket.ListMultipartUploads(keyMarker, uploadIdMarker)
+		lmur, err := bucket.ListMultipartUploads(keyMarker, uploadIDMarker)
 		if err != nil {
 			return err
 		}
@@ -118,7 +118,7 @@ func DeleteTestBucketAndObject(bucketName string) error {
 			}
 		}
 		keyMarker = oss.KeyMarker(lmur.NextKeyMarker)
-		uploadIdMarker = oss.UploadIDMarker(lmur.NextUploadIDMarker)
+		uploadIDMarker = oss.UploadIDMarker(lmur.NextUploadIDMarker)
 		if !lmur.IsTruncated {
 			break
 		}

+ 5 - 10
sample/config.go

@@ -11,21 +11,16 @@ var (
 	kmsID      = os.Getenv("OSS_TEST_KMS_ID")
 
 	// The cname endpoint
-	// These information are required to run sample/cname_sample
-	endpoint4Cname   = os.Getenv("OSS_TEST_ENDPOINT")
-	accessID4Cname   = os.Getenv("OSS_TEST_ACCESS_KEY_ID")
-	accessKey4Cname  = os.Getenv("OSS_TEST_ACCESS_KEY_SECRET")
-	bucketName4Cname = os.Getenv("OSS_TEST_CNAME_BUCKET")
+	endpoint4Cname = os.Getenv("OSS_TEST_CNAME_ENDPOINT")
 )
 
 const (
 
 	// The object name in the sample code
-	objectKey              string = "my-object"
-	archiveObjectAppendKey string = "my-object-append"
+	objectKey       string = "my-object"
+	appendObjectKey string = "my-object-append"
 
 	// The local files to run sample code.
-	localFile     string = "src/sample/BingWallpaper-2015-11-07.jpg"
-	htmlLocalFile string = "src/sample/The Go Programming Language.html"
-	newPicName    string = "src/sample/NewBingWallpaper-2015-11-07.jpg"
+	localFile     string = "sample/BingWallpaper-2015-11-07.jpg"
+	htmlLocalFile string = "sample/The Go Programming Language.html"
 )

+ 9 - 5
sample/get_object.go

@@ -10,7 +10,7 @@ import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 )
 
-// GetObjectSample shows the streaming download, range download and resumable download. 
+// GetObjectSample shows the streaming download, range download and resumable download.
 func GetObjectSample() {
 	// Create bucket
 	bucket, err := GetTestBucket(bucketName)
@@ -29,12 +29,13 @@ func GetObjectSample() {
 	if err != nil {
 		HandleError(err)
 	}
+
 	data, err := ioutil.ReadAll(body)
 	body.Close()
 	if err != nil {
 		HandleError(err)
 	}
-	data = data // use data
+	fmt.Println("size of data is: ", len(data))
 
 	// Case 2: Download the object to byte array. This is for small object.
 	buf := new(bytes.Buffer)
@@ -72,11 +73,13 @@ func GetObjectSample() {
 		HandleError(err)
 	}
 	body.Close()
+
 	// Last modified time contraint is not met, do not download the file
-	_, err = bucket.GetObject(objectKey, oss.IfUnmodifiedSince(pastDate))
+	body, err = bucket.GetObject(objectKey, oss.IfUnmodifiedSince(pastDate))
 	if err == nil {
 		HandleError(err)
 	}
+	body.Close()
 
 	meta, err := bucket.GetObjectDetailedMeta(objectKey)
 	if err != nil {
@@ -95,6 +98,7 @@ func GetObjectSample() {
 	if err == nil {
 		HandleError(err)
 	}
+	body.Close()
 
 	// Case 6: Big file's multipart download, concurrent and resumable download is supported.
 	// multipart download with part size 100KB. By default single coroutine is used and no checkpoint
@@ -114,8 +118,8 @@ func GetObjectSample() {
 	if err != nil {
 		HandleError(err)
 	}
-	
-	// Specify the checkpoint file path to record which parts have been downloaded. 
+
+	// Specify the checkpoint file path to record which parts have been downloaded.
 	// This file path can be specified by the 2nd parameter of Checkpoint, it will be the download directory if the file path is empty.
 	err = bucket.DownloadFile(objectKey, "mynewfile-3.jpg", 100*1024, oss.Checkpoint(true, "mynewfile.cp"))
 	if err != nil {

+ 8 - 2
sample/sign_url.go

@@ -3,6 +3,7 @@ package sample
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 	"strings"
 
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
@@ -54,10 +55,15 @@ func SignURLSample() {
 	if err != nil {
 		HandleError(err)
 	}
+	defer body.Close()
+
 	// Read content
 	data, err := ioutil.ReadAll(body)
-	body.Close()
-	data = data // use data
+	if err != nil {
+		fmt.Println("Error:", err)
+		os.Exit(-1)
+	}
+	fmt.Println("data:", string(data))
 
 	err = bucket.GetObjectToFileWithURL(signedURL, "mynewfile-1.jpg")
 	if err != nil {