github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

ESQL: Fix EsqlSecurityIT LOOKUP tests not checking snapshot (#119283)

Browse source 
Without the snapshot check, the periodic tests were failing.

Fixes https://github.com/elastic/elasticsearch/issues/119268
Fixes https://github.com/elastic/elasticsearch/issues/119269
Fixes https://github.com/elastic/elasticsearch/issues/119270
Fixes https://github.com/elastic/elasticsearch/issues/119271
This commit is contained in:
Iván Cea Fontenla 2024-12-30 13:36:06 +01:00 • committed by GitHub
parent dee3c6e44f
commit d7fa7405d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x-pack/plugin/esql/qa/security/build.gradle
View file

@ -5,3 +5,9 @@ apply plugin: 'elasticsearch.internal-test-artifact'
tasks.named('javaRestTest') { tasks.named('javaRestTest') {
usesDefaultDistribution() usesDefaultDistribution()
} }
dependencies {
javaRestTestImplementation project(xpackModule('esql-core'))
javaRestTestImplementation project(xpackModule('esql'))
javaRestTestImplementation project(xpackModule('esql:qa:server'))
}

14
x-pack/plugin/esql/qa/security/src/javaRestTest/java/org/elasticsearch/xpack/esql/EsqlSecurityIT.java
View file

@ -26,6 +26,8 @@ import org.elasticsearch.test.cluster.util.resource.Resource;
import org.elasticsearch.test.rest.ESRestTestCase; import org.elasticsearch.test.rest.ESRestTestCase;
import org.elasticsearch.xcontent.XContentBuilder; import org.elasticsearch.xcontent.XContentBuilder;
import org.elasticsearch.xcontent.json.JsonXContent; import org.elasticsearch.xcontent.json.JsonXContent;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule; import org.junit.ClassRule;
@ -544,6 +546,11 @@ public class EsqlSecurityIT extends ESRestTestCase {
} }
public void testLookupJoinIndexAllowed() throws Exception { public void testLookupJoinIndexAllowed() throws Exception {
assumeTrue(
"Requires LOOKUP JOIN capability",
EsqlSpecTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.JOIN_LOOKUP_V9.capabilityName()))
);
Response resp = runESQLCommand( Response resp = runESQLCommand(
"metadata1_read2", "metadata1_read2",
"ROW x = 40.0 | EVAL value = x | LOOKUP JOIN `lookup-user2` ON value | KEEP x, org" "ROW x = 40.0 | EVAL value = x | LOOKUP JOIN `lookup-user2` ON value | KEEP x, org"
@ -577,7 +584,12 @@ public class EsqlSecurityIT extends ESRestTestCase {
assertThat(respMap.get("values"), equalTo(List.of(Arrays.asList(123.0, null)))); assertThat(respMap.get("values"), equalTo(List.of(Arrays.asList(123.0, null))));
} }
public void testLookupJoinIndexForbidden() { public void testLookupJoinIndexForbidden() throws Exception {
assumeTrue(
"Requires LOOKUP JOIN capability",
EsqlSpecTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.JOIN_LOOKUP_V9.capabilityName()))
);
var resp = expectThrows( var resp = expectThrows(
ResponseException.class, ResponseException.class,
() -> runESQLCommand("metadata1_read2", "FROM lookup-user2 | EVAL value = 10.0 | LOOKUP JOIN `lookup-user1` ON value | KEEP x") () -> runESQLCommand("metadata1_read2", "FROM lookup-user2 | EVAL value = 10.0 | LOOKUP JOIN `lookup-user1` ON value | KEEP x")

2
x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/EsqlSpecTestCase.java
View file

@ -199,7 +199,7 @@ public abstract class EsqlSpecTestCase extends ESRestTestCase {
return hasCapabilities(adminClient(), requiredCapabilities); return hasCapabilities(adminClient(), requiredCapabilities);
} }
protected static boolean hasCapabilities(RestClient client, List<String> requiredCapabilities) throws IOException { public static boolean hasCapabilities(RestClient client, List<String> requiredCapabilities) throws IOException {
if (requiredCapabilities.isEmpty()) { if (requiredCapabilities.isEmpty()) {
return true; return true;
} }