fix: avoid nil pointer dereference and remove redundant code (#2031)
Co-authored-by: lixingwang <lixingwang@yiche.com>
diff --git a/api/internal/handler/data_loader/route_export.go b/api/internal/handler/data_loader/route_export.go
index f1ca901..aa8218c 100644
--- a/api/internal/handler/data_loader/route_export.go
+++ b/api/internal/handler/data_loader/route_export.go
@@ -177,7 +177,7 @@
if err != nil {
log.Errorf("ParseRouteUpstream err: ", err)
return nil, err
- } else if err == nil && _upstream != nil {
+ } else if _upstream != nil {
extensions["x-apisix-upstream"] = _upstream
}
@@ -292,12 +292,8 @@
func ParseLabels(route *entity.Route, serviceLabels map[string]string) (map[string]string, error) {
if route.Labels != nil {
return route.Labels, nil
- } else if route.Labels == nil && route.ServiceID != nil {
- if serviceLabels != nil {
- return serviceLabels, nil
- } else if serviceLabels == nil {
- return nil, nil
- }
+ } else if route.ServiceID != nil {
+ return serviceLabels, nil
}
return nil, nil
}
diff --git a/api/test/e2e/base.go b/api/test/e2e/base.go
index 0d9a333..dd9d901 100644
--- a/api/test/e2e/base.go
+++ b/api/test/e2e/base.go
@@ -54,10 +54,10 @@
url := ManagerAPIHost + "/apisix/admin/user/login"
req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(requestBody))
- req.Header.Add("Content-Type", "application/json")
if err != nil {
panic(err)
}
+ req.Header.Add("Content-Type", "application/json")
client := &http.Client{}
resp, err := client.Do(req)
diff --git a/api/test/e2enew/base/http.go b/api/test/e2enew/base/http.go
index fda1593..81c1226 100644
--- a/api/test/e2enew/base/http.go
+++ b/api/test/e2enew/base/http.go
@@ -59,10 +59,10 @@
}
req, err := http.NewRequest(method, url, requestBody)
- req.Close = true
if err != nil {
return nil, 0, err
}
+ req.Close = true
// set header
for key, val := range headers {
