[apisix-dashboard] branch master updated: fix: CI failed (#1594)

[chenjunxu]

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

chenjunxu 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 648fe3b  fix: CI failed (#1594)
648fe3b is described below

commit 648fe3b21e48d7cc804786088f34ec44aa53362f
Author: nic-chen <33000667+nic-c...@users.noreply.github.com>
AuthorDate: Mon Mar 15 19:13:53 2021 +0800

    fix: CI failed (#1594)
---
 .github/workflows/make-build.yaml              | 4 +++-
 api/internal/core/entity/entity.go             | 2 +-
 api/test/shell/cli_test.sh                     | 2 ++
 web/cypress/fixtures/export-route-dataset.json | 9 +++------
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/make-build.yaml 
b/.github/workflows/make-build.yaml
index 197c40e..96f19ed 100644
--- a/.github/workflows/make-build.yaml
+++ b/.github/workflows/make-build.yaml
@@ -41,7 +41,9 @@ jobs:
 
       - name: start dashboard
         working-directory: ./output
-        run: ./manager-api > ./api.log 2>&1 &
+        run: |
+          ./manager-api > ./api.log 2>&1 &
+          sleep 5
 
       - name: check
         run: api/test/shell/manager_smoking.sh -s true
diff --git a/api/internal/core/entity/entity.go 
b/api/internal/core/entity/entity.go
index feac18b..d6c9516 100644
--- a/api/internal/core/entity/entity.go
+++ b/api/internal/core/entity/entity.go
@@ -81,7 +81,7 @@ type Route struct {
        Hosts           []string               `json:"hosts,omitempty"`
        RemoteAddr      string                 `json:"remote_addr,omitempty"`
        RemoteAddrs     []string               `json:"remote_addrs,omitempty"`
-       Vars            interface{}            `json:"vars,omitempty"`
+       Vars            []interface{}          `json:"vars,omitempty"`
        FilterFunc      string                 `json:"filter_func,omitempty"`
        Script          interface{}            `json:"script,omitempty"`
        ScriptID        interface{}            `json:"script_id,omitempty"` // 
For debug and optimization(cache), currently same as Route's ID
diff --git a/api/test/shell/cli_test.sh b/api/test/shell/cli_test.sh
index 749c297..ee68074 100755
--- a/api/test/shell/cli_test.sh
+++ b/api/test/shell/cli_test.sh
@@ -269,6 +269,7 @@ if [ ! $code -eq 403 ]; then
 fi
 
 ./manager-api stop
+sleep 6
 clean_up
 
 
@@ -411,6 +412,7 @@ if [ ! $count ] || [ $count -ne 1 ]; then
 fi
 
 ./manager-api stop
+sleep 6
 clean_up
 
 # mtls test
diff --git a/web/cypress/fixtures/export-route-dataset.json 
b/web/cypress/fixtures/export-route-dataset.json
index 46d53c0..6762933 100644
--- a/web/cypress/fixtures/export-route-dataset.json
+++ b/web/cypress/fixtures/export-route-dataset.json
@@ -46,8 +46,7 @@
             },
             "type": "roundrobin",
             "pass_host": "pass"
-          },
-          "x-apisix-vars": []
+          }
         }
       }
     }
@@ -99,8 +98,7 @@
             },
             "type": "roundrobin",
             "pass_host": "pass"
-          },
-          "x-apisix-vars": []
+          }
         }
       },
       "/{params}-APISIX-REPEAT-URI-2": {
@@ -151,8 +149,7 @@
             },
             "type": "roundrobin",
             "pass_host": "pass"
-          },
-          "x-apisix-vars": []
+          }
         }
       }
     }