From d28a3fa28a4a97e3d1708b7e3a452fd500aad762 Mon Sep 17 00:00:00 2001
From: tgic <farmer1992@gmail.com>
Date: Mon, 15 Jun 2015 20:03:32 +0800
Subject: [PATCH] add endpoint support

---
 docs/storage/driver/oss/oss.go      |  8 ++++++++
 docs/storage/driver/oss/oss_test.go | 20 +++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 docs/storage/driver/oss/oss.go
 mode change 100755 => 100644 docs/storage/driver/oss/oss_test.go

diff --git a/docs/storage/driver/oss/oss.go b/docs/storage/driver/oss/oss.go
old mode 100755
new mode 100644
index 9c52d5773..91ab4b1aa
--- a/docs/storage/driver/oss/oss.go
+++ b/docs/storage/driver/oss/oss.go
@@ -56,6 +56,7 @@ type DriverParameters struct {
 	Secure          bool
 	ChunkSize       int64
 	RootDirectory   string
+	Endpoint        string
 }
 
 func init() {
@@ -175,6 +176,11 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
 		rootDirectory = ""
 	}
 
+	endpoint, ok := parameters["endpoint"]
+	if !ok {
+		endpoint = ""
+	}
+
 	params := DriverParameters{
 		AccessKeyID:     fmt.Sprint(accessKey),
 		AccessKeySecret: fmt.Sprint(secretKey),
@@ -185,6 +191,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
 		Encrypt:         encryptBool,
 		Secure:          secureBool,
 		Internal:        internalBool,
+		Endpoint:        fmt.Sprint(endpoint),
 	}
 
 	return New(params)
@@ -195,6 +202,7 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
 func New(params DriverParameters) (*Driver, error) {
 
 	client := oss.NewOSSClient(params.Region, params.Internal, params.AccessKeyID, params.AccessKeySecret, params.Secure)
+	client.SetEndpoint(params.Endpoint)
 	bucket := client.Bucket(params.Bucket)
 
 	// Validate that the given credentials have at least read permissions in the
diff --git a/docs/storage/driver/oss/oss_test.go b/docs/storage/driver/oss/oss_test.go
old mode 100755
new mode 100644
index ecfe36e9d..2b469f34f
--- a/docs/storage/driver/oss/oss_test.go
+++ b/docs/storage/driver/oss/oss_test.go
@@ -27,6 +27,7 @@ func init() {
 	internal := os.Getenv("OSS_INTERNAL")
 	encrypt := os.Getenv("OSS_ENCRYPT")
 	secure := os.Getenv("OSS_SECURE")
+	endpoint := os.Getenv("OSS_ENDPOINT")
 	root, err := ioutil.TempDir("", "driver-")
 	if err != nil {
 		panic(err)
@@ -59,15 +60,16 @@ func init() {
 		}
 
 		parameters := DriverParameters{
-			accessKey,
-			secretKey,
-			bucket,
-			alioss.Region(region),
-			internalBool,
-			encryptBool,
-			secureBool,
-			minChunkSize,
-			rootDirectory,
+			AccessKeyID:     accessKey,
+			AccessKeySecret: secretKey,
+			Bucket:          bucket,
+			Region:          alioss.Region(region),
+			Internal:        internalBool,
+			ChunkSize:       minChunkSize,
+			RootDirectory:   rootDirectory,
+			Encrypt:         encryptBool,
+			Secure:          secureBool,
+			Endpoint:        endpoint,
 		}
 
 		return New(parameters)