Skip to content

Commit ea07006

Browse files
committed
provider.go: pass the provider.CredentialInfo to getClientSchema directly
1 parent 8fb0e70 commit ea07006

2 files changed

Lines changed: 7 additions & 16 deletions

File tree

provider.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,11 @@ func (p *Provider) getClient() error {
101101
}
102102

103103
func (p *Provider) getClientWithZone(zone string) error {
104-
cred := NewCredentialInfo(p.AccessKeyID, p.AccessKeySecret, p.RegionID)
105104
var err error
106105
if len(zone) == 0 {
107-
p.client, err = getClient(cred)
106+
p.client, err = getClient(&p.CredentialInfo)
108107
} else {
109-
p.client, err = getClient(cred, zone)
108+
p.client, err = getClient(&p.CredentialInfo, zone)
110109
}
111110
if err != nil {
112111
return err

schema.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,13 @@ type keyPair struct {
4747
Value string
4848
}
4949

50-
func NewCredentialInfo(accessKeyID, accessKeySecret, regionID string) *CredentialInfo {
51-
if accessKeyID == "" || accessKeySecret == "" {
52-
return nil
53-
}
54-
if len(regionID) == 0 {
55-
regionID = defaultRegionID
50+
func getClientSchema(cred *CredentialInfo, scheme string) (*aliClientSchema, error) {
51+
if cred.AccessKeyID == "" || cred.AccessKeySecret == "" {
52+
return nil, errors.New("empty AccessKeyID or AccessKeySecret")
5653
}
57-
return &CredentialInfo{
58-
AccessKeyID: accessKeyID,
59-
AccessKeySecret: accessKeySecret,
60-
RegionID: regionID,
54+
if len(cred.RegionID) == 0 {
55+
cred.RegionID = defaultRegionID
6156
}
62-
}
63-
64-
func getClientSchema(cred *CredentialInfo, scheme string) (*aliClientSchema, error) {
6557
return defaultSchemaV3(cred, scheme)
6658
}
6759

0 commit comments

Comments
 (0)