Skip to content

Update test ES 6.8 to use es-oss image #1114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Update test ES 6.8 to use es-oss image #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa4e4e
Update test ES 6.8 to use es-oss image
AndreKurait Nov 4, 2024
f6c8663
Fix single template behavior for metadata migrations
AndreKurait Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...rc/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@
try {
var tree = (ObjectNode) objectMapper.readTree(resp.body);

if (tree.size() == 1) {
return Mono.just(handleSingleItemTree(tree));
if (tree.size() == 1 && tree.fields().next().getValue().isArray()) {
return Mono.just(handleSingleItemArrayValueTree(tree));
}

return Mono.just(tree);
Expand All @@ -131,13 +131,17 @@
}
}

private ObjectNode handleSingleItemTree(ObjectNode tree) {
private ObjectNode handleSingleItemArrayValueTree(ObjectNode tree) {
var dearrayed = objectMapper.createObjectNode();
var fieldName = tree.fieldNames().next();
var arrayOfItems = tree.get(fieldName);

for (var child : arrayOfItems) {
processChildNode((ObjectNode) child, dearrayed);
if (child.isObject()) {
processChildNode((ObjectNode) child, dearrayed);
} else {
throw new IllegalArgumentException("Expected ObjectNode, got: " + child.getNodeType());

Check warning on line 143 in RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java

View check run for this annotation

Codecov / codecov/patch

RFS/src/main/java/org/opensearch/migrations/bulkload/version_universal/RemoteReaderClient.java#L143 

Added line #L143 was not covered by tests
}
}

return dearrayed;
Expand Down
2 changes: 1 addition & 1 deletion ...estFixtures/java/org/opensearch/migrations/bulkload/framework/SearchClusterContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class SearchClusterContainer extends GenericContainer<SearchClusterContai
Version.fromString("ES 7.17.22")
);
public static final ContainerVersion ES_V6_8_23 = new ElasticsearchVersion(
"docker.elastic.co/elasticsearch/elasticsearch:6.8.23",
"docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.23",
Version.fromString("ES 6.8.23")
);

Expand Down