feat: basic support Apache APISIX 2.9 #2117

bzp2010 · 2021-09-02T16:00:35Z

Why submit this pull request?

Bugfix
New feature provided
Improve performance
Backport patches

What changes will this PR take into?

Provide basic support for Apache APISIX 2.9. Includes changes to the upstream property definition.

Checklist:

Did you explain what problem does this PR solve? Or what new features have been added?
Have you added corresponding test cases?
Have you modified the corresponding document?
Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

netlify · 2021-09-02T16:00:49Z

✔️ Deploy Preview for apisix-dashboard ready!

🔨 Explore the source changes: 5e26fc4

🔍 Inspect the deploy log: https://app.netlify.com/sites/apisix-dashboard/deploys/61321d8d9b94d0000725d6b7

😎 Browse the preview: https://deploy-preview-2117--apisix-dashboard.netlify.app

codecov-commenter · 2021-09-02T18:46:58Z

Codecov Report

Merging #2117 (6efa271) into master (1a0b12b) will increase coverage by 0.16%.
The diff coverage is 100.00%.

❗ Current head 6efa271 differs from pull request most recent head 5e26fc4. Consider uploading reports for the commit 5e26fc4 to get more accurate results

@@            Coverage Diff             @@
##           master    #2117      +/-   ##
==========================================
+ Coverage   67.31%   67.48%   +0.16%     
==========================================
  Files         124      126       +2     
  Lines        3283     3294      +11     
  Branches      800      802       +2     
==========================================
+ Hits         2210     2223      +13     
+ Misses       1073     1071       -2

Flag	Coverage Δ
frontend-e2e-test	`67.48% <100.00%> (+0.16%)`	⬆️

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

Impacted Files	Coverage Δ
web/src/components/Plugin/UI/limit-conn.tsx	`100.00% <100.00%> (ø)`
web/src/components/Upstream/UpstreamForm.tsx	`92.40% <100.00%> (+0.19%)`	⬆️
...c/components/Upstream/components/KeepalivePool.tsx	`100.00% <100.00%> (ø)`
...rc/components/Upstream/components/RetryTimeout.tsx	`100.00% <100.00%> (ø)`
web/src/helpers.tsx	`73.77% <0.00%> (+3.27%)`	⬆️

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 1a0b12b...5e26fc4. Read the comment docs.

liuxiran · 2021-09-02T23:52:50Z

@nic-chen please help to review, thanks a lot

.github/workflows/backend-cli-test.yml

.github/workflows/go-lint.yml

api/conf/schema.json

nic-chen · 2021-09-03T01:32:35Z

api/test/e2enew/upstream/upstream_retry.go

+			ExpectStatus: http.StatusOK,
+		})
+	})
+})


Need dp test, please refer to APISIX related test

starsz · 2021-09-03T07:43:27Z

api/internal/core/entity/entity.go

-	UnHealthy              UnHealthy `json:"unhealthy,omitempty"`
-	ReqHeaders             []string  `json:"req_headers,omitempty"`
+	Type                   string       `json:"type,omitempty"`
+	Timeout                TimeoutValue `json:"timeout,omitempty"`


Why change this to float32?

There are two "number" definitions in jsonschema, one is an integer, the other is number, where number runs to store float values. Such as 5.5

Therefore, a float value is used here to store.

In addition, only map[string]interface{} was used to store the value before, and there was ambiguity in the data type. Crash may occur during runtime. This is also the reason for this modification.（add a Timeout struct）

liuxiran · 2021-09-03T08:18:08Z

api/internal/core/entity/entity.go

@@ -97,10 +97,11 @@ type Route struct {
 }

 // --- structures for upstream start  ---
+type TimeoutValue float32


There are two "number" definitions in jsonschema, one is an integer, the other is number, where number runs to store float values. Such as 5.5

Therefore, a float value is used here to store.

In addition, only map[string]interface{} was used to store the value before, and there was ambiguity in the data type. Crash may occur during runtime. This is also the reason for this modification.（add a Timeout struct）

cc @nic-chen @starsz

so do we support timeout 5.5s?

It seems that float is ok

api/conf/schema.json

liuxiran · 2021-09-03T13:42:36Z

all CI passed @starsz @nic-chen please review again, thanks a lot

feat: update json schema file

3eac496

bzp2010 added enhancement New feature or request frontend backend labels Sep 2, 2021

bzp2010 requested review from juzhiyuan, liuxiran and nic-chen September 2, 2021 16:00

bzp2010 self-assigned this Sep 2, 2021

bzp2010 added 3 commits September 3, 2021 00:06

feat: update entity definition

bd5d3b0

feat: add new upstream property to frontend

10f7dcd

fix: ci test 1

b46d470

bzp2010 force-pushed the feat-support-290 branch from 52bc53b to 1837ca7 Compare September 2, 2021 18:46

bzp2010 force-pushed the feat-support-290 branch 2 times, most recently from 3923974 to 567cce5 Compare September 2, 2021 18:56

fix: unit test

6c7184f

bzp2010 force-pushed the feat-support-290 branch from 567cce5 to 6c7184f Compare September 2, 2021 18:59

fix: cli test

2278ebe

bzp2010 force-pushed the feat-support-290 branch from b07b192 to 36e2761 Compare September 2, 2021 19:17

fix: lint

86b5ba7

bzp2010 force-pushed the feat-support-290 branch from 36e2761 to 86b5ba7 Compare September 2, 2021 19:18

bzp2010 added 3 commits September 3, 2021 03:28

feat: add upstream backend e2e test

a9dc4c2

feat: add upstream frontend e2e test

e62c722

fix: backend e2e test

1246c7d

fix: limit-conn plugin form and e2e test

12d5cde

liuxiran marked this pull request as ready for review September 3, 2021 00:55

liuxiran requested a review from starsz September 3, 2021 01:18

nic-chen reviewed Sep 3, 2021

View reviewed changes

fix: fe ci error

159565d

starsz reviewed Sep 3, 2021

View reviewed changes

liuxiran reviewed Sep 3, 2021

View reviewed changes

api/conf/schema.json Outdated Show resolved Hide resolved

liuxiran added 7 commits September 3, 2021 17:09

fix: review

2574756

fix: etcd 3.4.13

76d73b9

Merge branch 'master' into feat-support-290

752f3eb

fix: run test with apisix2.9

bfc97ca

fix: ci

6d5b36f

fix: ci

4dc4c9a

fix: ci

5e26fc4

nic-chen approved these changes Sep 3, 2021

View reviewed changes

liuxiran requested review from nic-chen, starsz and imjoey September 3, 2021 13:49

starsz approved these changes Sep 3, 2021

View reviewed changes

imjoey approved these changes Sep 3, 2021

View reviewed changes

imjoey merged commit fc89bc4 into apache:master Sep 3, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: basic support Apache APISIX 2.9 #2117

feat: basic support Apache APISIX 2.9 #2117

bzp2010 commented Sep 2, 2021

netlify bot commented Sep 2, 2021 •

edited

codecov-commenter commented Sep 2, 2021 •

edited

liuxiran commented Sep 2, 2021

nic-chen Sep 3, 2021

starsz Sep 3, 2021

bzp2010 Sep 3, 2021

liuxiran Sep 3, 2021

bzp2010 Sep 3, 2021

liuxiran Sep 3, 2021

liuxiran Sep 3, 2021

liuxiran Sep 3, 2021

liuxiran commented Sep 3, 2021

feat: basic support Apache APISIX 2.9 #2117

feat: basic support Apache APISIX 2.9 #2117

Conversation

bzp2010 commented Sep 2, 2021

netlify bot commented Sep 2, 2021 • edited

codecov-commenter commented Sep 2, 2021 • edited

Codecov Report

liuxiran commented Sep 2, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liuxiran commented Sep 3, 2021

netlify bot commented Sep 2, 2021 •

edited

codecov-commenter commented Sep 2, 2021 •

edited