Merge branch 'custom-inference-service-jon' of github.com:jonathan-buttner/elasticsearch into custom-inference-service-jon

Author: jonathan-buttner

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/azureopenai/AzureOpenAiServiceTests.java

@@ -252,10 +252,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
                 fail("Expected exception, but got model: " + model);
             }, e -> {
                 assertThat(e, instanceOf(ElasticsearchStatusException.class));
-                assertThat(
-                    e.getMessage(),
-                    is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
-                );
+                assertThat(e.getMessage(), is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service"));
             });
 
             service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, modelVerificationListener);
@@ -277,10 +274,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
                 fail("Expected exception, but got model: " + model);
             }, e -> {
                 assertThat(e, instanceOf(ElasticsearchStatusException.class));
-                assertThat(
-                    e.getMessage(),
-                    is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
-                );
+                assertThat(e.getMessage(), is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service"));
             });
 
             service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, modelVerificationListener);
@@ -302,10 +296,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
                 fail("Expected exception, but got model: " + model);
             }, e -> {
                 assertThat(e, instanceOf(ElasticsearchStatusException.class));
-                assertThat(
-                    e.getMessage(),
-                    is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
-                );
+                assertThat(e.getMessage(), is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service"));
             });
 
             service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, modelVerificationListener);

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekServiceTests.java

@@ -146,10 +146,7 @@ public void testParseRequestConfigWithExtraSettings() throws IOException {
                 }
                 """,
             assertNoSuccessListener(
-                e -> assertThat(
-                    e.getMessage(),
-                    equalTo("Configuration contains settings [{so=extra}] unknown to the [deepseek] service")
-                )
+                e -> assertThat(e.getMessage(), equalTo("Configuration contains settings [{so=extra}] unknown to the [deepseek] service"))
             )
         );
     }

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/sagemaker/model/SageMakerModelBuilderTests.java

@@ -187,43 +187,35 @@ public void testFromRequestWithoutEndpointName() {
     }
 
     public void testFromRequestWithExtraServiceKeys() {
-        testExceptionFromRequest(
-            """
-                {
-                    "service_settings": {
-                        "access_key": "test-access-key",
-                        "secret_key": "test-secret-key",
-                        "region": "us-east-1",
-                        "api": "test-api",
-                        "endpoint_name": "test-endpoint",
-                        "hello": "there"
-                    }
+        testExceptionFromRequest("""
+            {
+                "service_settings": {
+                    "access_key": "test-access-key",
+                    "secret_key": "test-secret-key",
+                    "region": "us-east-1",
+                    "api": "test-api",
+                    "endpoint_name": "test-endpoint",
+                    "hello": "there"
                 }
-                """,
-            ElasticsearchStatusException.class,
-            "Configuration contains settings [{hello=there}] unknown to the [service] service"
-        );
+            }
+            """, ElasticsearchStatusException.class, "Configuration contains settings [{hello=there}] unknown to the [service] service");
     }
 
     public void testFromRequestWithExtraTaskKeys() {
-        testExceptionFromRequest(
-            """
-                {
-                    "service_settings": {
-                        "access_key": "test-access-key",
-                        "secret_key": "test-secret-key",
-                        "region": "us-east-1",
-                        "api": "test-api",
-                        "endpoint_name": "test-endpoint"
-                    },
-                    "task_settings": {
-                        "hello": "there"
-                    }
+        testExceptionFromRequest("""
+            {
+                "service_settings": {
+                    "access_key": "test-access-key",
+                    "secret_key": "test-secret-key",
+                    "region": "us-east-1",
+                    "api": "test-api",
+                    "endpoint_name": "test-endpoint"
+                },
+                "task_settings": {
+                    "hello": "there"
                 }
-                """,
-            ElasticsearchStatusException.class,
-            "Configuration contains settings [{hello=there}] unknown to the [service] service"
-        );
+            }
+            """, ElasticsearchStatusException.class, "Configuration contains settings [{hello=there}] unknown to the [service] service");
     }
 
     public void testRoundTrip() throws IOException {