Skip to content

Commit 981482e

Browse files
move role and user definition from yaml file
1 parent 1006347 commit 981482e

File tree

2 files changed

+33
-46
lines changed

2 files changed

+33
-46
lines changed

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.get_alias/10_basic.yml

Lines changed: 22 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,9 @@ setup:
1919
test_alias: {}
2020
test_blias: {}
2121

22-
- do:
23-
security.put_role:
24-
name: "get_alias_test_role"
25-
body: >
26-
{
27-
"cluster": [],
28-
"indices": [
29-
{
30-
"names": ["test*", "myindex", "non-existent", "another-non-existent", "foo"],
31-
"privileges": ["all"]
32-
}
33-
]
34-
}
35-
36-
- do:
37-
security.put_user:
38-
username: "test_user"
39-
body: >
40-
{
41-
"password" : "x-pack-test-password",
42-
"roles" : [ "get_alias_test_role" ],
43-
"full_name" : "Get Alias Test User"
44-
}
45-
4622
---
4723
"Get all aliases via /_alias":
48-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
24+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
4925

5026
- do:
5127
headers:
@@ -66,7 +42,7 @@ setup:
6642

6743
---
6844
"Get aliases via /_alias/_all":
69-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
45+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
7046

7147
- do:
7248
headers:
@@ -88,7 +64,7 @@ setup:
8864

8965
---
9066
"Get aliases via /_alias/*":
91-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
67+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
9268

9369
- do:
9470
headers:
@@ -110,7 +86,7 @@ setup:
11086

11187
---
11288
"Get all aliases via /{index}/_alias/":
113-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
89+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
11490

11591
- do:
11692
headers:
@@ -124,7 +100,7 @@ setup:
124100

125101
---
126102
"Get aliases via /_all/_alias/":
127-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
103+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
128104

129105
- do:
130106
headers:
@@ -146,7 +122,7 @@ setup:
146122

147123
---
148124
"Get aliases via /*/_alias/":
149-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
125+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
150126

151127
- do:
152128
headers:
@@ -168,7 +144,7 @@ setup:
168144

169145
---
170146
"Get and index with no aliases via /{index}/_alias/":
171-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
147+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
172148

173149
- do:
174150
headers:
@@ -186,7 +162,7 @@ setup:
186162

187163
---
188164
"Get specific alias via /{index}/_alias/{name}":
189-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
165+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
190166

191167
- do:
192168
headers:
@@ -201,7 +177,7 @@ setup:
201177

202178
---
203179
"Get aliases via /{index}/_alias/_all":
204-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
180+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
205181

206182
- do:
207183
headers:
@@ -216,7 +192,7 @@ setup:
216192

217193
---
218194
"Get aliases via /{index}/_alias/*":
219-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
195+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
220196

221197
- do:
222198
headers:
@@ -231,7 +207,7 @@ setup:
231207

232208
---
233209
"Get aliases via /{index}/_alias/prefix*":
234-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
210+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
235211

236212
- do:
237213
headers:
@@ -246,7 +222,7 @@ setup:
246222

247223
---
248224
"Get aliases via /{index}/_alias/name,name":
249-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
225+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
250226

251227
- do:
252228
headers:
@@ -261,7 +237,7 @@ setup:
261237

262238
---
263239
"Get aliases via /_alias/{name}":
264-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
240+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
265241

266242
- do:
267243
headers:
@@ -276,7 +252,7 @@ setup:
276252

277253
---
278254
"Get aliases via /_all/_alias/{name}":
279-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
255+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
280256

281257
- do:
282258
headers:
@@ -292,7 +268,7 @@ setup:
292268

293269
---
294270
"Get aliases via /*/_alias/{name}":
295-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
271+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
296272

297273
- do:
298274
headers:
@@ -308,7 +284,7 @@ setup:
308284

309285
---
310286
"Get aliases via /*suf/_alias/{name}":
311-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
287+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
312288

313289
- do:
314290
headers:
@@ -324,7 +300,7 @@ setup:
324300

325301
---
326302
"Get aliases via /name,name/_alias/{name}":
327-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
303+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
328304

329305
- do:
330306
headers:
@@ -341,7 +317,7 @@ setup:
341317

342318
---
343319
"Non-existent alias on an existing index returns 404":
344-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
320+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
345321

346322
- do:
347323
headers:
@@ -356,7 +332,7 @@ setup:
356332

357333
---
358334
"Existent and non-existent alias returns 404 and the existing alias":
359-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
335+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
360336

361337
- do:
362338
headers:
@@ -372,7 +348,7 @@ setup:
372348

373349
---
374350
"Existent and non-existent aliases returns 404 and the existing alias":
375-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
351+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
376352

377353
- do:
378354
headers:
@@ -388,7 +364,7 @@ setup:
388364

389365
---
390366
"Getting alias on an non-existent index should return 404":
391-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
367+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
392368

393369
- do:
394370
headers:
@@ -403,7 +379,7 @@ setup:
403379
- skip:
404380
features: ["allowed_warnings"]
405381

406-
- transform_and_set: { login_credentials: "#base64Encode(test_user:x-pack-test-password)" }
382+
- transform_and_set: { login_credentials: "#base64Encode(get_alias_test_user:x-pack-test-password)" }
407383

408384
- do:
409385
headers:

x-pack/qa/core-rest-tests-with-security/src/yamlRestTest/java/org/elasticsearch/xpack/security/CoreWithSecurityClientYamlTestSuiteIT.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.elasticsearch.common.util.concurrent.ThreadContext;
1818
import org.elasticsearch.test.cluster.ElasticsearchCluster;
1919
import org.elasticsearch.test.cluster.FeatureFlag;
20+
import org.elasticsearch.test.cluster.util.resource.Resource;
2021
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2122
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
2223
import org.junit.ClassRule;
@@ -28,6 +29,14 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest
2829
private static final String USER = Objects.requireNonNull(System.getProperty("tests.rest.cluster.username", "test_admin"));
2930
private static final String PASS = Objects.requireNonNull(System.getProperty("tests.rest.cluster.password", "x-pack-test-password"));
3031

32+
private static final String ROLES = """
33+
get_alias_test_role:
34+
cluster: [ ]
35+
indices:
36+
- names: ["test*", "myindex", "non-existent", "another-non-existent", "foo"]
37+
allow_restricted_indices: false
38+
privileges: [ "ALL" ]
39+
""";
3140
@ClassRule
3241
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
3342
.module("constant-keyword")
@@ -47,8 +56,10 @@ public class CoreWithSecurityClientYamlTestSuiteIT extends ESClientYamlSuiteTest
4756
.setting("xpack.license.self_generated.type", "trial")
4857
.setting("xpack.security.autoconfiguration.enabled", "false")
4958
.user(USER, PASS)
59+
.user("get_alias_test_user", "x-pack-test-password", "get_alias_test_role", false)
5060
.feature(FeatureFlag.TIME_SERIES_MODE)
5161
.feature(FeatureFlag.SUB_OBJECTS_AUTO_ENABLED)
62+
.rolesFile(Resource.fromString(ROLES))
5263
.build();
5364

5465
public CoreWithSecurityClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

0 commit comments

Comments
 (0)