Allow deleting user endpoints for eis

Author: jonathan-buttner

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

@@ -76,4 +76,16 @@ public void testValidate() {
         validationException = invalidRequest3.validate();
         assertNotNull(validationException);
     }
+
+    public void testValidate_ReturnsException_WhenIdStartsWithADot() {
+        var invalidRequest = new PutInferenceModelAction.Request(
+            TASK_TYPE,
+            ".elser-2-elastic",
+            BYTES,
+            X_CONTENT_TYPE,
+            InferenceAction.Request.DEFAULT_TIMEOUT
+        );
+        var validationException = invalidRequest.validate();
+        assertNotNull(validationException);
+    }
 }

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

@@ -55,6 +55,7 @@
 import org.elasticsearch.xpack.inference.LocalStateInferencePlugin;
 import org.elasticsearch.xpack.inference.model.TestModel;
 import org.elasticsearch.xpack.inference.registry.ModelRegistry;
+import org.elasticsearch.xpack.inference.services.elastic.ElasticInferenceService;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElasticsearchInternalModel;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElasticsearchInternalService;
 import org.elasticsearch.xpack.inference.services.elasticsearch.ElserInternalServiceSettingsTests;
@@ -949,6 +950,41 @@ public void testStoreModel_DoesNotDeleteIndexDocs_WhenModelAlreadyExists() {
         assertIndicesContainExpectedDocsCount(model, 2);
     }
 
+    public void testContainsPreconfiguredInferenceEndpointId() {
+        var preconfiguredModelId = ".elser-2-elastic";
+        var preconfiguredModel = new TestModel(
+            preconfiguredModelId,
+            TaskType.SPARSE_EMBEDDING,
+            ElasticInferenceService.NAME,
+            new TestModel.TestServiceSettings(null, null, null, null),
+            new TestModel.TestTaskSettings(randomInt(3)),
+            new TestModel.TestSecretSettings("secret")
+        );
+
+        var userModelId = "user-model-1";
+        var userModel = new TestModel(
+            userModelId,
+            TaskType.SPARSE_EMBEDDING,
+            ElasticInferenceService.NAME,
+            new TestModel.TestServiceSettings(null, null, null, null),
+            new TestModel.TestTaskSettings(randomInt(3)),
+            new TestModel.TestSecretSettings("secret")
+        );
+
+        var listener = new PlainActionFuture<List<ModelStoreResponse>>();
+        modelRegistry.storeModels(List.of(preconfiguredModel, userModel), listener, TimeValue.THIRTY_SECONDS);
+
+        var response = listener.actionGet(TimeValue.THIRTY_SECONDS);
+        assertThat(response.size(), is(2));
+        assertFalse(response.get(0).failed());
+        assertFalse(response.get(1).failed());
+
+        assertTrue(modelRegistry.containsPreconfiguredInferenceEndpointId(preconfiguredModelId));
+        assertFalse(modelRegistry.containsPreconfiguredInferenceEndpointId(userModelId));
+
+        assertThat(modelRegistry.getInferenceIds(), is(Set.of(preconfiguredModelId, userModelId)));
+    }
+
     private void storeCorruptedModelThenStoreModel(boolean storeSecrets) {
         var model = new TestModel(
             "corrupted-model-id",

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

@@ -144,6 +144,9 @@ public static UnparsedModel unparsedModelFromMap(ModelConfigMap modelConfigMap)
     private static final String TASK_TYPE_FIELD = "task_type";
     private static final String MODEL_ID_FIELD = "model_id";
     private static final Logger logger = LogManager.getLogger(ModelRegistry.class);
+    // Currently all EIS preconfigured endpoints are prefixed with a dot. We should remove this restriction by leveraging
+    // the information from the authorization response instead.
+    private static final String EIS_PRECONFIGURED_ENDPOINT_ID_PREFIX = ".";
 
     private final OriginSettingClient client;
     private final Map<String, InferenceService.DefaultConfigId> defaultConfigIds;
@@ -185,7 +188,8 @@ public boolean containsPreconfiguredInferenceEndpointId(String inferenceEntityId
             var project = lastMetadata.get().getProject(ProjectId.DEFAULT);
             var state = ModelRegistryMetadata.fromState(project);
             var eisPreconfiguredEndpoints = state.getServiceInferenceIds(ElasticInferenceService.NAME);
-            return eisPreconfiguredEndpoints.contains(inferenceEntityId);
+            return eisPreconfiguredEndpoints.contains(inferenceEntityId)
+                && inferenceEntityId.startsWith(EIS_PRECONFIGURED_ENDPOINT_ID_PREFIX);
         }
 
         return false;