Merge pull request #40 from devatherock/fix-test-failure

fix: Limited heap size in integration tests, to fix the OOM error
devatherock · May 29, 2023 · 4a34710 · 4a34710
2 parents 0cbd234 + efb92d6
commit 4a34710
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -147,7 +147,7 @@ jobs:
 
   integration_test:
     machine:
-      image: ubuntu-2004:202010-01
+      image: ubuntu-2204:2023.04.2
     steps:
       - checkout
       - attach_workspace:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [#30](https://github.com/devatherock/ldap-search-api/issues/30): Updated dockerhub readme in CI pipeline
 - [#32](https://github.com/devatherock/ldap-search-api/issues/32): Built a multi-arch docker image
 - Used a multi-arch base image
+- [#39](https://github.com/devatherock/ldap-search-api/issues/39]: Limited heap size in integration tests, to fix the out of memory error
 
 ## [0.5.0] - 2023-05-24
 ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
 FROM eclipse-temurin:17.0.7_7-jre-ubi9-minimal
 COPY build/libs/ldap-search-api-*-all.jar ldap-search-api.jar
 EXPOSE 8080
-CMD java -Dcom.sun.management.jmxremote -noverify ${JAVA_OPTS} -jar ldap-search-api.jar
+CMD java -Dcom.sun.management.jmxremote ${JAVA_OPTS} -jar ldap-search-api.jar
diff --git a/docker-compose-remote.yml b/docker-compose-remote.yml
@@ -8,4 +8,5 @@ services:
       LDAP_HOST: ldaps://ldap.jumpcloud.com:636
       LDAP_USERNAME: $JUMPCLOUD_USERNAME
       LDAP_PASSWORD: $JUMPCLOUD_PASSWORD
-      LDAP_BASE_DN: $JUMPCLOUD_BASE_DN
+      LDAP_BASE_DN: $JUMPCLOUD_BASE_DN
+      JAVA_OPTS: '-Xmx640m'
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,4 +8,5 @@ services:
       LDAP_HOST: ldap://localhost:33389
       LDAP_USERNAME: cn=Directory Manager
       LDAP_PASSWORD: testpwd
-      JACKSON_SERIALIZATION_INDENT_OUTPUT: 'true'
+      JACKSON_SERIALIZATION_INDENT_OUTPUT: 'true'
+      JAVA_OPTS: '-Xmx640m'
diff --git a/...AdditionalEndpointsIntegrationSpec.groovy → ...dditionalControllerIntegrationSpec.groovy b/...AdditionalEndpointsIntegrationSpec.groovy → ...dditionalControllerIntegrationSpec.groovy
@@ -6,5 +6,5 @@ import io.micronaut.test.extensions.spock.annotation.MicronautTest
  * Integration test for additional endpoints
  */
 @MicronautTest(propertySources = 'classpath:application-integration.yml', startApplication = false)
-class AdditionalEndpointsIntegrationSpec extends AdditionalEndpointsSpec {
+class AdditionalControllerIntegrationSpec extends AdditionalControllerSpec {
 }
diff --git a/src/main/java/io/github/devatherock/ldapsearch/controllers/LdapSearchController.java b/src/main/java/io/github/devatherock/ldapsearch/controllers/LdapSearchController.java
@@ -34,14 +34,14 @@ public class LdapSearchController {
      * @param baseDn
      * @param filter
      * @param limit
-     * @param attributes
+     * @param requiredAttrs
      * @return the search results
      * @throws NamingException
      */
     @Get(value = "/search")
     public HttpResponse<List<Map<String, Object>>> search(@Nullable @QueryValue(value = "base_dn") String baseDn,
                                                           @QueryValue String filter,
-                                                          @Nullable @QueryValue(defaultValue = "0") int limit,
+                                                          @Nullable @QueryValue(defaultValue = "0") Integer limit,
                                                           @Nullable @QueryValue(value = "attributes") List<String> requiredAttrs)
             throws NamingException {
         HttpResponse<List<Map<String, Object>>> response = null;

diff --git a/...ontrollers/AdditionalEndpointsSpec.groovy → ...ntrollers/AdditionalControllerSpec.groovy b/...ontrollers/AdditionalEndpointsSpec.groovy → ...ntrollers/AdditionalControllerSpec.groovy
@@ -11,7 +11,7 @@ import spock.lang.Unroll
 /**
  * Test for additional endpoints like {@code /health}
  */
-abstract class AdditionalEndpointsSpec extends Specification {
+abstract class AdditionalControllerSpec extends Specification {
 
     @Inject
     @Client('${test.server.url}')

diff --git a/...ollers/AdditionalEndpointsTestSpec.groovy → ...llers/AdditionalControllerTestSpec.groovy b/...ollers/AdditionalEndpointsTestSpec.groovy → ...llers/AdditionalControllerTestSpec.groovy
@@ -6,5 +6,5 @@ import io.micronaut.test.extensions.spock.annotation.MicronautTest
  * Unit test for additional endpoints
  */
 @MicronautTest
-class AdditionalEndpointsTestSpec extends AdditionalEndpointsSpec {
+class AdditionalControllerTestSpec extends AdditionalControllerSpec {
 }