opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正：client newsession时候，如果token没有service catalog，导致fatal

Browse Source 
error
This commit is contained in:
Qiu Jian
2018-08-24 11:47:46 +08:00
parent 42ca6924d8
commit 644e19e23f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/mcclient.go
+5 -3
View File
@@ -311,10 +311,12 @@ func (this *Client) SetProject(tenantId, tenantName string, token TokenCredentia
func (this *Client) NewSession(region, zone, endpointType string, token TokenCredential, apiVersion string) *ClientSession {
cata := token.GetServiceCatalog()
if cata == nil {
log.Fatalf("Missing service catalog in token")
if this.serviceCatalog == nil {
if cata == nil {
log.Fatalf("Missing service catalog in token")
}
this.serviceCatalog = cata
}
this.serviceCatalog = cata
return &ClientSession{client: this, region: region, zone: zone,
endpointType: endpointType, token: token,
apiVersion: apiVersion,