starsz commented on a change in pull request #1504: URL: https://github.com/apache/apisix-dashboard/pull/1504#discussion_r584438554
########## File path: api/test/e2enew/upstream/upstream_chash_query_string_arg_xxx_test.go ########## @@ -0,0 +1,226 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package upstream + +import ( + "encoding/json" + "io/ioutil" + "net/http" + "sort" + "strconv" + "time" + + "github.com/onsi/ginkgo" + "github.com/stretchr/testify/assert" + + "e2enew/base" +) + +var createUpstreamBody map[string]interface{} = map[string]interface{}{ + "nodes": []map[string]interface{}{ + { + "host": base.UpstreamIp, + "port": 1980, + "weight": 1, + }, + { + "host": base.UpstreamIp, + "port": 1981, + "weight": 1, + }, + { + "host": base.UpstreamIp, + "port": 1982, + "weight": 1, + }, + }, + "type": "chash", +} + +var _ = ginkgo.Describe("Upstream chash query string", func() { + ginkgo.It("create chash upstream with key (query_string)", func() { + t := ginkgo.GinkgoT() + createUpstreamBody["key"] = "query_string" + _createUpstreamBody, err := json.Marshal(createUpstreamBody) + assert.Nil(t, err) + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: string(_createUpstreamBody), + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + ExpectBody: []string{"\"id\":\"1\"", "\"key\":\"query_string\""}, + }) + }) + ginkgo.It("create route using the upstream just created", func() { + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodPut, + Path: "/apisix/admin/routes/1", + Body: `{ + "uri": "/server_port", + "upstream_id": "1" + }`, + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + Sleep: base.SleepTime, + }) + }) + ginkgo.It("hit routes(upstream query_string)", func() { + t := ginkgo.GinkgoT() + time.Sleep(time.Duration(500) * time.Millisecond) + basepath := base.APISIXHost + res := map[string]int{} + for i := 0; i < 180; i++ { + url := basepath + "/server_port?var=2&var2=" + strconv.Itoa(i) + req, err := http.NewRequest("GET", url, nil) + assert.Nil(t, err) + resp, err := http.DefaultClient.Do(req) + assert.Nil(t, err) Review comment: Defer closing the resp.Body at here. ########## File path: api/test/e2enew/upstream/upstream_chash_query_string_arg_xxx_test.go ########## @@ -0,0 +1,226 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package upstream + +import ( + "encoding/json" + "io/ioutil" + "net/http" + "sort" + "strconv" + "time" + + "github.com/onsi/ginkgo" + "github.com/stretchr/testify/assert" + + "e2enew/base" +) + +var createUpstreamBody map[string]interface{} = map[string]interface{}{ + "nodes": []map[string]interface{}{ + { + "host": base.UpstreamIp, + "port": 1980, + "weight": 1, + }, + { + "host": base.UpstreamIp, + "port": 1981, + "weight": 1, + }, + { + "host": base.UpstreamIp, + "port": 1982, + "weight": 1, + }, + }, + "type": "chash", +} + +var _ = ginkgo.Describe("Upstream chash query string", func() { + ginkgo.It("create chash upstream with key (query_string)", func() { + t := ginkgo.GinkgoT() + createUpstreamBody["key"] = "query_string" + _createUpstreamBody, err := json.Marshal(createUpstreamBody) + assert.Nil(t, err) + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: string(_createUpstreamBody), + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + ExpectBody: []string{"\"id\":\"1\"", "\"key\":\"query_string\""}, + }) + }) + ginkgo.It("create route using the upstream just created", func() { + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodPut, + Path: "/apisix/admin/routes/1", + Body: `{ + "uri": "/server_port", + "upstream_id": "1" + }`, + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + Sleep: base.SleepTime, + }) + }) + ginkgo.It("hit routes(upstream query_string)", func() { + t := ginkgo.GinkgoT() + time.Sleep(time.Duration(500) * time.Millisecond) + basepath := base.APISIXHost + res := map[string]int{} + for i := 0; i < 180; i++ { + url := basepath + "/server_port?var=2&var2=" + strconv.Itoa(i) + req, err := http.NewRequest("GET", url, nil) + assert.Nil(t, err) + resp, err := http.DefaultClient.Do(req) + assert.Nil(t, err) + respBody, err := ioutil.ReadAll(resp.Body) + body := string(respBody) + if _, ok := res[body]; !ok { + res[body] = 1 + } else { + res[body]++ + } + resp.Body.Close() + } + var counts []int + for _, value := range res { + counts = append(counts, value) + } + sort.Ints(counts) + assert.True(t, float64(counts[2]-counts[0])/float64(counts[1]) < 0.4) + }) + ginkgo.It("delete route", func() { + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodDelete, + Path: "/apisix/admin/routes/1", + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + }) + }) + ginkgo.It("delete upstream", func() { + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodDelete, + Path: "/apisix/admin/upstreams/1", + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + }) + }) + ginkgo.It("hit the route just deleted", func() { + base.RunTestCase(base.HttpTestCase{ + Object: base.APISIXExpect(), + Method: http.MethodGet, + Path: "/hello", + ExpectStatus: http.StatusNotFound, + ExpectBody: "{\"error_msg\":\"404 Route Not Found\"}\n", + Sleep: base.SleepTime, + }) + }) +}) + +var _ = ginkgo.Describe("Upstream chash query string", func() { + ginkgo.It("create chash upstream with key (arg_xxx)", func() { + t := ginkgo.GinkgoT() + createUpstreamBody["key"] = "arg_device_id" + _createUpstreamBody, err := json.Marshal(createUpstreamBody) + assert.Nil(t, err) + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodPut, + Path: "/apisix/admin/upstreams/1", + Body: string(_createUpstreamBody), + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + ExpectBody: []string{"\"id\":\"1\"", "\"key\":\"arg_device_id\""}, + }) + }) + ginkgo.It("create route using the upstream just created", func() { + base.RunTestCase(base.HttpTestCase{ + Object: base.ManagerApiExpect(), + Method: http.MethodPut, + Path: "/apisix/admin/routes/1", + Body: `{ + "uri": "/server_port", + "upstream_id": "1" + }`, + Headers: map[string]string{"Authorization": base.GetToken()}, + ExpectStatus: http.StatusOK, + Sleep: base.SleepTime, + }) + }) + ginkgo.It("hit routes(upstream arg_device_id)", func() { + t := ginkgo.GinkgoT() + time.Sleep(time.Duration(500) * time.Millisecond) + basepath := base.APISIXHost + res := map[string]int{} + for i := 0; i <= 17; i++ { + url := basepath + "/server_port?device_id=" + strconv.Itoa(i) + req, err := http.NewRequest("GET", url, nil) + assert.Nil(t, err) + resp, err := http.DefaultClient.Do(req) + assert.Nil(t, err) + respBody, err := ioutil.ReadAll(resp.Body) + body := string(respBody) + if _, ok := res[body]; !ok { + res[body] = 1 + } else { + res[body]++ + } + resp.Body.Close() Review comment: Ditto. ---------------------------------------------------------------- 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: [email protected]
