Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use adminClient instead of client when interacting with system index in integTests #1222

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class IndexManagementIndicesIT : IndexStateManagementRestTestCase() {
.replace("\"schema_version\": $configSchemaVersion", "\"schema_version\": 0")

val entity = StringEntity(mapping, ContentType.APPLICATION_JSON)
client().makeRequest(
adminClient().makeRequest(
RestRequest.Method.PUT.toString(),
"/$INDEX_MANAGEMENT_INDEX/_mapping", emptyMap(), entity,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ abstract class IndexManagementRestTestCase : ODFERestTestCase() {
// Since from the log, this happens very fast (within 0.1~0.2s), the above cluster explain may not have the granularity to catch this.
logger.info("Update rollup start time to $startTimeMillis")
val response =
client().makeRequest(
adminClient().makeRequest(
"POST", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_update/${update.id}?wait_for_active_shards=$waitForActiveShards&refresh=true",
StringEntity(
"{\"doc\":{\"rollup\":{\"schedule\":{\"interval\":{\"start_time\":" +
Expand Down Expand Up @@ -249,7 +249,7 @@ abstract class IndexManagementRestTestCase : ODFERestTestCase() {
val startTimeMillis = desiredStartTimeMillis ?: (Instant.now().toEpochMilli() - millis)
val waitForActiveShards = if (isMultiNode) "all" else "1"
val response =
client().makeRequest(
adminClient().makeRequest(
"POST", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_update/${update.id}?wait_for_active_shards=$waitForActiveShards",
StringEntity(
"{\"doc\":{\"transform\":{\"schedule\":{\"interval\":{\"start_time\":" +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ abstract class SecurityRestTestCase : IndexManagementRestTestCase() {
}

protected fun deleteIndexByName(index: String) {
executeRequest(request = Request(RestRequest.Method.DELETE.name, "/$index"), client = client())
executeRequest(request = Request(RestRequest.Method.DELETE.name, "/$index"), client = adminClient())
}

protected fun validateSourceIndex(indexName: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ class NotificationActionListenerIT : IndexManagementRestTestCase() {
closeIndex("source-index")

// delete system index
client.makeRequest("DELETE", IndexManagementPlugin.CONTROL_CENTER_INDEX)
adminClient().makeRequest("DELETE", IndexManagementPlugin.CONTROL_CENTER_INDEX)

val response =
client.makeRequest(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ abstract class LRONConfigRestTestCase : IndexManagementRestTestCase() {
@After
fun removeAllDocs() {
try {
client().makeRequest(
adminClient().makeRequest(
"POST",
"${IndexManagementPlugin.CONTROL_CENTER_INDEX}/_delete_by_query",
mapOf("refresh" to "true"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ class RestIndexLRONConfigActionIT : LRONConfigRestTestCase() {
val lronConfig = randomLRONConfig(taskId = randomTaskId(nodeId = nodeIdsInRestIT.random()))
createLRONConfig(lronConfig)

val response = client().makeRequest("GET", "/${IndexManagementPlugin.CONTROL_CENTER_INDEX}/_mapping")
val response = adminClient().makeRequest("GET", "/${IndexManagementPlugin.CONTROL_CENTER_INDEX}/_mapping")
val parserMap = createParser(XContentType.JSON.xContent(), response.entity.content).map() as Map<String, Map<String, Any>>
val mappingsMap = parserMap[IndexManagementPlugin.CONTROL_CENTER_INDEX]!!["mappings"] as Map<String, Any>
val expected =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
val waitForActiveShards = if (isMultiNode) "all" else "1"
val endpoint = "$INDEX_MANAGEMENT_INDEX/_update/${update.id}?wait_for_active_shards=$waitForActiveShards;retry_on_conflict=$retryOnConflict"
val response =
client().makeRequest(
adminClient().makeRequest(
"POST", endpoint,
StringEntity(
"{\"doc\":{\"managed_index\":{\"schedule\":{\"interval\":{\"start_time\":" +
Expand Down
Loading