Skip to content

Commit 37133c6

Browse files
authored
Use adminClient when searching system index in integ tests (#1286) (#1287)
* Use adminClient when searching system index in integ tests Signed-off-by: Craig Perkins <[email protected]> * Replace more instances Signed-off-by: Craig Perkins <[email protected]> * Another instance Signed-off-by: Craig Perkins <[email protected]> --------- Signed-off-by: Craig Perkins <[email protected]> (cherry picked from commit ca2ada2)
1 parent a8196c4 commit 37133c6

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/IndexStateManagementRestTestCase.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
365365
}
366366
}
367367
""".trimIndent()
368-
val response = client().makeRequest(
368+
val response = adminClient().makeRequest(
369369
"POST", "$INDEX_MANAGEMENT_INDEX/_search", emptyMap(),
370370
StringEntity(request, APPLICATION_JSON),
371371
)
@@ -380,7 +380,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
380380
}
381381

382382
protected fun getManagedIndexConfigByDocId(id: String): ManagedIndexConfig? {
383-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$id")
383+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$id")
384384
assertEquals("Request failed", RestStatus.OK, response.restStatus())
385385
val getResponse = GetResponse.fromXContent(createParser(jsonXContent, response.entity.content))
386386
assertTrue("Did not find managed index config", getResponse.isExists)
@@ -832,7 +832,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
832832
metadataId: String,
833833
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
834834
): RollupMetadata {
835-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
835+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
836836
assertEquals("Unable to get rollup metadata $metadataId", RestStatus.OK, response.restStatus())
837837

838838
val parser = createParser(XContentType.JSON.xContent(), response.entity.content)
@@ -889,7 +889,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
889889
metadataId: String,
890890
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
891891
): TransformMetadata {
892-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
892+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
893893
assertEquals("Unable to get transform metadata $metadataId", RestStatus.OK, response.restStatus())
894894

895895
val parser = createParser(XContentType.JSON.xContent(), response.entity.content)

src/test/kotlin/org/opensearch/indexmanagement/indexstatemanagement/resthandler/IndexStateManagementRestApiIT.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() {
148148
fun `test mappings after policy creation`() {
149149
createRandomPolicy()
150150

151-
val response = client().makeRequest("GET", "/$INDEX_MANAGEMENT_INDEX/_mapping")
151+
val response = adminClient().makeRequest("GET", "/$INDEX_MANAGEMENT_INDEX/_mapping")
152152
val parserMap =
153153
createParser(XContentType.JSON.xContent(), response.entity.content).map() as Map<String, Map<String, Any>>
154154
val mappingsMap = parserMap[INDEX_MANAGEMENT_INDEX]!!["mappings"] as Map<String, Any>
@@ -265,7 +265,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() {
265265
}
266266
}
267267
""".trimIndent()
268-
val response = client().makeRequest(
268+
val response = adminClient().makeRequest(
269269
"POST", "$INDEX_MANAGEMENT_INDEX/_search", emptyMap(),
270270
StringEntity(request, APPLICATION_JSON),
271271
)

src/test/kotlin/org/opensearch/indexmanagement/rollup/RollupRestTestCase.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ abstract class RollupRestTestCase : IndexManagementRestTestCase() {
205205
refresh: Boolean = true,
206206
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
207207
): RollupMetadata {
208-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?refresh=$refresh", null, header)
208+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?refresh=$refresh", null, header)
209209
assertEquals("Unable to get rollup metadata $metadataId", RestStatus.OK, response.restStatus())
210210
return parseRollupMetadata(response)
211211
}
@@ -216,7 +216,7 @@ abstract class RollupRestTestCase : IndexManagementRestTestCase() {
216216
refresh: Boolean = true,
217217
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
218218
): RollupMetadata {
219-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?routing=$routingId&refresh=$refresh", null, header)
219+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?routing=$routingId&refresh=$refresh", null, header)
220220
assertEquals("Unable to get rollup metadata $metadataId", RestStatus.OK, response.restStatus())
221221

222222
return parseRollupMetadata(response)

0 commit comments

Comments
 (0)