xds: use the correct resource id template as per xDS server gRFC (#7978)

Author: sanjaypujare

xds/src/main/java/io/grpc/xds/Bootstrapper.java

@@ -106,18 +106,18 @@ public static class BootstrapInfo {
     private List<ServerInfo> servers;
     private final Node node;
     @Nullable private final Map<String, CertificateProviderInfo> certProviders;
-    @Nullable private final String grpcServerResourceId;
+    @Nullable private final String serverListenerResourceNameTemplate;
 
     @VisibleForTesting
     BootstrapInfo(
         List<ServerInfo> servers,
         Node node,
         Map<String, CertificateProviderInfo> certProviders,
-        String grpcServerResourceId) {
+        String serverListenerResourceNameTemplate) {
       this.servers = servers;
       this.node = node;
       this.certProviders = certProviders;
-      this.grpcServerResourceId = grpcServerResourceId;
+      this.serverListenerResourceNameTemplate = serverListenerResourceNameTemplate;
     }
 
     /**
@@ -140,8 +140,8 @@ public Map<String, CertificateProviderInfo> getCertProviders() {
     }
 
     @Nullable
-    public String getGrpcServerResourceId() {
-      return grpcServerResourceId;
+    public String getServerListenerResourceNameTemplate() {
+      return serverListenerResourceNameTemplate;
     }
   }
 }

xds/src/main/java/io/grpc/xds/BootstrapperImpl.java

@@ -215,7 +215,8 @@ BootstrapInfo bootstrap(Map<String, ?> rawData) throws XdsInitializationExceptio
         certProviders.put(name, certificateProviderInfo);
       }
     }
-    String grpcServerResourceId = JsonUtil.getString(rawData, "grpc_server_resource_name_id");
+    String grpcServerResourceId =
+        JsonUtil.getString(rawData, "server_listener_resource_name_template");
     return new BootstrapInfo(servers, nodeBuilder.build(), certProviders, grpcServerResourceId);
   }
 

xds/src/main/java/io/grpc/xds/XdsClientWrapperForServerSds.java

@@ -112,9 +112,10 @@ public void createXdsClientAndStart() throws IOException {
             .keepAliveTime(5, TimeUnit.MINUTES).build();
     timeService = SharedResourceHolder.get(timeServiceResource);
     newServerApi = serverInfo.isUseProtocolV3();
-    String grpcServerResourceId = bootstrapInfo.getGrpcServerResourceId();
+    String grpcServerResourceId = bootstrapInfo.getServerListenerResourceNameTemplate();
     if (newServerApi && grpcServerResourceId == null) {
-      throw new IOException("missing grpc_server_resource_name_id value in xds bootstrap");
+      throw new IOException(
+          "missing server_listener_resource_name_template value in xds bootstrap");
     }
     XdsClient xdsClientImpl =
         new ClientXdsClient(
@@ -155,8 +156,7 @@ public void onError(Status error) {
             reportError(error.asException(), isResourceAbsent(error));
           }
         };
-    grpcServerResourceId =
-        grpcServerResourceId + "?udpa.resource.listening_address=" + ("0.0.0.0:" + port);
+    grpcServerResourceId = grpcServerResourceId.replaceAll("%s", "0.0.0.0:" + port);
     xdsClient.watchLdsResource(grpcServerResourceId, listenerWatcher);
   }
 

xds/src/test/java/io/grpc/xds/BootstrapperImplTest.java

@@ -547,12 +547,12 @@ public void parseBootstrap_missingPluginName() {
   public void parseBootstrap_grpcServerResourceId() throws XdsInitializationException {
     String rawData = "{\n"
             + "  \"xds_servers\": [],\n"
-            + "  \"grpc_server_resource_name_id\": \"grpc/serverx\"\n"
+            + "  \"server_listener_resource_name_template\": \"grpc/serverx=%s\"\n"
             + "}";
 
     bootstrapper.setFileReader(createFileReader(BOOTSTRAP_FILE_PATH, rawData));
     BootstrapInfo info = bootstrapper.bootstrap();
-    assertThat(info.getGrpcServerResourceId()).isEqualTo("grpc/serverx");
+    assertThat(info.getServerListenerResourceNameTemplate()).isEqualTo("grpc/serverx=%s");
   }
 
   @Test

xds/src/test/java/io/grpc/xds/XdsClientWrapperForServerSdsTestMisc.java

@@ -202,6 +202,17 @@ public void startXdsClient_expectException() {
     verify(mockServerWatcher, never()).onError(any(Throwable.class), eq(false));
   }
 
+  @Test
+  public void xdsClientStart_multipleReplacements() {
+    xdsClientWrapperForServerSds.start(xdsClient, "grpc/server?%s and %s and one more %s");
+    ArgumentCaptor<XdsClient.LdsResourceWatcher> listenerWatcherCaptor =
+        ArgumentCaptor.forClass(null);
+    verify(xdsClient)
+        .watchLdsResource(
+            eq("grpc/server?0.0.0.0:7000 and 0.0.0.0:7000 and one more 0.0.0.0:7000"),
+            listenerWatcherCaptor.capture());
+  }
+
   private DownstreamTlsContext sendListenerUpdate(
       SocketAddress localAddress, DownstreamTlsContext tlsContext) throws UnknownHostException {
     when(channel.localAddress()).thenReturn(localAddress);
@@ -218,7 +229,8 @@ public static XdsClientWrapperForServerSds createXdsClientWrapperForServerSds(
     XdsClient mockXdsClient = mock(XdsClient.class);
     XdsClientWrapperForServerSds xdsClientWrapperForServerSds =
         new XdsClientWrapperForServerSds(port);
-    xdsClientWrapperForServerSds.start(mockXdsClient, "grpc/server");
+    xdsClientWrapperForServerSds.start(
+        mockXdsClient, "grpc/server?udpa.resource.listening_address=%s");
     XdsSdsClientServerTest.generateListenerUpdateToWatcher(
         downstreamTlsContext, xdsClientWrapperForServerSds.getListenerWatcher());
     return xdsClientWrapperForServerSds;

xds/src/test/java/io/grpc/xds/XdsServerTestHelper.java

@@ -33,7 +33,8 @@ static XdsClient.LdsResourceWatcher startAndGetWatcher(
       XdsClientWrapperForServerSds xdsClientWrapperForServerSds,
       XdsClient mockXdsClient,
       int port) {
-    xdsClientWrapperForServerSds.start(mockXdsClient, "grpc/server");
+    xdsClientWrapperForServerSds.start(
+        mockXdsClient, "grpc/server?udpa.resource.listening_address=%s");
     ArgumentCaptor<XdsClient.LdsResourceWatcher> listenerWatcherCaptor = ArgumentCaptor
         .forClass(null);
     verify(mockXdsClient)