Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: CI failed #1594

Merged
merged 4 commits into from
Mar 15, 2021
Merged

fix: CI failed #1594

merged 4 commits into from
Mar 15, 2021

Conversation

nic-chen
Copy link
Member

@nic-chen nic-chen commented Mar 15, 2021

Please answer these questions before submitting a pull request

  • Why submit this pull request?

  • Bugfix

  • New feature provided

  • Improve performance

  • Backport patches

  • Related issues


Bugfix

  • Description
    Vars in struct Route uses interface{} as the type, which makes it impossible to omit an empty array.

As a result, after APISIX uses the new version of lua-resty-radixtree, The routes with empty array vars cannot be matched

  • How to fix?

uses []interface{} instead. and also fix some small potential unstable issues

@codecov-io
Copy link

codecov-io commented Mar 15, 2021

Codecov Report

Merging #1594 (3de5c16) into master (e22de29) will increase coverage by 1.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1594      +/-   ##
==========================================
+ Coverage   69.01%   70.05%   +1.03%     
==========================================
  Files         132       46      -86     
  Lines        5374     3019    -2355     
  Branches      592        0     -592     
==========================================
- Hits         3709     2115    -1594     
+ Misses       1417      659     -758     
+ Partials      248      245       -3     
Flag Coverage Δ
backend-e2e-test 60.64% <ø> (?)
backend-e2e-test-ginkgo 46.00% <ø> (-0.27%) ⬇️
backend-unit-test 51.50% <ø> (-0.04%) ⬇️
frontend-e2e-test ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
api/internal/core/store/store.go 86.14% <0.00%> (-1.81%) ⬇️
api/internal/core/storage/etcd.go 42.72% <0.00%> (-0.91%) ⬇️
...nts/PluginOrchestration/components/SidebarItem.tsx
...eb/src/components/PluginOrchestration/constants.ts
web/src/components/PluginOrchestration/index.tsx
...b/src/pages/User/components/LoginMethodExample.tsx
web/src/services/tool.ts
web/src/components/LabelsfDrawer/LabelsDrawer.tsx
web/src/components/HeaderDropdown/index.tsx
web/src/components/Plugin/PluginDetail.tsx
... and 87 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e22de29...3de5c16. Read the comment docs.

@nic-chen nic-chen changed the title fix: use APISIX 2.4 to run backend E2E test fix: CI failed Mar 15, 2021
@nic-chen nic-chen marked this pull request as ready for review March 15, 2021 07:46
@nic-chen nic-chen requested review from starsz, gxthrj and Jaycean March 15, 2021 07:46
@@ -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"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why should the data format be modified here? Whether it has influence on the existing FE and BE logic.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same question as @Jaycean.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Jaycean please take a look at Bugfix Description, I wrote the reason there.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, my question. I didn't read the description carefully.

Copy link
Member

@Jaycean Jaycean Mar 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @nic-chen
FE CI failed:https://github.com/apache/apisix-dashboard/pull/1594/checks?check_run_id=2110905208
Remove the corresponding data: "x-apimix-vars": []

Copy link
Member

@Jaycean Jaycean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line of code also needs to be removed:

Copy link
Member

@Jaycean Jaycean left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@liuxiran liuxiran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for fe e2e changs

@nic-chen nic-chen merged commit 648fe3b into apache:master Mar 15, 2021
@nic-chen nic-chen deleted the fix-ci-failed branch March 15, 2021 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants