Abstract some common bindings of TrinoAwsProxyServerModule

Abstract new static methods so portions of module can be used in other contexts
trinodb · Jan 27, 2025 · 09d5c7f · 09d5c7f
1 parent 6ad6677
commit 09d5c7f
Showing 1 changed file with 41 additions and 31 deletions.
diff --git a/trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/TrinoAwsProxyServerModule.java b/trino-aws-proxy/src/main/java/io/trino/aws/proxy/server/TrinoAwsProxyServerModule.java
@@ -86,6 +86,38 @@ public class TrinoAwsProxyServerModule
 {
     private static final Logger log = Logger.get(TrinoAwsProxyServerModule.class);
 
+    public static void commonBindings(Binder binder)
+    {
+        configBinder(binder).bindConfig(RequestLoggerConfig.class);
+
+        JaxrsBinder jaxrsBinder = jaxrsBinder(binder);
+        jaxrsBinder.bind(ParamProvider.class);
+        jaxrsBinder.bind(ResourceSecurityDynamicFeature.class);
+
+        binder.bind(CredentialsController.class).in(Scopes.SINGLETON);
+        binder.bind(RequestLoggerController.class).in(Scopes.SINGLETON);
+
+        // CredentialsProvider binder
+        configBinder(binder).bindConfig(CredentialsProviderConfig.class);
+        newOptionalBinder(binder, CredentialsProvider.class).setDefault().toProvider(() -> {
+            log.info("Using default %s NOOP implementation", CredentialsProvider.class.getSimpleName());
+            return CredentialsProvider.NOOP;
+        });
+        newOptionalBinder(binder, new TypeLiteral<Class<? extends Identity>>() {}).setDefault().toProvider(() -> {
+            log.info("Using %s identity type", StandardIdentity.class.getSimpleName());
+            return StandardIdentity.class;
+        });
+        newSetBinder(binder, com.fasterxml.jackson.databind.Module.class).addBinding().toProvider(JsonIdentityProvider.class).in(Scopes.SINGLETON);
+
+        // AssumedRoleProvider binder
+        configBinder(binder).bindConfig(AssumedRoleProviderConfig.class);
+        // AssumedRoleProvider provided implementations
+        newOptionalBinder(binder, AssumedRoleProvider.class).setDefault().toProvider(() -> {
+            log.info("Using default %s NOOP implementation", AssumedRoleProvider.class.getSimpleName());
+            return AssumedRoleProvider.NOOP;
+        });
+    }
+
     @Provides
     @Singleton
     public RemoteUriFacade remoteUriFacade(RemoteS3Facade remoteS3Facade)
@@ -96,22 +128,20 @@ public RemoteUriFacade remoteUriFacade(RemoteS3Facade remoteS3Facade)
     @Override
     protected void setup(Binder binder)
     {
-        configBinder(binder).bindConfig(RequestLoggerConfig.class);
+        commonBindings(binder);
+
         configBinder(binder).bindConfig(SigningControllerConfig.class);
         TrinoAwsProxyConfig builtConfig = buildConfigObject(TrinoAwsProxyConfig.class);
 
         JaxrsBinder jaxrsBinder = jaxrsBinder(binder);
 
         jaxrsBinder.bind(ThrowableMapper.class);
-        jaxrsBinder.bind(ParamProvider.class);
-        jaxrsBinder.bind(ResourceSecurityDynamicFeature.class);
+
         bindResourceAtPath(jaxrsBinder, TrinoS3Resource.class, builtConfig.getS3Path());
         bindResourceAtPath(jaxrsBinder, TrinoStsResource.class, builtConfig.getStsPath());
         bindResourceAtPath(jaxrsBinder, TrinoLogsResource.class, builtConfig.getLogsPath());
         bindResourceAtPath(jaxrsBinder, TrinoStatusResource.class, builtConfig.getStatusPath());
 
-        binder.bind(CredentialsController.class).in(Scopes.SINGLETON);
-        binder.bind(RequestLoggerController.class).in(Scopes.SINGLETON);
         binder.bind(LimitStreamController.class).in(Scopes.SINGLETON);
 
         // TODO config, etc.
@@ -129,18 +159,6 @@ protected void setup(Binder binder)
             return S3SecurityFacadeProvider.NOOP;
         });
 
-        // CredentialsProvider binder
-        configBinder(binder).bindConfig(CredentialsProviderConfig.class);
-        newOptionalBinder(binder, CredentialsProvider.class).setDefault().toProvider(() -> {
-            log.info("Using default %s NOOP implementation", CredentialsProvider.class.getSimpleName());
-            return CredentialsProvider.NOOP;
-        });
-        newOptionalBinder(binder, new TypeLiteral<Class<? extends Identity>>() {}).setDefault().toProvider(() -> {
-            log.info("Using %s identity type", StandardIdentity.class.getSimpleName());
-            return StandardIdentity.class;
-        });
-        newSetBinder(binder, com.fasterxml.jackson.databind.Module.class).addBinding().toProvider(JsonIdentityProvider.class).in(Scopes.SINGLETON);
-
         // RequestRewriter binder
         configBinder(binder).bindConfig(S3RequestRewriterConfig.class);
         newOptionalBinder(binder, S3RequestRewriter.class).setDefault().toProvider(() -> {
@@ -153,14 +171,6 @@ protected void setup(Binder binder)
         install(new OpaS3SecurityModule());
         install(new HttpCredentialsModule());
 
-        // AssumedRoleProvider binder
-        configBinder(binder).bindConfig(AssumedRoleProviderConfig.class);
-        // AssumedRoleProvider provided implementations
-        newOptionalBinder(binder, AssumedRoleProvider.class).setDefault().toProvider(() -> {
-            log.info("Using default %s NOOP implementation", AssumedRoleProvider.class.getSimpleName());
-            return AssumedRoleProvider.NOOP;
-        });
-
         // RemoteS3 binder
         newOptionalBinder(binder, RemoteS3Facade.class);
         // RemoteS3 provided implementation
@@ -188,6 +198,12 @@ public XmlMapper newXmlMapper()
         return xmlMapper;
     }
 
+    public static void bindResourceAtPath(JaxrsBinder jaxrsBinder, Class<?> resourceClass, String resourcePrefix)
+    {
+        jaxrsBinder.bind(resourceClass);
+        jaxrsBinder.bindInstance(Resource.builder(resourceClass).path(resourcePrefix).build());
+    }
+
     @VisibleForTesting
     protected void installS3SecurityController(Binder binder)
     {
@@ -224,10 +240,4 @@ private void installPlugins()
                     install(plugin.module());
                 });
     }
-
-    private static void bindResourceAtPath(JaxrsBinder jaxrsBinder, Class<?> resourceClass, String resourcePrefix)
-    {
-        jaxrsBinder.bind(resourceClass);
-        jaxrsBinder.bindInstance(Resource.builder(resourceClass).path(resourcePrefix).build());
-    }
 }