Skip to content

Commit edf0d22

Browse files
Addressing feedback
1 parent 246b646 commit edf0d22

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/inference/action/InferenceActionProxy.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
public class InferenceActionProxy extends ActionType<InferenceAction.Response> {
3232
public static final InferenceActionProxy INSTANCE = new InferenceActionProxy();
33-
public static final String NAME = "cluster:monitor/xpack/inference";
33+
public static final String NAME = "cluster:monitor/xpack/inference/post";
3434

3535
public InferenceActionProxy() {
3636
super(NAME);
@@ -99,7 +99,6 @@ public boolean isStreaming() {
9999

100100
@Override
101101
public ActionRequestValidationException validate() {
102-
// TODO confirm that we don't need any validation
103102
return null;
104103
}
105104

@@ -121,7 +120,9 @@ public boolean equals(Object o) {
121120
return taskType == request.taskType
122121
&& Objects.equals(inferenceEntityId, request.inferenceEntityId)
123122
&& Objects.equals(content, request.content)
124-
&& contentType == request.contentType;
123+
&& contentType == request.contentType
124+
&& timeout == request.timeout
125+
&& stream == request.stream;
125126
}
126127

127128
@Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/store/ReservedRolesStoreTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4140,7 +4140,7 @@ public void testInferenceAdminRole() {
41404140
assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true));
41414141

41424142
Role role = Role.buildFromRoleDescriptor(roleDescriptor, new FieldPermissionsCache(Settings.EMPTY), RESTRICTED_INDICES);
4143-
assertTrue(role.cluster().check("cluster:monitor/xpack/inference", request, authentication));
4143+
assertTrue(role.cluster().check("cluster:monitor/xpack/inference/post", request, authentication));
41444144
assertTrue(role.cluster().check("cluster:monitor/xpack/inference/get", request, authentication));
41454145
assertTrue(role.cluster().check("cluster:admin/xpack/inference/put", request, authentication));
41464146
assertTrue(role.cluster().check("cluster:admin/xpack/inference/delete", request, authentication));
@@ -4160,7 +4160,7 @@ public void testInferenceUserRole() {
41604160
assertThat(roleDescriptor.getMetadata(), hasEntry("_reserved", true));
41614161

41624162
Role role = Role.buildFromRoleDescriptor(roleDescriptor, new FieldPermissionsCache(Settings.EMPTY), RESTRICTED_INDICES);
4163-
assertTrue(role.cluster().check("cluster:monitor/xpack/inference", request, authentication));
4163+
assertTrue(role.cluster().check("cluster:monitor/xpack/inference/post", request, authentication));
41644164
assertTrue(role.cluster().check("cluster:monitor/xpack/inference/get", request, authentication));
41654165
assertFalse(role.cluster().check("cluster:admin/xpack/inference/put", request, authentication));
41664166
assertFalse(role.cluster().check("cluster:admin/xpack/inference/delete", request, authentication));

x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public class Constants {
388388
"cluster:monitor/xpack/enrich/stats",
389389
"cluster:monitor/xpack/eql/stats/dist",
390390
"cluster:monitor/xpack/esql/stats/dist",
391-
"cluster:monitor/xpack/inference",
391+
"cluster:monitor/xpack/inference/post",
392392
"cluster:monitor/xpack/inference/get",
393393
"cluster:monitor/xpack/inference/diagnostics/get",
394394
"cluster:monitor/xpack/inference/services/get",

0 commit comments

Comments
 (0)