Skip to content

Commit 081a1a8

Browse files
author
Max Hniebergall
committed
Ignore depreaction warnings on put in inference tests
1 parent 7d6ab96 commit 081a1a8

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/inference/action/PutInferenceModelActionTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void testWithParameters() throws IOException {
7373
Map<String, Object> serviceSettingsValues = Map.of("model_id", "embed", "dimensions", 1024);
7474
builder.map(Map.of(PARAMETERS, parametersValues, "service", "elasticsearch", "service_settings", serviceSettingsValues));
7575
var request = new PutInferenceModelAction.Request(TASK_TYPE, MODEL_ID, BytesReference.bytes(builder), XContentType.JSON);
76-
Map<String, Object> map = XContentHelper.convertToMap(request.getContent(), false, request.getContentType()).v2();
76+
Map<String, Object> map = XContentHelper.convertToMap(request.getRewrittenContent(), false, request.getContentType()).v2();
7777
assertEquals(parametersValues, map.get(TASK_SETTINGS));
7878
assertNull(map.get(PARAMETERS));
7979
assertEquals("elasticsearch", map.get("service"));
@@ -99,7 +99,8 @@ public void testWithParametersAndTaskSettings() throws IOException {
9999
);
100100
assertThrows(
101101
ElasticsearchStatusException.class,
102-
() -> new PutInferenceModelAction.Request(TASK_TYPE, MODEL_ID, BytesReference.bytes(builder), XContentType.JSON).getContent()
102+
() -> new PutInferenceModelAction.Request(TASK_TYPE, MODEL_ID, BytesReference.bytes(builder), XContentType.JSON)
103+
.getRewrittenContent()
103104
);
104105

105106
}

x-pack/plugin/inference/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/xpack/application/InferenceUpgradeTestCase.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import com.carrotsearch.randomizedtesting.annotations.Name;
1111

1212
import org.elasticsearch.client.Request;
13+
import org.elasticsearch.client.RequestOptions;
14+
import org.elasticsearch.client.WarningsHandler;
1315
import org.elasticsearch.common.Strings;
1416
import org.elasticsearch.inference.TaskType;
1517
import org.elasticsearch.test.http.MockWebServer;
@@ -105,6 +107,8 @@ protected void put(String inferenceId, String modelConfig, TaskType taskType) th
105107
String endpoint = Strings.format("_inference/%s/%s?error_trace", taskType, inferenceId);
106108
var request = new Request("PUT", endpoint);
107109
request.setJsonEntity(modelConfig);
110+
request.setOptions(RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE).build()); // TODO remove
111+
// permissive warnings once the deprecation warnings are removed in 9.0
108112
var response = client().performRequest(request);
109113
assertOKAndConsume(response);
110114
}

x-pack/plugin/ml/qa/ml-inference-service-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/InferenceBaseRestTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
package org.elasticsearch.xpack.ml.integration;
99

1010
import org.elasticsearch.client.Request;
11+
import org.elasticsearch.client.RequestOptions;
12+
import org.elasticsearch.client.WarningsHandler;
1113
import org.elasticsearch.common.settings.SecureString;
1214
import org.elasticsearch.common.settings.Settings;
1315
import org.elasticsearch.common.util.concurrent.ThreadContext;
@@ -51,6 +53,8 @@ protected Map<String, Object> putInferenceServiceModel(String modelId, TaskType
5153
var request = new Request("PUT", endpoint);
5254
var modelConfig = ExampleModels.mockServiceModelConfig();
5355
request.setJsonEntity(modelConfig);
56+
request.setOptions(RequestOptions.DEFAULT.toBuilder().setWarningsHandler(WarningsHandler.PERMISSIVE).build()); // TODO remove
57+
// permissive warnings once the deprecation warnings are removed in 9.0
5458
var response = client().performRequest(request);
5559
return entityAsMap(response);
5660
}

0 commit comments

Comments
 (0)