BNPPFSLA-1125 [cleanup]

Author: codingBenVdS

integration-tests/build.gradle

@@ -34,6 +34,7 @@ dependencies {
     testImplementation('com.amazonaws:aws-java-sdk-s3')
     testImplementation("com.amazonaws:aws-java-sdk-sts")
     testRuntimeOnly "org.glassfish.jaxb:jaxb-runtime:${jaxBVersion}"
+
 }
 test {
     useJUnitPlatform()

integration-tests/src/test/java/eu/xenit/solr/backup/s3/SolrBackupTest.java

@@ -29,8 +29,6 @@ class SolrBackupTest {
     private static final Log log = LogFactory.getLog(SolrBackupTest.class);
     static RequestSpecification spec;
     static RequestSpecification specBackup;
-    static RequestSpecification specBackup2;
-    static RequestSpecification specBackup3;
     static RequestSpecification specBackupDetails;
     static RequestSpecification specRestore;
     static RequestSpecification specRestoreStatus;
@@ -72,25 +70,6 @@ public void setup() {
                 .addParam("numberToKeep", "2")
                 .addParam("wt", "json")
                 .build();
-        specBackup2 = new RequestSpecBuilder()
-                .setBaseUri(baseURISolr)
-                .setPort(solrPort)
-                .setBasePath(basePathSolrBackup)
-                .addParam("command", "backup")
-                .addParam("repository", "s3")
-                .addParam("numberToKeep", "2")
-                .addParam("name", "my-test-name-1")
-                .addParam("wt", "json")
-                .build();
-        specBackup3 = new RequestSpecBuilder()
-                .setBaseUri(baseURISolr)
-                .setPort(solrPort)
-                .setBasePath(basePathSolrBackup)
-                .addParam("command", "backup")
-                .addParam("repository", "s3")
-                .addParam("numberToKeep", "2")
-                .addParam("wt", "json")
-                .build();
         specBackupDetails = new RequestSpecBuilder()
                 .setBaseUri(baseURISolr)
                 .setPort(solrPort)
@@ -112,7 +91,6 @@ public void setup() {
                 .addParam("command", "restorestatus")
                 .addParam("wt", "json")
                 .build();
-        //        s3:/opt/alfresco-search-services/data/solr6Backup/alfresco/snapshot.my-test-name-0
         specRestorePointInTimeStatus = new RequestSpecBuilder()
                 .setBaseUri(baseURISolr)
                 .setPort(8081)
@@ -129,12 +107,9 @@ public void setup() {
         }
     }
 
-    //    Startup new SOLR container and check if we can fetch the S3 backups for point-in-time restore...
     @Test
     @Order(3)
     void testRestorePointInTimeScriptEndpoint() {
-        // After the solr-restore-in-time has started-up check if restore was succesfull
-        // Restore is run via startup script in container.
         System.out.println("Restore triggered at solr-startup after health-check succeeded, will wait maximum 3 minutes");
         long startTime = System.currentTimeMillis();
         await().atMost(180, TimeUnit.SECONDS)
@@ -194,7 +169,6 @@ void testBackupWithNumberToLiveEndpoint() {
 
 
     void validateSnapshotCount(long count) {
-        System.out.println("validateSnapshotCount count: " + count + ", ");
         await().atMost(180, TimeUnit.SECONDS)
                 .until(() -> s3Client.listObjects(BUCKET)
                         .getObjectSummaries()

integration-tests/src/test/resources/compose/docker-compose.yml

@@ -1,5 +1,3 @@
-#version: '3.8'
-
 services:
   alfresco:
     image: "${ALFRESCO_IMAGE:-local}"
@@ -14,7 +12,6 @@ services:
       - GLOBAL_local.transform.service.enabled=false
       - GLOBAL_solr.sharedSecret=mysolrsecret
       - JAVA_XMX=2048M
-# s3:/opt/alfresco-search-services/data/solr6Backup/alfresco/snapshot.my-test-name-0
   postgresql:
     image: docker.io/xenit/postgres
     networks:
@@ -77,8 +74,8 @@ services:
       - S3_SECRET_KEY=secret_key
       - S3_PATH_STYLE_ACCESS_ENABLED=true
       - RESTORE_FROM_BACKUP=true
-#      - RESTORE_BACKUP_NAME='snapshot.my-test-name-1'
-#      - RESTORE_BACKUP_PATH='opt/alfresco-search-services/data/solr6Backup/alfresco'
+      - RESTORE_BACKUP_NAME='snapshot.my-test-name-1'
+      - RESTORE_BACKUP_PATH='opt/alfresco-search-services/data/solr6Backup/alfresco'
   localstack:
     container_name: localstack
     image: localstack/localstack:2.3.2
@@ -96,9 +93,4 @@ services:
       - ./solr_backups:/backups
 networks:
   solr-backup-local-network:
-    driver: bridge
-
-#  curl 'http://localhost:8080/solr/alfresco/replication?command=backup&name=my-test-name-0'
-
-#attempt restore on special solr container...
-#"https://localhost:8081/solr/alfresco/replication?command=restore&repository=s3&name=my-test-name-0"
+    driver: bridge