fix:fix routing rule sync bug when using TSF Consul. (#574)

SkyeBeFreeman · web-flow · commit e6eef587c597 · 2024-12-09T19:25:09.000+08:00
diff --git a/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/router/RoutingService.java b/polaris-plugins/polaris-plugins-connector/connector-consul/src/main/java/com/tencent/polaris/plugins/connector/consul/service/router/RoutingService.java
@@ -253,7 +253,17 @@ private List<RoutingProto.Route> parseResponse(final HttpResponse response, Stri
                             metadataSourceBuilders.add(metadataSourceBuilder);
                         }
                     }
-                    for (RoutingProto.Source.Builder sourceBuilder : sourceBuilders) {
+                    if (CollectionUtils.isNotEmpty(sourceBuilders)) {
+                        for (RoutingProto.Source.Builder sourceBuilder : sourceBuilders) {
+                            for (RoutingProto.Source.Builder metadataSourceBuilder : metadataSourceBuilders) {
+                                sourceBuilder.putAllMetadata(metadataSourceBuilder.getMetadataMap());
+                            }
+                            sources.add(sourceBuilder.build());
+                        }
+                    } else {
+                        RoutingProto.Source.Builder sourceBuilder = RoutingProto.Source.newBuilder();
+                        sourceBuilder.setNamespace(StringValue.of("*"));
+                        sourceBuilder.setService(StringValue.of("*"));
                         for (RoutingProto.Source.Builder metadataSourceBuilder : metadataSourceBuilders) {
                             sourceBuilder.putAllMetadata(metadataSourceBuilder.getMetadataMap());
                         }

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,17 @@ private List<RoutingProto.Route> parseResponse(final HttpResponse response, Stri`
`253`	`253`	`metadataSourceBuilders.add(metadataSourceBuilder);`
`254`	`254`	`}`
`255`	`255`	`}`
`256`		`- for (RoutingProto.Source.Builder sourceBuilder : sourceBuilders) {`
	`256`	`+ if (CollectionUtils.isNotEmpty(sourceBuilders)) {`
	`257`	`+ for (RoutingProto.Source.Builder sourceBuilder : sourceBuilders) {`
	`258`	`+ for (RoutingProto.Source.Builder metadataSourceBuilder : metadataSourceBuilders) {`
	`259`	`+ sourceBuilder.putAllMetadata(metadataSourceBuilder.getMetadataMap());`
	`260`	`+ }`
	`261`	`+ sources.add(sourceBuilder.build());`
	`262`	`+ }`
	`263`	`+ } else {`
	`264`	`+ RoutingProto.Source.Builder sourceBuilder = RoutingProto.Source.newBuilder();`
	`265`	`+ sourceBuilder.setNamespace(StringValue.of("*"));`
	`266`	`+ sourceBuilder.setService(StringValue.of("*"));`
`257`	`267`	`for (RoutingProto.Source.Builder metadataSourceBuilder : metadataSourceBuilders) {`
`258`	`268`	`sourceBuilder.putAllMetadata(metadataSourceBuilder.getMetadataMap());`
`259`	`269`	`}`