admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle error for type assertion

Browse Source 
Signed-off-by: huanggze <loganhuang@yunify.com>
This commit is contained in:
huanggze
2019-08-24 16:01:35 +08:00
parent 429573c837
commit 82488ac37a
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/simple/client/elasticsearch/interface.go
View File

@@ -56,15 +56,17 @@ func detectVersionMajor(cfg *Config) error {
}
if res.IsError() {
// Print the response status and error information.
return fmt.Errorf("[%s] %s: %s",
res.Status(),
b["error"].(map[string]interface{})["type"],
b["error"].(map[string]interface{})["reason"],
)
e, _ := b["error"].(map[string]interface{})
return fmt.Errorf("[%s] %s: %s", res.Status(), e["type"], e["reason"])
}
// get the major version
version := fmt.Sprintf("%v", b["version"].(map[string]interface{})["number"])
cfg.VersionMajor = strings.Split(version, ".")[0]
version, _ := b["version"].(map[string]interface{})
number, _ := version["number"].(string)
if number == "" {
return fmt.Errorf("failed to detect elastic version number")
}
cfg.VersionMajor = strings.Split(number, ".")[0]
return nil
}

10
pkg/simple/client/elasticsearch/versions/v5/elasticsearch.go
View File

@@ -41,11 +41,8 @@ func (e Elastic) Search(body []byte) ([]byte, error) {
return nil, err
} else {
// Print the response status and error information.
return nil, fmt.Errorf("[%s] %s: %s",
response.Status(),
e["error"].(map[string]interface{})["type"],
e["error"].(map[string]interface{})["reason"],
)
e, _ := e["error"].(map[string]interface{})
return nil, fmt.Errorf("[%s] %s: %s", response.Status(), e["type"], e["reason"])
}
}
@@ -53,5 +50,6 @@ func (e Elastic) Search(body []byte) ([]byte, error) {
}
func (e Elastic) GetTotalHitCount(v interface{}) int64 {
return int64(v.(float64))
f, _ := v.(float64)
return int64(f)
}

10
pkg/simple/client/elasticsearch/versions/v6/elasticsearch.go
View File

@@ -41,11 +41,8 @@ func (e Elastic) Search(body []byte) ([]byte, error) {
return nil, err
} else {
// Print the response status and error information.
return nil, fmt.Errorf("[%s] %s: %s",
response.Status(),
e["error"].(map[string]interface{})["type"],
e["error"].(map[string]interface{})["reason"],
)
e, _ := e["error"].(map[string]interface{})
return nil, fmt.Errorf("[%s] %s: %s", response.Status(), e["type"], e["reason"])
}
}
@@ -53,5 +50,6 @@ func (e Elastic) Search(body []byte) ([]byte, error) {
}
func (e Elastic) GetTotalHitCount(v interface{}) int64 {
return int64(v.(float64))
f, _ := v.(float64)
return int64(f)
}

11
pkg/simple/client/elasticsearch/versions/v7/elasticsearch.go
View File

@@ -42,11 +42,8 @@ func (e Elastic) Search(body []byte) ([]byte, error) {
return nil, err
} else {
// Print the response status and error information.
return nil, fmt.Errorf("[%s] %s: %s",
response.Status(),
e["error"].(map[string]interface{})["type"],
e["error"].(map[string]interface{})["reason"],
)
e, _ := e["error"].(map[string]interface{})
return nil, fmt.Errorf("[%s] %s: %s", response.Status(), e["type"], e["reason"])
}
}
@@ -54,5 +51,7 @@ func (e Elastic) Search(body []byte) ([]byte, error) {
}
func (e Elastic) GetTotalHitCount(v interface{}) int64 {
return int64(v.(map[string]interface{})["value"].(float64))
m, _ := v.(map[string]interface{})
f, _ := m["value"].(float64)
return int64(f)
}