Skip to content

Commit

Permalink
Merge pull request #21 from lixiaojun629/develop
Browse files Browse the repository at this point in the history
 preliminary support umem
  • Loading branch information
lixiaojun629 authored Mar 14, 2019
2 parents 558e18f + f6ee34c commit c36b4f7
Show file tree
Hide file tree
Showing 7 changed files with 470 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export VERSION=0.1.11
export VERSION=0.1.12

.PHONY : build
build:
Expand Down
9 changes: 9 additions & 0 deletions base/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ package base
import (
pudb "github.com/ucloud/ucloud-sdk-go/private/services/udb"
puhost "github.com/ucloud/ucloud-sdk-go/private/services/uhost"
pumem "github.com/ucloud/ucloud-sdk-go/private/services/umem"
"github.com/ucloud/ucloud-sdk-go/services/pathx"
"github.com/ucloud/ucloud-sdk-go/services/uaccount"
"github.com/ucloud/ucloud-sdk-go/services/udb"
"github.com/ucloud/ucloud-sdk-go/services/udisk"
"github.com/ucloud/ucloud-sdk-go/services/udpn"
"github.com/ucloud/ucloud-sdk-go/services/uhost"
"github.com/ucloud/ucloud-sdk-go/services/ulb"
"github.com/ucloud/ucloud-sdk-go/services/umem"
"github.com/ucloud/ucloud-sdk-go/services/unet"
"github.com/ucloud/ucloud-sdk-go/services/vpc"
"github.com/ucloud/ucloud-sdk-go/ucloud"
Expand All @@ -22,6 +24,9 @@ type PrivateUHostClient = puhost.UHostClient
//PrivateUDBClient 私有模块的udb client 即未在官网开放的接口
type PrivateUDBClient = pudb.UDBClient

//PrivateUMemClient 私有模块的udb client 即未在官网开放的接口
type PrivateUMemClient = pumem.UMemClient

//Client aggregate client for business
type Client struct {
uaccount.UAccountClient
Expand All @@ -33,8 +38,10 @@ type Client struct {
udisk.UDiskClient
ulb.ULBClient
udb.UDBClient
umem.UMemClient
PrivateUHostClient
PrivateUDBClient
PrivateUMemClient
}

// NewClient will return a aggregate client
Expand All @@ -49,7 +56,9 @@ func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
*udisk.NewClient(config, credential),
*ulb.NewClient(config, credential),
*udb.NewClient(config, credential),
*umem.NewClient(config, credential),
*puhost.NewClient(config, credential),
*pudb.NewClient(config, credential),
*pumem.NewClient(config, credential),
}
}
2 changes: 1 addition & 1 deletion base/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const DefaultBaseURL = "https://api.ucloud.cn/"
const DefaultProfile = "default"

//Version 版本号
const Version = "0.1.11"
const Version = "0.1.12"

//ConfigIns 配置实例, 程序加载时生成
var ConfigIns = &AggConfig{}
Expand Down
2 changes: 2 additions & 0 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ func NewCmdRoot() *cobra.Command {
cmd.AddCommand(NewCmdUDPN(out))
cmd.AddCommand(NewCmdULB())
cmd.AddCommand(NewCmdMysql())
cmd.AddCommand(NewCmdRedis())
cmd.AddCommand(NewCmdMemcache())

return cmd
}
Expand Down
Loading

0 comments on commit c36b4f7

Please sign in to comment.