修改配置传入的方式

nelsonken · Mar 15, 2018 · 6c98642 · 6c98642
1 parent 1f2ab50
commit 6c98642
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/cos/bucket_test.go b/cos/bucket_test.go
@@ -37,7 +37,7 @@ func TestBucket_UploadObjectBySlice(t *testing.T) {
 	ctx := GetTimeoutCtx(time.Second * 30)
 	dst := "testfile_slice"
 	src := "testfiles/test.zip"
-	err := client.Bucket(bu).UploadObjectBySlice(ctx, dst, src, 3)
+	err := client.Bucket(bu).UploadObjectBySlice(ctx, dst, src, 3, nil)
 	if err != nil {
 		t.Error(err)
 	}

diff --git a/cos/client.go b/cos/client.go
@@ -12,13 +12,13 @@ type Client struct {
 }
 
 // New cos包的入口
-func New(appID, secretID, secretKey, region string) *Client {
+func New(o *Option) *Client {
 	client := Client{}
 	conf := getDefaultConf()
-	conf.AppID = appID
-	conf.SecretID = secretID
-	conf.SecretKey = secretKey
-	conf.Region = region
+	conf.AppID = o.AppID
+	conf.SecretID = o.SecretID
+	conf.SecretKey = o.SecretKey
+	conf.Region = o.Region
 
 	conn := Conn{&http.Client{}, conf}
 	client.conn = &conn

diff --git a/cos/option.go b/cos/option.go
@@ -0,0 +1,8 @@
+package cos
+
+type Option struct {
+	AppID     string `mapstructure:"app_id" json:"app_id"`
+	SecretID  string `mapstructure:"secret_id" json:"secret_id"`
+	SecretKey string `mapstructure:"secret_key" json:"secret_key"`
+	Region    string `mapstructure:"region" json:"region"`
+}
diff --git a/cos/setup_test.go b/cos/setup_test.go
@@ -12,7 +12,7 @@ const (
 )
 
 func setUp() {
-	client = New("1254217795", "AKIDkOq6C6qLgstiMqmGF2d3HKBpHYeZlpAH", "Rny65tVv9BQuHUVKxOehZFqJbifYN7g3", "ap-chengdu")
+	client = New(&Option{"1254217795", "AKIDkOq6C6qLgstiMqmGF2d3HKBpHYeZlpAH", "Rny65tVv9BQuHUVKxOehZFqJbifYN7g3", "ap-chengdu"})
 }
 
 func assert(want, condition, got interface{}) {