Fix missing index in expected output for end to end tests

Signed-off-by: Peter Nied <peternied@hotmail.com>
opensearch-project · Oct 9, 2024 · 08e4f61 · 08e4f61
1 parent 0c58a4b
commit 08e4f61
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...dataMigration/src/main/java/org/opensearch/migrations/commands/MigratorEvaluatorBase.java b/...dataMigration/src/main/java/org/opensearch/migrations/commands/MigratorEvaluatorBase.java
@@ -1,6 +1,7 @@
 package org.opensearch.migrations.commands;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.opensearch.migrations.MigrateOrEvaluateArgs;
 import org.opensearch.migrations.MigrationMode;
@@ -65,13 +66,15 @@ protected Items migrateAllItems(MigrationMode migrationMode, Clusters clusters,
         items.indexTemplates(indexTemplates);
         items.componentTemplates(metadataResults.getComponentTemplates());
 
-        if (metadataResults.fatalIssueCount() != 0) {
-            log.warn("Stopping before index migration due to issues");
+        if (metadataResults.fatalIssueCount() == 0) {
             var indexResults = migrateIndices(migrationMode, clusters, transformer, context);
             items.indexes(indexResults.getIndexNames());
             items.aliases(indexResults.getAliases());
         } else {
-            items.failureMessage("Encountered " + metadataResults.fatalIssueCount() + " unrecoverable issues, details above.");
+            items.indexes(List.of());
+            items.aliases(List.of());
+            log.warn("Stopping before index migration due to issues");
+            items.failureMessage("Encountered " + metadataResults.fatalIssueCount() + " fatal issue(s) while moving global objects.");
         }
 
         return items.build();

diff --git a/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java b/MetadataMigration/src/test/java/org/opensearch/migrations/EndToEndTest.java
@@ -219,7 +219,7 @@ private void verifyCommandResults(
         var migratedItems = result.getItems();
         assertThat(getNames(migratedItems.getIndexTemplates()), containsInAnyOrder(testData.indexTemplateName));
         assertThat(getNames(migratedItems.getComponentTemplates()), equalTo(sourceIsES6_8 ? List.of() : List.of(testData.compoTemplateName)));
-        assertThat(getNames(migratedItems.getIndexes()), containsInAnyOrder(testData.blogIndexName, testData.movieIndexName));
+        assertThat(getNames(migratedItems.getIndexes()), containsInAnyOrder(testData.blogIndexName, testData.movieIndexName, testData.indexThatAlreadyExists));
         assertThat(getNames(migratedItems.getAliases()), containsInAnyOrder(testData.aliasInTemplate, testData.aliasName));
     }
 

diff --git a/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexMetadataResults.java b/RFS/src/main/java/org/opensearch/migrations/bulkload/worker/IndexMetadataResults.java
@@ -5,14 +5,20 @@
 import org.opensearch.migrations.metadata.CreationResult;
 
 import lombok.Builder;
-import lombok.Data;
 import lombok.Singular;
 
 @Builder
-@Data
 public class IndexMetadataResults {
     @Singular
     private final List<CreationResult> indexNames;
     @Singular
     private final List<CreationResult> aliases;
+
+    public List<CreationResult> getIndexNames() {
+        return indexNames == null ? List.of() : indexNames;
+    }
+
+    public List<CreationResult> getAliases() {
+        return aliases == null ? List.of() : aliases;
+    }
 }
diff --git a/RFS/src/main/java/org/opensearch/migrations/metadata/CreationResult.java b/RFS/src/main/java/org/opensearch/migrations/metadata/CreationResult.java
@@ -6,9 +6,11 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;
+import lombok.ToString;
 
 @Builder
 @Data
+@ToString
 public class CreationResult implements Comparable<CreationResult>  {
     private final String name;
     private final Exception exception;