Configure internal communication for ANNOUNCE discovery mode

This includes automatic generation of TLS certificates for internal
communication when the certificate is not configured explicitly.

Author: ksobolew

core/trino-main/src/main/java/io/trino/node/AirliftNodeInventoryModule.java

@@ -17,6 +17,7 @@
 import com.google.inject.Scopes;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
 import io.airlift.discovery.client.DiscoveryModule;
+import io.airlift.discovery.client.ForDiscoveryClient;
 import io.airlift.discovery.server.DynamicAnnouncementResource;
 import io.airlift.discovery.server.EmbeddedDiscoveryModule;
 import io.airlift.discovery.server.ServiceResource;
@@ -75,6 +76,6 @@ protected void setup(Binder binder)
                 .addProperty("coordinator", String.valueOf(coordinator));
 
         // internal communication setup for discovery http client
-        install(new InternalCommunicationForDiscoveryModule());
+        install(new InternalCommunicationForDiscoveryModule(ForDiscoveryClient.class));
     }
 }

core/trino-main/src/main/java/io/trino/node/AnnounceNodeInventoryModule.java

@@ -46,5 +46,8 @@ protected void setup(Binder binder)
                     config.setIdleTimeout(new Duration(3, SECONDS));
                     config.setRequestTimeout(new Duration(3, SECONDS));
                 }).build());
+
+        // internal communication setup for discovery http client
+        install(new InternalCommunicationForDiscoveryModule(ForAnnouncer.class));
     }
 }

core/trino-main/src/main/java/io/trino/node/InternalCommunicationForDiscoveryModule.java

@@ -16,14 +16,14 @@
 import com.google.inject.Binder;
 import com.google.inject.multibindings.Multibinder;
 import io.airlift.configuration.AbstractConfigurationAwareModule;
-import io.airlift.discovery.client.ForDiscoveryClient;
 import io.airlift.http.client.HttpClientConfig;
 import io.airlift.http.client.HttpRequestFilter;
 import io.airlift.http.client.Request;
 import io.trino.server.InternalAuthenticationManager;
 import io.trino.server.InternalCommunicationConfig;
 
 import java.io.UncheckedIOException;
+import java.lang.annotation.Annotation;
 import java.net.InetAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -33,19 +33,27 @@
 import static io.airlift.configuration.ConfigBinder.configBinder;
 import static io.airlift.node.AddressToHostname.encodeAddressAsHostname;
 import static io.trino.server.InternalCommunicationHttpClientModule.configureClient;
+import static java.util.Objects.requireNonNull;
 
 public class InternalCommunicationForDiscoveryModule
         extends AbstractConfigurationAwareModule
 {
+    private final Class<? extends Annotation> httpClientQualifier;
+
+    public InternalCommunicationForDiscoveryModule(Class<? extends Annotation> httpClientQualifier)
+    {
+        this.httpClientQualifier = requireNonNull(httpClientQualifier, "httpClientQualifier is null");
+    }
+
     @Override
     protected void setup(Binder binder)
     {
         InternalCommunicationConfig internalCommunicationConfig = buildConfigObject(InternalCommunicationConfig.class);
-        Multibinder<HttpRequestFilter> discoveryFilterBinder = newSetBinder(binder, HttpRequestFilter.class, ForDiscoveryClient.class);
+        Multibinder<HttpRequestFilter> discoveryFilterBinder = newSetBinder(binder, HttpRequestFilter.class, httpClientQualifier);
         if (internalCommunicationConfig.isHttpsRequired() && internalCommunicationConfig.getKeyStorePath() == null && internalCommunicationConfig.getTrustStorePath() == null) {
             discoveryFilterBinder.addBinding().to(DiscoveryEncodeAddressAsHostname.class);
         }
-        configBinder(binder).bindConfigDefaults(HttpClientConfig.class, ForDiscoveryClient.class, config -> configureClient(config, internalCommunicationConfig));
+        configBinder(binder).bindConfigDefaults(HttpClientConfig.class, httpClientQualifier, config -> configureClient(config, internalCommunicationConfig));
         discoveryFilterBinder.addBinding().to(InternalAuthenticationManager.class);
     }