[apisix-dashboard] branch master updated: fix: avoid nil pointer dereference and remove redundant code (#2031)

[juzhiyuan]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 5843138  fix: avoid nil pointer dereference and remove redundant code 
(#2031)
5843138 is described below

commit 58431388a242fb0a64a56b7be7738187a01fa76f
Author: okaybase <75366457+okayb...@users.noreply.github.com>
AuthorDate: Wed Aug 4 08:00:44 2021 +0800

    fix: avoid nil pointer dereference and remove redundant code (#2031)
    
    Co-authored-by: lixingwang <lixingw...@yiche.com>
---
 api/internal/handler/data_loader/route_export.go | 10 +++-------
 api/test/e2e/base.go                             |  2 +-
 api/test/e2enew/base/http.go                     |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

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 @@ func (h *Handler) RouteToOpenAPI3(c droplet.Context, routes 
[]*entity.Route) (*o
                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 (h *Handler) RouteToOpenAPI3(c droplet.Context, 
routes []*entity.Route) (*o
 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 @@ func init() {
 
        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 @@ func httpRequest(method, url string, headers 
map[string]string, reqBody string)
        }
        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 {