Starting to rename

Author: jonathan-buttner

docs/java-rest/low-level/configuration.asciidoc

@@ -76,7 +76,7 @@ include-tagged::{doc-tests}/RestClientDocumentation.java[rest-client-config-disa
 ==== Elasticsearch Token Service tokens
 
 If you want the client to authenticate with an Elasticsearch access token, set the relevant HTTP request header.
-If the client makes requests on behalf of a single user only, you can set the necessary `Authorization` header as a default header as shown
+If the client makes requests on behalf of a single user only, you can set the necessary `ElasticInferenceServiceAuthorizationHandler` header as a default header as shown
 in the following example:
 
 ["source","java",subs="attributes,callouts,macros"]
@@ -87,7 +87,7 @@ include-tagged::{doc-tests}/RestClientDocumentation.java[rest-client-auth-bearer
 ==== Elasticsearch API keys
 
 If you want the client to authenticate with an Elasticsearch API key, set the relevant HTTP request header.
-If the client makes requests on behalf of a single user only, you can set the necessary `Authorization` header as a default header as shown
+If the client makes requests on behalf of a single user only, you can set the necessary `ElasticInferenceServiceAuthorizationHandler` header as a default header as shown
 in the following example:
 
 ["source","java",subs="attributes,callouts,macros"]

docs/reference/rest-api/security/create-api-keys.asciidoc

@@ -194,7 +194,7 @@ API key information.
 <4> API key credentials which is the Base64-encoding of the UTF-8
 representation of the `id` and `api_key` joined by a colon (`:`).
 
-To use the generated API key, send a request with an `Authorization` header that
+To use the generated API key, send a request with an `ElasticInferenceServiceAuthorizationHandler` header that
 contains an `ApiKey` prefix followed by the API key credentials
 (the `encoded` value from the response).
 

docs/reference/rest-api/security/get-tokens.asciidoc

@@ -155,7 +155,7 @@ seconds) that the token expires in, and the type:
 // TESTRESPONSE[s/superuser/_es_test_root/]
 
 The token returned by this API can be used by sending a request with an
-`Authorization` header with a value having the prefix "Bearer " followed
+`ElasticInferenceServiceAuthorizationHandler` header with a value having the prefix "Bearer " followed
 by the value of the `access_token`.
 
 [source,shell]

docs/reference/security/authentication/token-authentication-services.asciidoc

@@ -40,7 +40,7 @@ generate access tokens and refresh tokens based on the OAuth2 specification.
 The access token is a short-lived token. By default, it expires after 20 minutes
 but it can be configured to last a maximum of 1 hour. It can be refreshed by
 using a refresh token, which has a lifetime of 24 hours. The access token is a
-bearer token. You can use it by sending a request with an `Authorization`
+bearer token. You can use it by sending a request with an `ElasticInferenceServiceAuthorizationHandler`
 header with a value that has the prefix "Bearer " followed by the value of the
 access token. For example:
 +
@@ -59,7 +59,7 @@ The API key service uses the
 By default, the API keys do not expire. When you make a request to create API
 keys, you can specify an expiration and permissions for the API key. The
 permissions are limited by the authenticated user's permissions. You can use the
-API key by sending a request with an `Authorization` header with a value that
+API key by sending a request with an `ElasticInferenceServiceAuthorizationHandler` header with a value that
 has the prefix "ApiKey " followed by the credentials. The credentials are the
 base64 encoding of the API key ID and the API key joined by a colon. For example:
 +

docs/reference/security/ccs-clients-integrations/http.asciidoc

@@ -65,7 +65,7 @@ es-secondary-authorization: Basic <TOKEN> <1>
 <1> The `<TOKEN>` is computed as `base64(USERNAME:PASSWORD)`
 
 The `es-secondary-authorization` header has the same syntax as the
-`Authorization` header. It therefore also supports the use of
+`ElasticInferenceServiceAuthorizationHandler` header. It therefore also supports the use of
 <<token-authentication-services,token-based authentication services>>. For
 example:
 

server/src/main/java/org/elasticsearch/inference/InferenceServiceConfiguration.java

@@ -194,7 +194,7 @@ public Builder setTaskTypes(List<String> taskTypes) {
             var enumTaskTypes = EnumSet.noneOf(TaskType.class);
 
             for (var supportedTaskTypeString : taskTypes) {
-                enumTaskTypes.add(TaskType.fromString(supportedTaskTypeString));
+                enumTaskTypes.add(TaskType.fromStringOrStatusException(supportedTaskTypeString));
             }
             this.taskTypes = enumTaskTypes;
             return this;

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

@@ -284,9 +284,7 @@ public Collection<?> createComponents(PluginServices services) {
 
             ElasticInferenceServiceSettings inferenceServiceSettings = new ElasticInferenceServiceSettings(settings);
             String elasticInferenceUrl = this.getElasticInferenceServiceUrl(inferenceServiceSettings);
-            elasticInferenceServiceComponents.set(new ElasticInferenceServiceComponents(elasticInferenceUrl
-            // new ElasticInferenceServiceACL(Map.of("model-abc", EnumSet.of(TaskType.SPARSE_EMBEDDING, TaskType.CHAT_COMPLETION)))
-            ));
+            elasticInferenceServiceComponents.set(new ElasticInferenceServiceComponents(elasticInferenceUrl));
 
             inferenceServices.add(
                 () -> List.of(

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/elastic/ElasticInferenceServiceAclRequest.java renamed to x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/request/elastic/ElasticInferenceServiceAuthRequest.java

@@ -20,12 +20,12 @@
 import java.net.URISyntaxException;
 import java.util.Objects;
 
-public class ElasticInferenceServiceAclRequest implements ElasticInferenceServiceRequest {
+public class ElasticInferenceServiceAuthRequest implements ElasticInferenceServiceRequest {
 
     private final URI uri;
     private final TraceContextHandler traceContextHandler;
 
-    public ElasticInferenceServiceAclRequest(String url, TraceContext traceContext) {
+    public ElasticInferenceServiceAuthRequest(String url, TraceContext traceContext) {
         this.uri = createUri(Objects.requireNonNull(url));
         this.traceContextHandler = new TraceContextHandler(traceContext);
     }

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/elastic/ElasticInferenceServiceAclResponseEntity.java renamed to x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/external/response/elastic/ElasticInferenceServiceAuthResponseEntity.java

@@ -30,51 +30,58 @@
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
 
-public class ElasticInferenceServiceAclResponseEntity implements InferenceServiceResults {
+public class ElasticInferenceServiceAuthResponseEntity implements InferenceServiceResults {
 
-    public static final String NAME = "elastic_inference_service_acl_results";
-    public static final String COMPLETION = TaskType.COMPLETION.name().toLowerCase(Locale.ROOT);
+    public static final String NAME = "elastic_inference_service_auth_results";
+    private static final Map<String, TaskType> ELASTIC_INFERENCE_SERVICE_TASK_TYPE_MAPPING = Map.of(
+        "embedding/text/sparse",
+        TaskType.SPARSE_EMBEDDING,
+        "chat/completion",
+        TaskType.CHAT_COMPLETION
+    );
 
     @SuppressWarnings("unchecked")
-    public static ConstructingObjectParser<ElasticInferenceServiceAclResponseEntity, Void> PARSER = new ConstructingObjectParser<>(
-        ElasticInferenceServiceAclResponseEntity.class.getSimpleName(),
-        args -> new ElasticInferenceServiceAclResponseEntity((List<AllowedModel>) args[0])
+    public static ConstructingObjectParser<ElasticInferenceServiceAuthResponseEntity, Void> PARSER = new ConstructingObjectParser<>(
+        ElasticInferenceServiceAuthResponseEntity.class.getSimpleName(),
+        args -> new ElasticInferenceServiceAuthResponseEntity((List<AuthorizedModel>) args[0])
     );
 
     static {
-        PARSER.declareObjectArray(constructorArg(), AllowedModel.ALLOWED_MODEL_PARSER::apply, new ParseField("allowed_models"));
+        PARSER.declareObjectArray(constructorArg(), AuthorizedModel.ALLOWED_MODEL_PARSER::apply, new ParseField("models"));
     }
 
-    public record AllowedModel(String modelName, EnumSet<TaskType> taskTypes) implements Writeable, ToXContentObject {
+    public record AuthorizedModel(String modelName, EnumSet<TaskType> taskTypes) implements Writeable, ToXContentObject {
 
         @SuppressWarnings("unchecked")
-        public static ConstructingObjectParser<AllowedModel, Void> ALLOWED_MODEL_PARSER = new ConstructingObjectParser<>(
-            AllowedModel.class.getSimpleName(),
-            args -> new AllowedModel((String) args[0], toTaskTypes((List<String>) args[1]))
+        public static ConstructingObjectParser<AuthorizedModel, Void> ALLOWED_MODEL_PARSER = new ConstructingObjectParser<>(
+            AuthorizedModel.class.getSimpleName(),
+            args -> new AuthorizedModel((String) args[0], toTaskTypes((List<String>) args[1]))
         );
 
         static {
-            ALLOWED_MODEL_PARSER.declareString(constructorArg(), new ParseField("model_name"));
-            ALLOWED_MODEL_PARSER.declareStringArray(constructorArg(), new ParseField("task_types"));
+            ALLOWED_MODEL_PARSER.declareString(constructorArg(), new ParseField("model-name"));
+            ALLOWED_MODEL_PARSER.declareStringArray(constructorArg(), new ParseField("task-types"));
         }
 
         private static EnumSet<TaskType> toTaskTypes(List<String> stringTaskTypes) {
             var taskTypes = EnumSet.noneOf(TaskType.class);
             for (String taskType : stringTaskTypes) {
-                taskTypes.add(TaskType.fromStringOrStatusException(taskType));
+                var mappedTaskType = ELASTIC_INFERENCE_SERVICE_TASK_TYPE_MAPPING.get(taskType);
+                if (mappedTaskType != null) {
+                    taskTypes.add(mappedTaskType);
+                }
             }
 
             return taskTypes;
         }
 
-        public AllowedModel(StreamInput in) throws IOException {
+        public AuthorizedModel(StreamInput in) throws IOException {
             this(in.readString(), in.readEnumSet(TaskType.class));
         }
 
@@ -97,25 +104,32 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
     }
 
-    private final List<AllowedModel> allowedModels;
+    private final List<AuthorizedModel> allowedModels;
 
-    public ElasticInferenceServiceAclResponseEntity(List<AllowedModel> allowedModels) {
+    public ElasticInferenceServiceAuthResponseEntity(List<AuthorizedModel> allowedModels) {
         this.allowedModels = Objects.requireNonNull(allowedModels);
     }
 
-    public ElasticInferenceServiceAclResponseEntity(StreamInput in) throws IOException {
-        this(in.readCollectionAsList(AllowedModel::new));
+    /**
+     * Create an empty response
+     */
+    public ElasticInferenceServiceAuthResponseEntity() {
+        this(List.of());
+    }
+
+    public ElasticInferenceServiceAuthResponseEntity(StreamInput in) throws IOException {
+        this(in.readCollectionAsList(AuthorizedModel::new));
     }
 
-    public static ElasticInferenceServiceAclResponseEntity fromResponse(Request request, HttpResult response) throws IOException {
+    public static ElasticInferenceServiceAuthResponseEntity fromResponse(Request request, HttpResult response) throws IOException {
         var parserConfig = XContentParserConfiguration.EMPTY.withDeprecationHandler(LoggingDeprecationHandler.INSTANCE);
 
         try (XContentParser jsonParser = XContentFactory.xContent(XContentType.JSON).createParser(parserConfig, response.body())) {
             return PARSER.apply(jsonParser, null);
         }
     }
 
-    public List<AllowedModel> getAllowedModels() {
+    public List<AuthorizedModel> getAllowedModels() {
         return allowedModels;
     }
 

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/SenderService.java

@@ -148,12 +148,7 @@ protected void doStart(Model model, ActionListener<Boolean> listener) {
         listener.onResponse(true);
     }
 
-    /**
-     * Normally we shouldn't need to call this from a child service. This is handled when an inference request
-     * is received automatically. Services that need to make one-off requests before inference requests are sent will
-     * need to call this to initialize the internals.
-     */
-    protected void init() {
+    private void init() {
         sender.start();
     }