feat: support patch in route module in order to support publish/offline by liuxiran · Pull Request #1049 · apache/apisix-dashboard

liuxiran · 2020-12-14T13:16:39Z

Please answer these questions before submitting a pull request

Why submit this pull request?
New feature provided
Related issues

BE of #837
support for #991
borrow from #1005
depends on APISIX release with apache/apisix#2737 and sync https://github.com/apache/apisix-dashboard/blob/master/api/conf/schema.json

codecov-io · 2020-12-14T14:16:06Z

Codecov Report

Merging #1049 (80692e0) into master (7c5fe95) will decrease coverage by 0.47%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #1049      +/-   ##
==========================================
- Coverage   40.13%   39.66%   -0.48%     
==========================================
  Files          26       26              
  Lines        1572     1591      +19     
==========================================
  Hits          631      631              
- Misses        850      869      +19     
  Partials       91       91

Impacted Files	Coverage Δ
api/internal/core/entity/entity.go	`0.00% <ø> (ø)`
api/internal/handler/route/route.go	`42.30% <0.00%> (-4.26%)`	⬇️

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 7c5fe95...80692e0. Read the comment docs.

membphis · 2020-12-15T14:14:37Z

+func TestRoute_Patch(t *testing.T) {
+	tests := []HttpTestCase{
+		{
+			caseDesc:     "route patch",


we should always create the related resource first.

eg: the route resource

membphis · 2020-12-15T14:16:28Z

It seems that the E2E test cases is unstable, @nic-chen please take a look:

--- FAIL: TestRoute_Create_Service (0.93s)
Error:     printer.go:54: GET http://127.0.0.1:9080/server_port
Error:     printer.go:54: PUT http://127.0.0.1:9000/apisix/admin/services/200
Error:     printer.go:54: PUT http://127.0.0.1:9000/apisix/admin/routes/r1
    route_service_upstream_test.go:190: 
        	Error Trace:	route_service_upstream_test.go:190
        	Error:      	Not equal: 
        	            	expected: 6
        	            	actual  : 7
        	Test:       	TestRoute_Create_Service
    route_service_upstream_test.go:192: 
        	Error Trace:	route_service_upstream_test.go:192
        	Error:      	Not equal: 
        	            	expected: 6
        	            	actual  : 5
        	Test:       	TestRoute_Create_Service

nic-chen · 2020-12-16T01:39:17Z

It seems that the E2E test cases is unstable, @nic-chen please take a look:

--- FAIL: TestRoute_Create_Service (0.93s)
Error:     printer.go:54: GET http://127.0.0.1:9080/server_port
Error:     printer.go:54: PUT http://127.0.0.1:9000/apisix/admin/services/200
Error:     printer.go:54: PUT http://127.0.0.1:9000/apisix/admin/routes/r1
    route_service_upstream_test.go:190: 
        	Error Trace:	route_service_upstream_test.go:190
        	Error:      	Not equal: 
        	            	expected: 6
        	            	actual  : 7
        	Test:       	TestRoute_Create_Service
    route_service_upstream_test.go:192: 
        	Error Trace:	route_service_upstream_test.go:192
        	Error:      	Not equal: 
        	            	expected: 6
        	            	actual  : 5
        	Test:       	TestRoute_Create_Service

en, I have been working on it.

nic-chen · 2020-12-17T08:48:07Z

CI failed @liuxiran

liuxiran · 2020-12-18T07:06:56Z

Thanks for @nic-chen 's help, all test cases passed

juzhiyuan · 2020-12-19T02:52:31Z

How about using the codes from apisix's master branch?

nic-chen · 2020-12-19T02:56:30Z

How about using the codes from apisix's master branch?

sure，we don't need to wait now.

liuxiran · 2020-12-20T04:31:17Z

this pr has beening splited into two prs, and will be closed after all the separated prs merged

nic-chen · 2020-12-21T03:16:58Z

this PR should be closed now. feel free to reopen it if you need.

liuxiran mentioned this pull request Dec 14, 2020

feat: refactor publish/offline fe #991

Merged

1 task

feat: support patch in route module

8ce330b

liuxiran force-pushed the refactor_publish_offline_be branch from 2768523 to 8ce330b Compare December 14, 2020 14:12

membphis reviewed Dec 15, 2020

View reviewed changes

liuxiran added 2 commits December 17, 2020 12:40

fix: add test cases refer to the code review

499edf7

fix: define status in route struct

a191038

LiteSun requested review from nic-chen and tokers December 17, 2020 06:06

debug

13ae49a

liuxiran force-pushed the refactor_publish_offline_be branch from 80692e0 to 13ae49a Compare December 18, 2020 02:04

johzchen and others added 4 commits December 18, 2020 10:46

fix: sort schema.json

83f86b5

fix: set default status for route

5025559

fix: unit test remote_addr validate pattern

fe364ff

fix: update remote_addr validate failed msg

43c4c9c

imjoey reviewed Dec 18, 2020

View reviewed changes

Comment thread api/internal/core/entity/entity.go

nic-chen added the wait-new-apisix label Dec 18, 2020

nic-chen removed the wait-new-apisix label Dec 19, 2020

This was referenced Dec 20, 2020

Update schema to master #1080

Merged

Refactor publish offline be #1081

Merged

nic-chen closed this Dec 21, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: support patch in route module in order to support publish/offline#1049

feat: support patch in route module in order to support publish/offline#1049
liuxiran wants to merge 8 commits into
apache:masterfrom
liuxiran:refactor_publish_offline_be

liuxiran commented Dec 14, 2020 •

edited

Loading

Uh oh!

codecov-io commented Dec 14, 2020 •

edited

Loading

Uh oh!

membphis Dec 15, 2020

Uh oh!

liuxiran Dec 17, 2020

Uh oh!

membphis commented Dec 15, 2020

Uh oh!

nic-chen commented Dec 16, 2020

Uh oh!

nic-chen commented Dec 17, 2020

Uh oh!

liuxiran commented Dec 18, 2020

Uh oh!

Uh oh!

juzhiyuan commented Dec 19, 2020

Uh oh!

nic-chen commented Dec 19, 2020

Uh oh!

liuxiran commented Dec 20, 2020 •

edited

Loading

Uh oh!

nic-chen commented Dec 21, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

liuxiran commented Dec 14, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov-io commented Dec 14, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

membphis Dec 15, 2020

Choose a reason for hiding this comment

Uh oh!

liuxiran Dec 17, 2020

Choose a reason for hiding this comment

Uh oh!

membphis commented Dec 15, 2020

Uh oh!

nic-chen commented Dec 16, 2020

Uh oh!

nic-chen commented Dec 17, 2020

Uh oh!

liuxiran commented Dec 18, 2020

Uh oh!

Uh oh!

juzhiyuan commented Dec 19, 2020

Uh oh!

nic-chen commented Dec 19, 2020

Uh oh!

liuxiran commented Dec 20, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nic-chen commented Dec 21, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

liuxiran commented Dec 14, 2020 •

edited

Loading

codecov-io commented Dec 14, 2020 •

edited

Loading

liuxiran commented Dec 20, 2020 •

edited

Loading