Skip to content

Commit ca2ada2

Browse files
authored
Use adminClient when searching system index in integ tests (#1286)
* 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]>
1 parent 94a23d2 commit ca2ada2

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
379379
}
380380
""".trimIndent()
381381
val response =
382-
client().makeRequest(
382+
adminClient().makeRequest(
383383
"POST", "$INDEX_MANAGEMENT_INDEX/_search", emptyMap(),
384384
StringEntity(request, ContentType.APPLICATION_JSON),
385385
)
@@ -394,7 +394,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
394394
}
395395

396396
protected fun getManagedIndexConfigByDocId(id: String): ManagedIndexConfig? {
397-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$id")
397+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$id")
398398
assertEquals("Request failed", RestStatus.OK, response.restStatus())
399399
val getResponse = GetResponse.fromXContent(createParser(jsonXContent, response.entity.content))
400400
assertTrue("Did not find managed index config", getResponse.isExists)
@@ -854,7 +854,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
854854
metadataId: String,
855855
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
856856
): RollupMetadata {
857-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
857+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
858858
assertEquals("Unable to get rollup metadata $metadataId", RestStatus.OK, response.restStatus())
859859

860860
val parser = createParser(XContentType.JSON.xContent(), response.entity.content)
@@ -911,7 +911,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
911911
metadataId: String,
912912
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
913913
): TransformMetadata {
914-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
914+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId", null, header)
915915
assertEquals("Unable to get transform metadata $metadataId", RestStatus.OK, response.restStatus())
916916

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() {
150150
fun `test mappings after policy creation`() {
151151
createRandomPolicy()
152152

153-
val response = client().makeRequest("GET", "/$INDEX_MANAGEMENT_INDEX/_mapping")
153+
val response = adminClient().makeRequest("GET", "/$INDEX_MANAGEMENT_INDEX/_mapping")
154154
val parserMap =
155155
createParser(XContentType.JSON.xContent(), response.entity.content).map() as Map<String, Map<String, Any>>
156156
val mappingsMap = parserMap[INDEX_MANAGEMENT_INDEX]!!["mappings"] as Map<String, Any>
@@ -271,7 +271,7 @@ class IndexStateManagementRestApiIT : IndexStateManagementRestTestCase() {
271271
}
272272
""".trimIndent()
273273
val response =
274-
client().makeRequest(
274+
adminClient().makeRequest(
275275
"POST", "$INDEX_MANAGEMENT_INDEX/_search", emptyMap(),
276276
StringEntity(request, ContentType.APPLICATION_JSON),
277277
)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ abstract class RollupRestTestCase : IndexManagementRestTestCase() {
209209
refresh: Boolean = true,
210210
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
211211
): RollupMetadata {
212-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?refresh=$refresh", null, header)
212+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?refresh=$refresh", null, header)
213213
assertEquals("Unable to get rollup metadata $metadataId", RestStatus.OK, response.restStatus())
214214
return parseRollupMetadata(response)
215215
}
@@ -220,7 +220,7 @@ abstract class RollupRestTestCase : IndexManagementRestTestCase() {
220220
refresh: Boolean = true,
221221
header: BasicHeader = BasicHeader(HttpHeaders.CONTENT_TYPE, "application/json"),
222222
): RollupMetadata {
223-
val response = client().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?routing=$routingId&refresh=$refresh", null, header)
223+
val response = adminClient().makeRequest("GET", "$INDEX_MANAGEMENT_INDEX/_doc/$metadataId?routing=$routingId&refresh=$refresh", null, header)
224224
assertEquals("Unable to get rollup metadata $metadataId", RestStatus.OK, response.restStatus())
225225

226226
return parseRollupMetadata(response)

0 commit comments

Comments
 (0)