Skip to content

Commit eb8fd44

Browse files
authored
[ML][Inference] minor fixes for created_by, and action permission (elastic#50890) (elastic#50911)
The system created and models we provide now use the `_xpack` user for uniformity with our other features The `PUT` action is now an admin cluster action And XPackClient class now references the action instance.
1 parent 4e83759 commit eb8fd44

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/PutTrainedModelAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
public class PutTrainedModelAction extends ActionType<PutTrainedModelAction.Response> {
2626

2727
public static final PutTrainedModelAction INSTANCE = new PutTrainedModelAction();
28-
public static final String NAME = "cluster:monitor/xpack/ml/inference/put";
28+
public static final String NAME = "cluster:admin/xpack/ml/inference/put";
2929
private PutTrainedModelAction() {
3030
super(NAME, Response::new);
3131
}

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsResultProcessor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.elasticsearch.xpack.core.ml.inference.TrainedModelDefinition;
2323
import org.elasticsearch.xpack.core.ml.inference.TrainedModelInput;
2424
import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
25+
import org.elasticsearch.xpack.core.security.user.XPackUser;
2526
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalyticsTask.ProgressTracker;
2627
import org.elasticsearch.xpack.ml.dataframe.process.results.AnalyticsResult;
2728
import org.elasticsearch.xpack.ml.dataframe.process.results.RowResults;
@@ -173,7 +174,7 @@ private TrainedModelConfig createTrainedModelConfig(TrainedModelDefinition.Build
173174
.collect(toList());
174175
return TrainedModelConfig.builder()
175176
.setModelId(modelId)
176-
.setCreatedBy("data-frame-analytics")
177+
.setCreatedBy(XPackUser.NAME)
177178
.setVersion(Version.CURRENT)
178179
.setCreateTime(createTime)
179180
.setTags(Collections.singletonList(analytics.getId()))

x-pack/plugin/ml/src/main/resources/org/elasticsearch/xpack/ml/inference/persistence/lang_ident_model_1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"model_id" : "lang_ident_model_1",
3-
"created_by" : "ml_admin",
3+
"created_by" : "_xpack",
44
"version" : "7.6.0",
55
"description" : "Model used for identifying language from arbitrary input text.",
66
"create_time" : 1575548914594,

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/process/AnalyticsResultProcessorTests.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.elasticsearch.xpack.core.ml.inference.TrainedModelConfig;
2121
import org.elasticsearch.xpack.core.ml.inference.TrainedModelDefinition;
2222
import org.elasticsearch.xpack.core.ml.inference.TrainedModelDefinitionTests;
23+
import org.elasticsearch.xpack.core.security.user.XPackUser;
2324
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalyticsTask.ProgressTracker;
2425
import org.elasticsearch.xpack.ml.dataframe.process.results.AnalyticsResult;
2526
import org.elasticsearch.xpack.ml.dataframe.process.results.RowResults;
@@ -167,7 +168,7 @@ public void testProcess_GivenInferenceModelIsStoredSuccessfully() {
167168
assertThat(storedModel.getLicenseLevel(), equalTo(License.OperationMode.PLATINUM));
168169
assertThat(storedModel.getModelId(), containsString(JOB_ID));
169170
assertThat(storedModel.getVersion(), equalTo(Version.CURRENT));
170-
assertThat(storedModel.getCreatedBy(), equalTo("data-frame-analytics"));
171+
assertThat(storedModel.getCreatedBy(), equalTo(XPackUser.NAME));
171172
assertThat(storedModel.getTags(), contains(JOB_ID));
172173
assertThat(storedModel.getDescription(), equalTo(JOB_DESCRIPTION));
173174
assertThat(storedModel.getModelDefinition(), equalTo(inferenceModel.build()));

0 commit comments

Comments
 (0)