You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2020/12/30 04:07:32 UTC

[GitHub] [apisix-dashboard] nic-chen opened a new pull request #1152: fix: conflicted when update global rule

nic-chen opened a new pull request #1152:
URL: https://github.com/apache/apisix-dashboard/pull/1152


   Please answer these questions before submitting a pull request
   
   - Why submit this pull request?
   - [x] Bugfix
   - [ ] New feature provided
   - [ ] Improve performance
   
   - Related issues
   close #1149
   ___
   ### Bugfix
   - Description
   
   Get 'key: xxxx is conflicted' error message when update a global rule
   
   - How to fix?
   
   Replace `Create` with `Update` and set `createIfNotExist` to not true
   
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] starsz commented on a change in pull request #1152: fix: conflicted when update global rule

Posted by GitBox <gi...@apache.org>.
starsz commented on a change in pull request #1152:
URL: https://github.com/apache/apisix-dashboard/pull/1152#discussion_r550037672



##########
File path: api/test/e2e/global_rule_test.go
##########
@@ -56,7 +56,6 @@ func TestGlobalRule(t *testing.T) {
 			Path:   "/apisix/admin/global_rules/1",
 			Method: http.MethodPut,
 			Body: `{
-                                "id": "1",

Review comment:
       Why this line should be deleted?




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] nic-chen commented on a change in pull request #1152: fix: conflicted when update global rule

Posted by GitBox <gi...@apache.org>.
nic-chen commented on a change in pull request #1152:
URL: https://github.com/apache/apisix-dashboard/pull/1152#discussion_r550063271



##########
File path: api/test/e2e/global_rule_test.go
##########
@@ -56,7 +56,6 @@ func TestGlobalRule(t *testing.T) {
 			Path:   "/apisix/admin/global_rules/1",
 			Method: http.MethodPut,
 			Body: `{
-                                "id": "1",

Review comment:
       We support no ID in body. Deleted to test this scenario
   




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [apisix-dashboard] LiteSun merged pull request #1152: fix: conflicted when update global rule

Posted by GitBox <gi...@apache.org>.
LiteSun merged pull request #1152:
URL: https://github.com/apache/apisix-dashboard/pull/1152


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org