✨ Support auto config remote grpc client (#509)

ButterCam · Apr 28, 2023 · eada044 · eada044
1 parent f8d72b4
commit eada044
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 4 deletions.
diff --git a/...lin/com/bybutter/sisyphus/middleware/grpc/client/kubernetes/KubernetesClientRepository.kt b/...lin/com/bybutter/sisyphus/middleware/grpc/client/kubernetes/KubernetesClientRepository.kt
@@ -80,8 +80,9 @@ class KubernetesClientRepository : ClientRepository {
                 it.name == labelValue || it.port.toString() == labelValue
             }?.port ?: continue
             val host = k8sService.metadata?.name ?: continue
+            val tls = labelValue == "grpcs"
             logger.info("GRPC service '$service' discovered in kubernetes service '$host:$port'.")
-            val channel = createGrpcChannel("$host:$port", channelBuilderInterceptors.values, managedChannelLifecycle)
+            val channel = createGrpcChannel("$host:$port", tls, channelBuilderInterceptors.values, managedChannelLifecycle)
             val client = getClientFromService(service.javaClass.declaringClass)
             val clientBeanDefinition = BeanDefinitionBuilder.genericBeanDefinition(client as Class<Any>) {
                 interceptStub(

diff --git a/...hus-grpc-client/src/main/kotlin/com/bybutter/sisyphus/middleware/grpc/ClientRepository.kt b/...hus-grpc-client/src/main/kotlin/com/bybutter/sisyphus/middleware/grpc/ClientRepository.kt
@@ -39,10 +39,22 @@ interface ClientRepository : Ordered {
 
     fun createGrpcChannel(
         target: String,
+        tls: Boolean,
         builderInterceptors: Iterable<ChannelBuilderInterceptor>,
         lifecycle: ManagedChannelLifecycle
     ): Channel {
-        var builder = ManagedChannelBuilder.forTarget(target).usePlaintext().userAgent("Generated by Sisyphus")
+        var builder = ManagedChannelBuilder
+            .forTarget(target)
+            .userAgent("Generated by Sisyphus")
+            .enableRetry()
+            .maxRetryAttempts(3)
+            .let {
+                if (tls) {
+                    it.useTransportSecurity()
+                } else {
+                    it.usePlaintext()
+                }
+            }
 
         for (interceptor in builderInterceptors) {
             builder = interceptor.intercept(builder)

diff --git a/...-grpc-client/src/main/kotlin/com/bybutter/sisyphus/middleware/grpc/GrpcChannelProperty.kt b/...-grpc-client/src/main/kotlin/com/bybutter/sisyphus/middleware/grpc/GrpcChannelProperty.kt
@@ -1,11 +1,18 @@
 package com.bybutter.sisyphus.middleware.grpc
 
 import io.grpc.CallOptions
+import org.springframework.boot.context.properties.NestedConfigurationProperty
 
 data class GrpcChannelProperty(
     val name: String,
     val target: String,
     val services: Set<Class<*>>,
+    val tls: Boolean = false,
     val options: CallOptions = CallOptions.DEFAULT,
     val extensions: Map<String, Any> = mapOf()
 )
+
+data class GrpcChannelProperties(
+    @NestedConfigurationProperty
+    val grpc: Map<String, GrpcChannelProperty>
+)
diff --git a/...pc-client/src/main/kotlin/com/bybutter/sisyphus/middleware/grpc/RemoteClientRepository.kt b/...pc-client/src/main/kotlin/com/bybutter/sisyphus/middleware/grpc/RemoteClientRepository.kt
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.getBean
 import org.springframework.beans.factory.getBeansOfType
 import org.springframework.beans.factory.support.AbstractBeanDefinition
 import org.springframework.beans.factory.support.BeanDefinitionBuilder
+import org.springframework.boot.context.properties.bind.Binder
 import org.springframework.core.env.Environment
 
 class RemoteClientRepository : ClientRepository {
@@ -19,7 +20,12 @@ class RemoteClientRepository : ClientRepository {
         beanFactory: ConfigurableListableBeanFactory,
         environment: Environment
     ): List<AbstractBeanDefinition> {
-        val properties = beanFactory.getBeansOfType<GrpcChannelProperty>()
+        val properties = beanFactory.getBeansOfType<GrpcChannelProperty>().toMutableMap()
+        val grpcProperties = Binder.get(environment)
+            .bind("sisyphus", GrpcChannelProperties::class.java)
+            .orElse(null)?.grpc ?: mapOf()
+        properties += grpcProperties
+
         if (properties.isEmpty()) return arrayListOf()
         val beanDefinitionList = arrayListOf<AbstractBeanDefinition>()
 
@@ -31,7 +37,12 @@ class RemoteClientRepository : ClientRepository {
             beanFactory.getBean<ManagedChannelLifecycle>(ClientRegistrar.QUALIFIER_AUTO_CONFIGURED_GRPC_CHANNEL_LIFECYCLE)
 
         for (property in properties.values) {
-            val channel = createGrpcChannel(property.target, channelBuilderInterceptors.values, managedChannelLifecycle)
+            val channel = createGrpcChannel(
+                property.target,
+                property.tls,
+                channelBuilderInterceptors.values,
+                managedChannelLifecycle
+            )
             beanFactory.registerSingleton(property.name, channel)
             for (service in property.services) {
                 val client = getClientFromService(service)