forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[proxy] Fix proxy routing to functions worker (apache#6486)
### Motivation Currently, the proxy only works to proxy v1/v2 functions routes to the function worker. ### Modifications This changes this code to proxy all routes for the function worker when those routes match. At the moment this is still a static list of prefixes, but in the future it may be possible to have this list of prefixes be dynamically fetched from the REST routes. ### Verifying this change - added some tests to ensure the routing works as expected
- Loading branch information
Showing
2 changed files
with
89 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/FunctionWorkerRoutingTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/** | ||
* 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 org.apache.pulsar.proxy.server; | ||
|
||
import org.testng.Assert; | ||
import org.testng.annotations.Test; | ||
|
||
import javax.servlet.http.HttpServletRequest; | ||
|
||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.when; | ||
|
||
public class FunctionWorkerRoutingTest { | ||
|
||
@Test | ||
public void testFunctionWorkerRedirect() throws Exception { | ||
String functionWorkerUrl = "http://function"; | ||
String brokerUrl = "http://broker"; | ||
|
||
ProxyConfiguration proxyConfig = new ProxyConfiguration(); | ||
proxyConfig.setBrokerWebServiceURL(brokerUrl); | ||
proxyConfig.setFunctionWorkerWebServiceURL(functionWorkerUrl); | ||
|
||
BrokerDiscoveryProvider discoveryProvider = mock(BrokerDiscoveryProvider.class); | ||
AdminProxyHandler handler = new AdminProxyHandler(proxyConfig, discoveryProvider); | ||
|
||
String funcUrl = handler.rewriteTarget(buildRequest("/admin/v3/functions/test/test")); | ||
Assert.assertEquals(funcUrl, String.format("%s/admin/v3/functions/%s/%s", | ||
functionWorkerUrl, "test", "test")); | ||
|
||
String sourceUrl = handler.rewriteTarget(buildRequest("/admin/v3/sources/test/test")); | ||
Assert.assertEquals(sourceUrl, String.format("%s/admin/v3/sources/%s/%s", | ||
functionWorkerUrl, "test", "test")); | ||
|
||
String sinkUrl = handler.rewriteTarget(buildRequest("/admin/v3/sinks/test/test")); | ||
Assert.assertEquals(sinkUrl, String.format("%s/admin/v3/sinks/%s/%s", | ||
functionWorkerUrl, "test", "test")); | ||
|
||
String tenantUrl = handler.rewriteTarget(buildRequest("/admin/v2/tenants/test")); | ||
Assert.assertEquals(tenantUrl, String.format("%s/admin/v2/tenants/%s", | ||
brokerUrl, "test")); | ||
} | ||
|
||
static HttpServletRequest buildRequest(String url) { | ||
HttpServletRequest mockReq = mock(HttpServletRequest.class); | ||
when(mockReq.getRequestURI()).thenReturn(url); | ||
return mockReq; | ||
} | ||
|
||
} |