Implement last-match-wins behaviour in mux

In accordance with the http.proto spec, we should use last-match-wins to determine which handler is chosen if two are matched. See #224 for more discussion.
grpc-ecosystem · May 23, 2020 · 5bca97b · 5bca97b
1 parent e090d4a
commit 5bca97b
Show file tree

Hide file tree

Showing 24 changed files with 420 additions and 488 deletions.
diff --git a/examples/internal/clients/abe/api/swagger.yaml b/examples/internal/clients/abe/api/swagger.yaml
@@ -1189,46 +1189,6 @@ paths:
           description: "An unexpected error response"
           schema:
             $ref: "#/definitions/rpcStatus"
-  /v1/example/a_bit_of_everything/{singleNested.name}:
-    post:
-      tags:
-      - "ABitOfEverythingService"
-      operationId: "ABitOfEverythingService_DeepPathEcho"
-      parameters:
-      - name: "singleNested.name"
-        in: "path"
-        description: "name is nested field."
-        required: true
-        type: "string"
-        x-exportParamName: "SingleNestedName"
-      - in: "body"
-        name: "body"
-        required: true
-        schema:
-          $ref: "#/definitions/examplepbABitOfEverything"
-        x-exportParamName: "Body"
-      responses:
-        200:
-          description: "A successful response."
-          schema:
-            $ref: "#/definitions/examplepbABitOfEverything"
-        403:
-          description: "Returned when the user does not have permission to access\
-            \ the resource."
-          schema: {}
-        404:
-          description: "Returned when the resource does not exist."
-          schema:
-            type: "string"
-            format: "string"
-        418:
-          description: "I'm a teapot."
-          schema:
-            $ref: "#/definitions/examplepbNumericEnum"
-        default:
-          description: "An unexpected error response"
-          schema:
-            $ref: "#/definitions/rpcStatus"
   /v1/example/a_bit_of_everything/{uuid}:
     get:
       tags:
@@ -1527,6 +1487,46 @@ paths:
           description: "An unexpected error response"
           schema:
             $ref: "#/definitions/rpcStatus"
+  /v1/example/deep_path/{singleNested.name}:
+    post:
+      tags:
+      - "ABitOfEverythingService"
+      operationId: "ABitOfEverythingService_DeepPathEcho"
+      parameters:
+      - name: "singleNested.name"
+        in: "path"
+        description: "name is nested field."
+        required: true
+        type: "string"
+        x-exportParamName: "SingleNestedName"
+      - in: "body"
+        name: "body"
+        required: true
+        schema:
+          $ref: "#/definitions/examplepbABitOfEverything"
+        x-exportParamName: "Body"
+      responses:
+        200:
+          description: "A successful response."
+          schema:
+            $ref: "#/definitions/examplepbABitOfEverything"
+        403:
+          description: "Returned when the user does not have permission to access\
+            \ the resource."
+          schema: {}
+        404:
+          description: "Returned when the resource does not exist."
+          schema:
+            type: "string"
+            format: "string"
+        418:
+          description: "I'm a teapot."
+          schema:
+            $ref: "#/definitions/examplepbNumericEnum"
+        default:
+          description: "An unexpected error response"
+          schema:
+            $ref: "#/definitions/rpcStatus"
   /v2/example/a_bit_of_everything/{abe.uuid}:
     put:
       tags:

diff --git a/examples/internal/clients/abe/api_a_bit_of_everything_service.go b/examples/internal/clients/abe/api_a_bit_of_everything_service.go
@@ -1135,7 +1135,7 @@ func (a *ABitOfEverythingServiceApiService) ABitOfEverythingServiceDeepPathEcho(
 	)
 
 	// create path and map variables
-	localVarPath := a.client.cfg.BasePath + "/v1/example/a_bit_of_everything/{singleNested.name}"
+	localVarPath := a.client.cfg.BasePath + "/v1/example/deep_path/{singleNested.name}"
 	localVarPath = strings.Replace(localVarPath, "{"+"singleNested.name"+"}", fmt.Sprintf("%v", singleNestedName), -1)
 
 	localVarHeaderParams := make(map[string]string)

diff --git a/examples/internal/helloworld/helloworld.pb.gw.go b/examples/internal/helloworld/helloworld.pb.gw.go
diff --git a/examples/internal/integration/integration_test.go b/examples/internal/integration/integration_test.go
@@ -1053,7 +1053,7 @@ func testABEBulkEcho(t *testing.T, port int) {
 	go func() {
 		defer wg.Done()
 		defer reqw.Close()
-		for i := 0; i < 1000; i++ {
+		for i := 0; i < 10; i++ {
 			s := fmt.Sprintf("message %d", i)
 			msg := sub.StringMessage{Value: &s}
 			buf, err := marshaler.Marshal(&msg)