Skip to content

pathx uga #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lixiaojun629 merged 1 commit into from
Jul 12, 2019
Merged

pathx uga #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export VERSION=0.1.19
export VERSION=0.1.20

.PHONY : build
build:
Expand Down
8 changes: 7 additions & 1 deletion base/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package base

import (
ppathx "github.com/ucloud/ucloud-sdk-go/private/services/pathx"
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"
Expand All @@ -25,9 +26,12 @@ type PrivateUHostClient = puhost.UHostClient
//PrivateUDBClient 私有模块的udb client 即未在官网开放的接口
type PrivateUDBClient = pudb.UDBClient

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

//PrivatePathxClient 私有模块的pathx client 即未在官网开放的接口
type PrivatePathxClient = ppathx.PathXClient

//Client aggregate client for business
type Client struct {
uaccount.UAccountClient
Expand All @@ -44,6 +48,7 @@ type Client struct {
PrivateUHostClient
PrivateUDBClient
PrivateUMemClient
PrivatePathxClient
}

// NewClient will return a aggregate client
Expand All @@ -63,5 +68,6 @@ func NewClient(config *ucloud.Config, credential *auth.Credential) *Client {
*puhost.NewClient(config, credential),
*pudb.NewClient(config, credential),
*pumem.NewClient(config, credential),
*ppathx.NewClient(config, credential),
}
}
2 changes: 1 addition & 1 deletion base/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const DefaultBaseURL = "https://api.ucloud.cn/"
const DefaultProfile = "default"

//Version 版本号
const Version = "0.1.19"
const Version = "0.1.20"

//ConfigIns 配置实例, 程序加载时生成
var ConfigIns = &AggConfig{Profile: "default"}
Expand Down
4 changes: 4 additions & 0 deletions cmd/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,10 @@ func NewCmdConfigUpdate() *cobra.Command {
cacheConfig.Region = region
cacheConfig.Zone = zone

if cfg.ProjectID != "" {
cacheConfig.ProjectID = base.PickResourceID(cfg.ProjectID)
}

project, err := getReasonableProject(cacheConfig)
if err != nil {
base.HandleError(err)
Expand Down
2 changes: 1 addition & 1 deletion cmd/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ func getUDBList(states []string, dbType, project, region, zone string) ([]udb.UD
}
}
} else {
list = append(list, resp.DataSet...)
list = append(list, ins)
}
}
if offset+limit >= resp.TotalCount {
Expand Down
Loading