From affd9bde8b80626d8f7731f227a5d35e9e106db0 Mon Sep 17 00:00:00 2001 From: TangBin Date: Mon, 14 Jan 2019 14:20:15 +0800 Subject: [PATCH] fix huawei client package name error --- pkg/util/huawei/client/auth/credentials/doc.go | 1 + pkg/util/huawei/client/auth/doc.go | 1 + pkg/util/huawei/client/auth/signers/doc.go | 1 + pkg/util/huawei/client/{clients.go => client.go} | 2 +- pkg/util/huawei/client/{clients_test.go => client_test.go} | 2 +- pkg/util/huawei/client/doc.go | 1 + pkg/util/huawei/client/manager/doc.go | 1 + pkg/util/huawei/client/modules/doc.go | 1 + pkg/util/huawei/client/requests/doc.go | 1 + pkg/util/huawei/client/responses/doc.go | 1 + pkg/util/huawei/doc.go | 1 + pkg/util/huawei/huawei.go | 2 +- pkg/util/huawei/project.go | 2 +- pkg/util/huawei/provider/doc.go | 1 + pkg/util/huawei/region.go | 6 +++--- 15 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 pkg/util/huawei/client/auth/credentials/doc.go create mode 100644 pkg/util/huawei/client/auth/doc.go create mode 100644 pkg/util/huawei/client/auth/signers/doc.go rename pkg/util/huawei/client/{clients.go => client.go} (99%) rename pkg/util/huawei/client/{clients_test.go => client_test.go} (96%) create mode 100644 pkg/util/huawei/client/doc.go create mode 100644 pkg/util/huawei/client/manager/doc.go create mode 100644 pkg/util/huawei/client/modules/doc.go create mode 100644 pkg/util/huawei/client/requests/doc.go create mode 100644 pkg/util/huawei/client/responses/doc.go create mode 100644 pkg/util/huawei/doc.go create mode 100644 pkg/util/huawei/provider/doc.go diff --git a/pkg/util/huawei/client/auth/credentials/doc.go b/pkg/util/huawei/client/auth/credentials/doc.go new file mode 100644 index 0000000000..ea980c6b2e --- /dev/null +++ b/pkg/util/huawei/client/auth/credentials/doc.go @@ -0,0 +1 @@ +package credentials // import "yunion.io/x/onecloud/pkg/util/huawei/client/auth/credentials" diff --git a/pkg/util/huawei/client/auth/doc.go b/pkg/util/huawei/client/auth/doc.go new file mode 100644 index 0000000000..8f88344f85 --- /dev/null +++ b/pkg/util/huawei/client/auth/doc.go @@ -0,0 +1 @@ +package auth // import "yunion.io/x/onecloud/pkg/util/huawei/client/auth" diff --git a/pkg/util/huawei/client/auth/signers/doc.go b/pkg/util/huawei/client/auth/signers/doc.go new file mode 100644 index 0000000000..ec429b3069 --- /dev/null +++ b/pkg/util/huawei/client/auth/signers/doc.go @@ -0,0 +1 @@ +package signers // import "yunion.io/x/onecloud/pkg/util/huawei/client/auth/signers" diff --git a/pkg/util/huawei/client/clients.go b/pkg/util/huawei/client/client.go similarity index 99% rename from pkg/util/huawei/client/clients.go rename to pkg/util/huawei/client/client.go index 6e561e4d2b..3ccf6cd659 100644 --- a/pkg/util/huawei/client/clients.go +++ b/pkg/util/huawei/client/client.go @@ -1,4 +1,4 @@ -package clients +package client import ( "yunion.io/x/onecloud/pkg/util/huawei/client/auth" diff --git a/pkg/util/huawei/client/clients_test.go b/pkg/util/huawei/client/client_test.go similarity index 96% rename from pkg/util/huawei/client/clients_test.go rename to pkg/util/huawei/client/client_test.go index f9d0145af9..90d0cfc07e 100644 --- a/pkg/util/huawei/client/clients_test.go +++ b/pkg/util/huawei/client/client_test.go @@ -1,4 +1,4 @@ -package clients +package client import ( "fmt" diff --git a/pkg/util/huawei/client/doc.go b/pkg/util/huawei/client/doc.go new file mode 100644 index 0000000000..1e0be87bfe --- /dev/null +++ b/pkg/util/huawei/client/doc.go @@ -0,0 +1 @@ +package client // import "yunion.io/x/onecloud/pkg/util/huawei/client" diff --git a/pkg/util/huawei/client/manager/doc.go b/pkg/util/huawei/client/manager/doc.go new file mode 100644 index 0000000000..2aec5c135e --- /dev/null +++ b/pkg/util/huawei/client/manager/doc.go @@ -0,0 +1 @@ +package manager // import "yunion.io/x/onecloud/pkg/util/huawei/client/manager" diff --git a/pkg/util/huawei/client/modules/doc.go b/pkg/util/huawei/client/modules/doc.go new file mode 100644 index 0000000000..db61f5b3dc --- /dev/null +++ b/pkg/util/huawei/client/modules/doc.go @@ -0,0 +1 @@ +package modules // import "yunion.io/x/onecloud/pkg/util/huawei/client/modules" diff --git a/pkg/util/huawei/client/requests/doc.go b/pkg/util/huawei/client/requests/doc.go new file mode 100644 index 0000000000..7f7b2a0cca --- /dev/null +++ b/pkg/util/huawei/client/requests/doc.go @@ -0,0 +1 @@ +package requests // import "yunion.io/x/onecloud/pkg/util/huawei/client/requests" diff --git a/pkg/util/huawei/client/responses/doc.go b/pkg/util/huawei/client/responses/doc.go new file mode 100644 index 0000000000..13df61a280 --- /dev/null +++ b/pkg/util/huawei/client/responses/doc.go @@ -0,0 +1 @@ +package responses // import "yunion.io/x/onecloud/pkg/util/huawei/client/responses" diff --git a/pkg/util/huawei/doc.go b/pkg/util/huawei/doc.go new file mode 100644 index 0000000000..1f4399ed41 --- /dev/null +++ b/pkg/util/huawei/doc.go @@ -0,0 +1 @@ +package huawei // import "yunion.io/x/onecloud/pkg/util/huawei" diff --git a/pkg/util/huawei/huawei.go b/pkg/util/huawei/huawei.go index d9e2105627..d15456b340 100644 --- a/pkg/util/huawei/huawei.go +++ b/pkg/util/huawei/huawei.go @@ -77,7 +77,7 @@ func NewHuaweiClient(providerId, providerName, accessurl, account, secret string } func (self *SHuaweiClient) fetchRegions() error { - huawei, _ := clients.NewClientWithAccessKey("", "", self.accessKey, self.secret) + huawei, _ := client.NewClientWithAccessKey("", "", self.accessKey, self.secret) regions := make([]SRegion, 0) err := DoList(huawei.Regions.List, nil, ®ions) if err != nil { diff --git a/pkg/util/huawei/project.go b/pkg/util/huawei/project.go index 48f7d6b7b5..a351ab2c3c 100644 --- a/pkg/util/huawei/project.go +++ b/pkg/util/huawei/project.go @@ -34,7 +34,7 @@ func (self *SProject) GetHealthStatus() string { } func (self *SHuaweiClient) fetchProjects() ([]SProject, error) { - huawei, _ := clients.NewClientWithAccessKey("", "", self.accessKey, self.secret) + huawei, _ := client.NewClientWithAccessKey("", "", self.accessKey, self.secret) projects := make([]SProject, 0) err := DoList(huawei.Projects.List, nil, &projects) return projects, err diff --git a/pkg/util/huawei/provider/doc.go b/pkg/util/huawei/provider/doc.go new file mode 100644 index 0000000000..daf3cdb3c0 --- /dev/null +++ b/pkg/util/huawei/provider/doc.go @@ -0,0 +1 @@ +package provider // import "yunion.io/x/onecloud/pkg/util/huawei/provider" diff --git a/pkg/util/huawei/region.go b/pkg/util/huawei/region.go index 32671dcff6..d810840458 100644 --- a/pkg/util/huawei/region.go +++ b/pkg/util/huawei/region.go @@ -21,7 +21,7 @@ type Locales struct { // https://support.huaweicloud.com/api-iam/zh-cn_topic_0067148043.html type SRegion struct { client *SHuaweiClient - ecsClient *clients.Client + ecsClient *client.Client Description string `json:"description"` ID string `json:"id"` @@ -35,7 +35,7 @@ type SRegion struct { storageCache *SStoragecache } -func (self *SRegion) getECSClient() (*clients.Client, error) { +func (self *SRegion) getECSClient() (*client.Client, error) { var err error if len(self.client.projectId) > 0 { @@ -52,7 +52,7 @@ func (self *SRegion) getECSClient() (*clients.Client, error) { } if self.ecsClient == nil { - self.ecsClient, err = clients.NewClientWithAccessKey(self.ID, self.client.projectId, self.client.accessKey, self.client.secret) + self.ecsClient, err = client.NewClientWithAccessKey(self.ID, self.client.projectId, self.client.accessKey, self.client.secret) if err != nil { return nil, err }