Skip to content

Commit

Permalink
[ISSUE#13090] Compatible with v2 openapi to query configuration. (#13091
Browse files Browse the repository at this point in the history 
)

* Compatible with v2 openapi to query configuration.

* Fix CI.
  • Loading branch information
@KiteSoar
KiteSoar authored Feb 10, 2025
1 parent c7386cf commit a13b64d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ...main/java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public String getName() {
public ConfigQueryChainRequest extract(HttpServletRequest request) {
final String dataId = request.getParameter("dataId");
final String group = request.getParameter("group");
String tenant = request.getParameter("tenant");
String tenant = request.getParameter("namespaceId") != null ? request.getParameter("namespaceId") : request.getParameter("tenant");
if (StringUtils.isBlank(tenant)) {
tenant = StringUtils.EMPTY;
}
Expand Down
14 changes: 7 additions & 7 deletions .../java/com/alibaba/nacos/config/server/service/query/DefaultChainRequestExtractorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void tearDown() {
public void extractWithAllParametersShouldReturnCorrectConfigQueryChainRequest() {
when(request.getParameter("dataId")).thenReturn("dataId");
when(request.getParameter("group")).thenReturn("group");
when(request.getParameter("tenant")).thenReturn("tenant");
when(request.getParameter("namespaceId")).thenReturn("testNamespaceId");
when(request.getParameter("tag")).thenReturn("tag");
when(request.getHeader(VIPSERVER_TAG)).thenReturn("autoTag");
requestUtilMockedStatic.when(() -> RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1");
Expand All @@ -74,7 +74,7 @@ public void extractWithAllParametersShouldReturnCorrectConfigQueryChainRequest()

assertEquals("dataId", result.getDataId());
assertEquals("group", result.getGroup());
assertEquals("tenant", result.getTenant());
assertEquals("testNamespaceId", result.getTenant());
assertEquals("tag", result.getTag());
assertEquals("127.0.0.1", result.getAppLabels().get(BetaGrayRule.CLIENT_IP_LABEL));
assertEquals("tag", result.getAppLabels().get(TagGrayRule.VIP_SERVER_TAG_LABEL));
Expand All @@ -84,7 +84,7 @@ public void extractWithAllParametersShouldReturnCorrectConfigQueryChainRequest()
public void extractWithEmptyTenantShouldReturnCorrectConfigQueryChainRequest() {
when(request.getParameter("dataId")).thenReturn("dataId");
when(request.getParameter("group")).thenReturn("group");
when(request.getParameter("tenant")).thenReturn("");
when(request.getParameter("namespaceId")).thenReturn("");
when(request.getParameter("tag")).thenReturn("tag");
when(request.getHeader(VIPSERVER_TAG)).thenReturn("autoTag");
requestUtilMockedStatic.when(() -> RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1");
Expand All @@ -103,7 +103,7 @@ public void extractWithEmptyTenantShouldReturnCorrectConfigQueryChainRequest() {
public void extractWithEmptyTagAndAutoTagShouldReturnCorrectConfigQueryChainRequest() {
when(request.getParameter("dataId")).thenReturn("dataId");
when(request.getParameter("group")).thenReturn("group");
when(request.getParameter("tenant")).thenReturn("tenant");
when(request.getParameter("namespaceId")).thenReturn("testNamespaceId");
when(request.getParameter("tag")).thenReturn("");
when(request.getHeader(VIPSERVER_TAG)).thenReturn("");
requestUtilMockedStatic.when(() -> RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1");
Expand All @@ -112,7 +112,7 @@ public void extractWithEmptyTagAndAutoTagShouldReturnCorrectConfigQueryChainRequ

assertEquals("dataId", result.getDataId());
assertEquals("group", result.getGroup());
assertEquals("tenant", result.getTenant());
assertEquals("testNamespaceId", result.getTenant());
assertEquals("", result.getTag());
assertEquals("127.0.0.1", result.getAppLabels().get(BetaGrayRule.CLIENT_IP_LABEL));
assertNull(result.getAppLabels().get(TagGrayRule.VIP_SERVER_TAG_LABEL));
Expand All @@ -122,7 +122,7 @@ public void extractWithEmptyTagAndAutoTagShouldReturnCorrectConfigQueryChainRequ
public void extractWithAutoTagShouldReturnCorrectConfigQueryChainRequest() {
when(request.getParameter("dataId")).thenReturn("dataId");
when(request.getParameter("group")).thenReturn("group");
when(request.getParameter("tenant")).thenReturn("tenant");
when(request.getParameter("namespaceId")).thenReturn("testNamespaceId");
when(request.getParameter("tag")).thenReturn("");
when(request.getHeader(VIPSERVER_TAG)).thenReturn("autoTag");
when(RequestUtil.getRemoteIp(request)).thenReturn("127.0.0.1");
Expand All @@ -131,7 +131,7 @@ public void extractWithAutoTagShouldReturnCorrectConfigQueryChainRequest() {

assertEquals("dataId", result.getDataId());
assertEquals("group", result.getGroup());
assertEquals("tenant", result.getTenant());
assertEquals("testNamespaceId", result.getTenant());
assertEquals("", result.getTag());
assertEquals("127.0.0.1", result.getAppLabels().get(BetaGrayRule.CLIENT_IP_LABEL));
assertEquals("autoTag", result.getAppLabels().get(TagGrayRule.VIP_SERVER_TAG_LABEL));
Expand Down

0 comments on commit a13b64d

Please # to comment.