Merge pull request #71 from qiniu/develop

QCOS-0 Release 2.3.0

.gitignore

@@ -27,7 +27,7 @@ _testmain.go
 *.out
 
 # external packages folder
-vendor/
+# vendor/
 
 # ds_store files
-.DS_Store
+.DS_Store

.travis.yml

@@ -15,8 +15,6 @@ install:
   - go get -v github.com/Masterminds/glide
   - cd $GOPATH/src/github.com/Masterminds/glide && git checkout 84607742b10f492430762d038e954236bbaf23f7 && go install
   - cd $PROJECT_ROOT/kirk
-  - echo $GOPATH
-  - glide --debug install
 
 script:
   - make style

CHANGELOG.md

@@ -1,5 +1,9 @@
 # vNext
 
+# Release 2.3.0
+- SpecInfo 添加 Regions 字段
+- 增加 list grants 接口
+
 # Release 2.2.0
 - vendorManaged 应用状态的response 改details为message
 - ListRepoTags和GetImageConfig 支持获取imagesize

kirksdk/account_api.go

@@ -98,6 +98,9 @@ type AccountClient interface {
 	// GetGrantedAppKey 获取被授权应用的key
 	GetGrantedAppKey(ctx context.Context, appURI string) (ret GrantedAppKey, err error)
 
+	// ListGrants 获取自己授权给别人的应用列表
+	ListGrants(ctx context.Context) (ret []GrantInfo, err error)
+
 	// GetAppspecs 获得应用模板信息
 	GetAppspecs(ctx context.Context, specURI string) (ret SpecInfo, err error)
 
@@ -228,6 +231,13 @@ type GrantedAppKey struct {
 	Sk string `json:"sk"`
 }
 
+// GrantInfo 应用授权信息
+type GrantInfo struct {
+	Account   string    `json:"account"`
+	AppURI    string    `json:"appuri"`
+	CreatedAt time.Time `json:"ctime"`
+}
+
 // SpecInfo 包含 Spec 的相关信息
 type SpecInfo struct {
 	URI        string    `json:"uri"`
@@ -241,6 +251,7 @@ type SpecInfo struct {
 	Seedimg    string    `json:"seedimg"`
 	Entryport  uint16    `json:"entryport"`
 	Privileges []string  `json:"privileges"`
+	Regions    []string  `json:"regions"`
 	Ctime      time.Time `json:"ctime"`
 	Mtime      time.Time `json:"mtime"`
 }

kirksdk/account_client.go

@@ -149,6 +149,12 @@ func (p *accountClientImp) CreateAppGrant(ctx context.Context, appURI, username
 	return
 }
 
+func (p *accountClientImp) ListGrants(ctx context.Context) (ret []GrantInfo, err error) {
+	url := fmt.Sprintf("%s%s/grants", p.host, appVersionPrefix)
+	err = p.client.Call(ctx, &ret, "GET", url)
+	return
+}
+
 func (p *accountClientImp) DeleteAppGrant(ctx context.Context, appURI, username string) (err error) {
 	url := fmt.Sprintf("%s%s/apps/%s/grants/%s", p.host, appVersionPrefix, appURI, username)
 	err = p.client.Call(ctx, nil, "DELETE", url)

kirksdk/kirksdk.go

@@ -1,3 +1,3 @@
 package kirksdk
 
-const Version = "2.2.0"
+const Version = "2.3.0"