Added ITs for scalecube-services-security module, fixed builders

artem-v · artem-v · commit 23c00102d659 · 2025-03-08T15:12:11.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
 
   <properties>
     <scalecube-cluster.version>2.7.1</scalecube-cluster.version>
-    <scalecube-security.version>1.1.0</scalecube-security.version>
+    <scalecube-security.version>1.1.1.RC2</scalecube-security.version>
 
     <reactor.version>2020.0.32</reactor.version>
     <jackson.version>2.18.2</jackson.version>
@@ -73,6 +73,8 @@
     <junit-jupiter.version>5.8.2</junit-jupiter.version>
     <hamcrest.version>1.3</hamcrest.version>
     <log4j.version>2.17.2</log4j.version>
+    <vault-java-driver.version>5.1.0</vault-java-driver.version>
+    <testcontainers.version>1.20.4</testcontainers.version>
 
     <distributionManagement.url>https://maven.pkg.github.com/scalecube/scalecube-services
     </distributionManagement.url>
diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientTransport.java b/services-gateway/src/main/java/io/scalecube/services/gateway/client/http/HttpGatewayClientTransport.java
@@ -57,6 +57,10 @@ private HttpGatewayClientTransport(Builder builder) {
     this.ownsLoopResources = builder.loopResources == null;
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   @Override
   public ClientChannel create(ServiceReference serviceReference) {
     httpClientReference.getAndUpdate(
@@ -148,7 +152,7 @@ public static class Builder {
     private LoopResources loopResources;
     private Function<HttpClient, HttpClient> operator = client -> client;
 
-    public Builder() {}
+    private Builder() {}
 
     public Builder clientCodec(GatewayClientCodec clientCodec) {
       this.clientCodec = clientCodec;
diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientTransport.java b/services-gateway/src/main/java/io/scalecube/services/gateway/client/websocket/WebsocketGatewayClientTransport.java
@@ -59,6 +59,10 @@ private WebsocketGatewayClientTransport(Builder builder) {
     this.ownsLoopResources = builder.loopResources == null;
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   @Override
   public ClientChannel create(ServiceReference serviceReference) {
     clientSessionReference.getAndUpdate(
@@ -204,7 +208,7 @@ public static class Builder {
     private Duration keepAliveInterval = Duration.ZERO;
     private Function<HttpClient, HttpClient> operator = client -> client;
 
-    public Builder() {}
+    private Builder() {}
 
     public Builder clientCodec(GatewayClientCodec clientCodec) {
       this.clientCodec = clientCodec;
diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java b/services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java
@@ -50,6 +50,10 @@ private HttpGateway(Builder builder) {
     this.corsConfigBuilder = builder.corsConfigBuilder;
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   @Override
   public String id() {
     return id;
@@ -119,7 +123,7 @@ public static class Builder {
             .allowNullOrigin()
             .maxAge(3600);
 
-    public Builder() {}
+    private Builder() {}
 
     public String id() {
       return id;
diff --git a/services-gateway/src/main/java/io/scalecube/services/gateway/websocket/WebsocketGateway.java b/services-gateway/src/main/java/io/scalecube/services/gateway/websocket/WebsocketGateway.java
@@ -41,6 +41,10 @@ private WebsocketGateway(Builder builder) {
     this.errorMapper = builder.errorMapper;
   }
 
+  public static Builder builder() {
+    return new Builder();
+  }
+
   @Override
   public String id() {
     return id;
@@ -144,7 +148,7 @@ public static class Builder {
     private boolean heartbeatEnabled = false;
     private ServiceProviderErrorMapper errorMapper = DefaultErrorMapper.INSTANCE;
 
-    public Builder() {}
+    private Builder() {}
 
     public String id() {
       return id;
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/files/FileDownloadTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/files/FileDownloadTest.java
@@ -72,8 +72,8 @@ static void beforeAll() {
                             .options(opts -> opts.metadata(serviceEndpoint)))
                 .transport(
                     () -> new RSocketServiceTransport().credentialsSupplier(credentialsSupplier))
-                .gateway(() -> new HttpGateway.Builder().id("HTTP").build())
-                .gateway(() -> new WebsocketGateway.Builder().id("WS").build()));
+                .gateway(() -> HttpGateway.builder().id("HTTP").build())
+                .gateway(() -> WebsocketGateway.builder().id("WS").build()));
 
     microservices =
         Microservices.start(
@@ -109,7 +109,7 @@ void beforeEach() {
     serviceCall =
         new ServiceCall()
             .router(StaticAddressRouter.from(wsAddress).build())
-            .transport(new WebsocketGatewayClientTransport.Builder().address(wsAddress).build());
+            .transport(WebsocketGatewayClientTransport.builder().address(wsAddress).build());
   }
 
   @AfterEach
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/CorsTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/CorsTest.java
@@ -54,7 +54,7 @@ void testCrossOriginRequest() {
             new Context()
                 .gateway(
                     () ->
-                        new HttpGateway.Builder()
+                        HttpGateway.builder()
                             .id("http")
                             .corsEnabled(true)
                             .corsConfigBuilder(
@@ -120,7 +120,7 @@ void testOptionRequestCorsDisabled() {
     gateway =
         Microservices.start(
             new Context()
-                .gateway(() -> new HttpGateway.Builder().id("http").build())
+                .gateway(() -> HttpGateway.builder().id("http").build())
                 .services(new GreetingServiceImpl()));
 
     final HttpClient client = newClient(gateway.gateway("http").address());
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpClientConnectionTest.java
@@ -43,7 +43,7 @@ void beforEach() {
                             .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                             .options(opts -> opts.metadata(serviceEndpoint)))
                 .transport(RSocketServiceTransport::new)
-                .gateway(() -> new HttpGateway.Builder().id("HTTP").build()));
+                .gateway(() -> HttpGateway.builder().id("HTTP").build()));
 
     gatewayAddress = gateway.gateway("HTTP").address();
 
@@ -101,7 +101,7 @@ public void testCallRepeatedlyByInvalidAddress() {
   private static ServiceCall serviceCall(Address address) {
     return new ServiceCall()
         .logger("serviceCall")
-        .transport(new HttpGatewayClientTransport.Builder().address(address).build())
+        .transport(HttpGatewayClientTransport.builder().address(address).build())
         .router(StaticAddressRouter.from(address).build());
   }
 
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpGatewayTest.java
@@ -57,8 +57,7 @@ static void beforeAll() {
                             .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                             .options(opts -> opts.metadata(serviceEndpoint)))
                 .transport(RSocketServiceTransport::new)
-                .gateway(
-                    () -> new HttpGateway.Builder().id("HTTP").errorMapper(ERROR_MAPPER).build()));
+                .gateway(() -> HttpGateway.builder().id("HTTP").errorMapper(ERROR_MAPPER).build()));
 
     gatewayAddress = gateway.gateway("HTTP").address();
     router = StaticAddressRouter.from(gatewayAddress).build();
@@ -87,7 +86,7 @@ void beforeEach() {
     serviceCall =
         new ServiceCall()
             .router(router)
-            .transport(new HttpGatewayClientTransport.Builder().address(gatewayAddress).build());
+            .transport(HttpGatewayClientTransport.builder().address(gatewayAddress).build());
     greetingService = serviceCall.api(GreetingService.class);
     errorService = serviceCall.errorMapper(ERROR_MAPPER).api(ErrorService.class);
   }
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/http/HttpLocalGatewayTest.java
@@ -47,7 +47,7 @@ static void beforeAll() {
     gateway =
         Microservices.start(
             new Context()
-                .gateway(() -> new HttpGateway.Builder().id("HTTP").build())
+                .gateway(() -> HttpGateway.builder().id("HTTP").build())
                 .defaultLogger("gateway")
                 .services(new GreetingServiceImpl())
                 .services(
@@ -63,7 +63,7 @@ void beforeEach() {
     serviceCall =
         new ServiceCall()
             .router(router)
-            .transport(new HttpGatewayClientTransport.Builder().address(gatewayAddress).build());
+            .transport(HttpGatewayClientTransport.builder().address(gatewayAddress).build());
     greetingService = serviceCall.api(GreetingService.class);
     errorService = serviceCall.errorMapper(ERROR_MAPPER).api(ErrorService.class);
   }
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/rest/RestGatewayTest.java
@@ -19,7 +19,7 @@
 import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
 import io.scalecube.services.examples.GreetingServiceImpl;
 import io.scalecube.services.exceptions.ServiceUnavailableException;
-import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport.Builder;
+import io.scalecube.services.gateway.client.websocket.WebsocketGatewayClientTransport;
 import io.scalecube.services.gateway.http.HttpGateway;
 import io.scalecube.services.gateway.websocket.WebsocketGateway;
 import io.scalecube.services.routing.StaticAddressRouter;
@@ -58,8 +58,8 @@ static void beforeAll() {
                             .options(opts -> opts.metadata(serviceEndpoint)))
                 .transport(RSocketServiceTransport::new)
                 .defaultLogger("gateway")
-                .gateway(() -> new HttpGateway.Builder().id("HTTP").build())
-                .gateway(() -> new WebsocketGateway.Builder().id("WS").build()));
+                .gateway(() -> HttpGateway.builder().id("HTTP").build())
+                .gateway(() -> WebsocketGateway.builder().id("WS").build()));
 
     httpGatewayAddress = "http://localhost:" + gateway.gateway("HTTP").address().port();
 
@@ -299,7 +299,8 @@ void testNoMatchByRestMethod() throws Exception {
     void testNoMatchWithoutRestMethod() {
       final var gatewayAddress = gateway.gateway("WS").address();
       final var router = StaticAddressRouter.from(gatewayAddress).build();
-      final var clientTransport = new Builder().address(gatewayAddress).build();
+      final var clientTransport =
+          WebsocketGatewayClientTransport.builder().address(gatewayAddress).build();
 
       try (final var serviceCall = new ServiceCall().router(router).transport(clientTransport)) {
         StepVerifier.create(serviceCall.api(RoutingService.class).update(new SomeRequest()))
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java
@@ -50,7 +50,7 @@ void beforEach() {
                 .transport(RSocketServiceTransport::new)
                 .gateway(
                     () ->
-                        new WebsocketGateway.Builder()
+                        WebsocketGateway.builder()
                             .id("WS")
                             .gatewayHandler(sessionEventHandler)
                             .build()));
@@ -138,7 +138,7 @@ void testClientHeaders() {
     try (final ServiceCall serviceCall =
         new ServiceCall()
             .transport(
-                new WebsocketGatewayClientTransport.Builder()
+                WebsocketGatewayClientTransport.builder()
                     .address(gatewayAddress)
                     .headers(Collections.singletonMap(headerKey, headerValue))
                     .build())
@@ -156,7 +156,7 @@ void testClientHeaders() {
 
   private static ServiceCall serviceCall(Address address) {
     return new ServiceCall()
-        .transport(new WebsocketGatewayClientTransport.Builder().address(address).build())
+        .transport(WebsocketGatewayClientTransport.builder().address(address).build())
         .router(StaticAddressRouter.from(address).build());
   }
 }
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientTest.java
@@ -47,7 +47,7 @@ static void beforeAll() {
                 .transport(RSocketServiceTransport::new)
                 .gateway(
                     () ->
-                        new WebsocketGateway.Builder()
+                        WebsocketGateway.builder()
                             .id("WS")
                             .gatewayHandler(new TestGatewaySessionHandler())
                             .build()));
@@ -111,7 +111,7 @@ void shouldReturnSomeExceptionOnMono() {
 
   private static ServiceCall serviceCall(final Address address) {
     return new ServiceCall()
-        .transport(new WebsocketGatewayClientTransport.Builder().address(address).build())
+        .transport(WebsocketGatewayClientTransport.builder().address(address).build())
         .router(StaticAddressRouter.from(address).build());
   }
 
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayAuthTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayAuthTest.java
@@ -44,7 +44,7 @@ static void beforeAll() {
             new Context()
                 .gateway(
                     () ->
-                        new WebsocketGateway.Builder()
+                        WebsocketGateway.builder()
                             .id("WS")
                             .gatewayHandler(new GatewaySessionHandlerImpl(AUTH_REGISTRY))
                             .build())
@@ -59,8 +59,7 @@ void beforeEach() {
     serviceCall =
         new ServiceCall()
             .router(StaticAddressRouter.from(gatewayAddress).build())
-            .transport(
-                new WebsocketGatewayClientTransport.Builder().address(gatewayAddress).build());
+            .transport(WebsocketGatewayClientTransport.builder().address(gatewayAddress).build());
 
     securedService = serviceCall.api(SecuredService.class);
   }
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayTest.java
@@ -64,8 +64,7 @@ static void beforeAll() {
                             .transport(cfg -> cfg.transportFactory(new WebsocketTransportFactory()))
                             .options(opts -> opts.metadata(serviceEndpoint)))
                 .transport(RSocketServiceTransport::new)
-                .gateway(
-                    () -> new WebsocketGateway.Builder().id("WS").heartbeatEnabled(true).build()));
+                .gateway(() -> WebsocketGateway.builder().id("WS").heartbeatEnabled(true).build()));
 
     gatewayAddress = gateway.gateway("WS").address();
     router = StaticAddressRouter.from(gatewayAddress).build();
@@ -94,8 +93,7 @@ void beforeEach() {
     serviceCall =
         new ServiceCall()
             .router(router)
-            .transport(
-                new WebsocketGatewayClientTransport.Builder().address(gatewayAddress).build());
+            .transport(WebsocketGatewayClientTransport.builder().address(gatewayAddress).build());
     greetingService = serviceCall.api(GreetingService.class);
     errorService = serviceCall.errorMapper(ERROR_MAPPER).api(ErrorService.class);
   }
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketLocalGatewayTest.java
@@ -56,7 +56,7 @@ static void beforeAll() {
             new Context()
                 .gateway(
                     () ->
-                        new WebsocketGateway.Builder()
+                        WebsocketGateway.builder()
                             .id("WS")
                             .serviceCall(call -> call.errorMapper(ERROR_MAPPER))
                             .errorMapper(ERROR_MAPPER)
@@ -77,8 +77,7 @@ void beforeEach() {
     serviceCall =
         new ServiceCall()
             .router(router)
-            .transport(
-                new WebsocketGatewayClientTransport.Builder().address(gatewayAddress).build());
+            .transport(WebsocketGatewayClientTransport.builder().address(gatewayAddress).build());
     greetingService = serviceCall.api(GreetingService.class);
     errorService = serviceCall.errorMapper(ERROR_MAPPER).api(ErrorService.class);
   }
diff --git a/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java b/services-gateway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketServerTest.java
@@ -29,7 +29,7 @@ static void beforeAll() {
             new Context()
                 .gateway(
                     () ->
-                        new WebsocketGateway.Builder()
+                        WebsocketGateway.builder()
                             .id("WS")
                             .gatewayHandler(new TestGatewaySessionHandler())
                             .build())
@@ -49,8 +49,7 @@ static void afterAll() {
   void testMessageSequence() {
     try (ServiceCall serviceCall =
         new ServiceCall()
-            .transport(
-                new WebsocketGatewayClientTransport.Builder().address(gatewayAddress).build())
+            .transport(WebsocketGatewayClientTransport.builder().address(gatewayAddress).build())
             .router(StaticAddressRouter.from(gatewayAddress).build())) {
       int count = 1000;
       StepVerifier.create(serviceCall.api(TestService.class).many(count) /*.log("<<<")*/)
diff --git a/services-security/pom.xml b/services-security/pom.xml
@@ -26,6 +26,31 @@
       <groupId>io.scalecube</groupId>
       <artifactId>scalecube-security-vault</artifactId>
     </dependency>
+    <!-- Tests -->
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-services-testlib</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.scalecube</groupId>
+      <artifactId>scalecube-security-tests</artifactId>
+      <version>${scalecube-security.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>vault</artifactId>
+      <version>${testcontainers.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.bettercloud</groupId>
+      <artifactId>vault-java-driver</artifactId>
+      <version>${vault-java-driver.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/services-security/src/main/java/io/scalecube/services/security/ServiceTokenAuthenticator.java b/services-security/src/main/java/io/scalecube/services/security/ServiceTokenAuthenticator.java
diff --git a/services-security/src/main/java/io/scalecube/services/security/ServiceTokenCredentialsSupplier.java b/services-security/src/main/java/io/scalecube/services/security/ServiceTokenCredentialsSupplier.java
diff --git a/services-security/src/main/java/io/scalecube/services/security/VaultServiceRolesProcessor.java b/services-security/src/main/java/io/scalecube/services/security/VaultServiceRolesProcessor.java
diff --git a/services-security/src/test/java/io/scalecube/services/security/ServiceTokenTests.java b/services-security/src/test/java/io/scalecube/services/security/ServiceTokenTests.java
diff --git a/services-security/src/test/java/io/scalecube/services/security/environment/IntegrationEnvironmentFixture.java b/services-security/src/test/java/io/scalecube/services/security/environment/IntegrationEnvironmentFixture.java
diff --git a/services-security/src/test/java/io/scalecube/services/security/environment/VaultEnvironment.java b/services-security/src/test/java/io/scalecube/services/security/environment/VaultEnvironment.java
diff --git a/services-security/src/test/resources/log4j2-test.xml b/services-security/src/test/resources/log4j2-test.xml
