Fixing flaky tests

Author: jonathan-buttner

x-pack/plugin/inference/src/internalClusterTest/java/org/elasticsearch/xpack/inference/integration/InferenceIndicesIT.java

@@ -168,11 +168,10 @@ public void testRetrievingInferenceEndpoint_ThrowsException_WhenIndexNodeIsNotAv
 
         var proxyResponse = sendInferenceProxyRequest(inferenceId);
         var exception = expectThrows(ElasticsearchException.class, () -> proxyResponse.actionGet(TEST_REQUEST_TIMEOUT));
-        assertThat(exception.toString(), containsString("Failed to load inference endpoint [test-index-id-2]"));
+        assertThat(exception.toString(), containsString("Failed to load inference endpoint with secrets [test-index-id-2]"));
 
         var causeException = exception.getCause();
         assertThat(causeException, instanceOf(SearchPhaseExecutionException.class));
-        assertThat(causeException.toString(), containsString(".inference"));
     }
 
     public void testRetrievingInferenceEndpoint_ThrowsException_WhenSecretsIndexNodeIsNotAvailable() throws Exception {
@@ -198,12 +197,11 @@ public void testRetrievingInferenceEndpoint_ThrowsException_WhenSecretsIndexNode
         var proxyResponse = sendInferenceProxyRequest(inferenceId);
 
         var exception = expectThrows(ElasticsearchException.class, () -> proxyResponse.actionGet(TEST_REQUEST_TIMEOUT));
-        assertThat(exception.toString(), containsString("Failed to load inference endpoint [test-secrets-index-id]"));
+        assertThat(exception.toString(), containsString("Failed to load inference endpoint with secrets [test-secrets-index-id]"));
 
         var causeException = exception.getCause();
 
         assertThat(causeException, instanceOf(SearchPhaseExecutionException.class));
-        assertThat(causeException.toString(), containsString(".secrets-inference"));
     }
 
     private ActionFuture<InferenceAction.Response> sendInferenceProxyRequest(String inferenceId) throws IOException {

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/registry/ModelRegistry.java

@@ -263,10 +263,10 @@ public void getModelWithSecrets(String inferenceEntityId, ActionListener<Unparse
 
             listener.onResponse(unparsedModelFromMap(createModelConfigMap(searchResponse.getHits(), inferenceEntityId)));
         }, (e) -> {
-            logger.warn(format("Failed to load inference endpoint [%s]", inferenceEntityId), e);
+            logger.warn(format("Failed to load inference endpoint with secrets [%s]", inferenceEntityId), e);
             listener.onFailure(
                 new ElasticsearchException(
-                    format("Failed to load inference endpoint [%s], error: [%s]", inferenceEntityId, e.getMessage()),
+                    format("Failed to load inference endpoint with secrets [%s], error: [%s]", inferenceEntityId, e.getMessage()),
                     e
                 )
             );