ai comments

Author: jrhee17

client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/configsource/CentralDogmaSotwConfigSourceSubscriptionFactory.java

@@ -15,6 +15,8 @@
  */
 package com.linecorp.centraldogma.client.armeria.xds.configsource;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import java.util.List;
 import java.util.Map;
 
@@ -72,6 +74,8 @@ public SnapshotStream<DiscoveryResponse> create(
         final CentralDogmaConfigSource cdConfig =
                 factoryContext.validator().unpack(
                         configSource.getCustomConfigSource(), CentralDogmaConfigSource.class);
+        checkArgument(!cdConfig.getClusterName().isEmpty(),
+                      "CentralDogmaConfigSource.cluster_name must not be empty");
         final SnapshotStream<ClusterSnapshot> clusterStream =
                 factoryContext.clusterStream(cdConfig.getClusterName());
         final EventExecutor eventLoop = factoryContext.eventLoop();

client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/configsource/ResourcePath.java

@@ -21,6 +21,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 
+import com.linecorp.armeria.common.QueryParams;
 import com.linecorp.centraldogma.common.Query;
 
 /**
@@ -43,8 +44,6 @@
  */
 final class ResourcePath {
 
-    private static final String PROFILE_PARAM = "profile=";
-
     private final String project;
     private final String repo;
     private final String path;
@@ -53,18 +52,17 @@ final class ResourcePath {
     private final boolean ftl;
 
     static ResourcePath parse(String resourceName) {
-        // Split off ?profile= if present.
+        // Split off query string if present.
         String name = resourceName;
         String profile = null;
         final int questionMark = resourceName.indexOf('?');
         if (questionMark >= 0) {
             final String queryString = resourceName.substring(questionMark + 1);
             name = resourceName.substring(0, questionMark);
-            if (queryString.startsWith(PROFILE_PARAM)) {
-                profile = queryString.substring(PROFILE_PARAM.length());
-                checkArgument(!profile.isEmpty(),
-                              "Invalid resource name (empty profile): %s", resourceName);
-            }
+            final QueryParams params = QueryParams.fromQueryString(queryString);
+            profile = params.get("profile");
+            checkArgument(profile == null || !profile.isEmpty(),
+                          "Invalid resource name (empty profile): %s", resourceName);
         }
 
         final int firstSlash = name.indexOf('/');

it/xds-client/src/test/java/com/linecorp/centraldogma/xds/it/CentralDogmaConfigSourceTemplateTest.java

@@ -64,7 +64,8 @@ class CentralDogmaConfigSourceTemplateTest {
             }
             """.formatted(RESOURCE_NAME);
 
-    // A listener template using <#list> for routes and ${toJson()} for match rules.
+    // A listener template — each route object is serialized transparently via ${toJson(r)},
+    // so any field on config.route.v3.Route is supported without template changes.
     private static final String LISTENER_JSON_TEMPLATE = """
             {
               "name": "%1$s",
@@ -80,10 +81,7 @@ class CentralDogmaConfigSourceTemplateTest {
                       "domains": ["*"],
                       "routes": [
                         <#list vars.routes as r>
-                        {
-                          "match": ${toJson(r.match)},
-                          "route": { "cluster": "${r.cluster}" }
-                        }<#if r?has_next>,</#if>
+                        ${toJson(r)}<#if r?has_next>,</#if>
                         </#list>
                       ]
                     }]
@@ -129,9 +127,7 @@ class CentralDogmaConfigSourceTemplateTest {
                         - "*"
                       routes:
             <#list vars.routes as r>
-                        - match: ${toJson(r.match)}
-                          route:
-                            cluster: ${r.cluster}
+                        - ${toJson(r)}
             </#list>
                 httpFilters:
                   - name: envoy.filters.http.router
@@ -186,17 +182,20 @@ private static String routesYaml(String clusterExt, int routeCount) {
                             - name: x-api-version
                               stringMatch:
                                 exact: v2
-                        cluster: %1$s
+                        route:
+                          cluster: %1$s
                       - match:
                           prefix: /
-                        cluster: %1$s
+                        route:
+                          cluster: %1$s
                     """.formatted(cluster);
         }
         return """
                 routes:
                   - match:
                       prefix: /
-                    cluster: %s
+                    route:
+                      cluster: %s
                 """.formatted(cluster);
     }