Skip to content

Commit

Permalink
[Backport 2.x] Use adminClient instead of client when interacting wit…
Browse files Browse the repository at this point in the history
…h system index in integTests (#1222) (#1223)

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

(cherry picked from commit b7ddbb6)

* Switch to APPLICATION_JSON

Signed-off-by: Craig Perkins <craig5008@gmail.com>

---------

Signed-off-by: Craig Perkins <craig5008@gmail.com>
  • Loading branch information
cwperks authored Aug 22, 2024
1 parent 1387c2a commit abdf77b
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,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,14 +219,15 @@ abstract class IndexManagementRestTestCase : ODFERestTestCase() {
// During this period, this update got missed
// 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(
"POST", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_update/${update.id}?wait_for_active_shards=$waitForActiveShards&refresh=true",
StringEntity(
"{\"doc\":{\"rollup\":{\"schedule\":{\"interval\":{\"start_time\":" +
"\"$startTimeMillis\"}}}}}",
ContentType.APPLICATION_JSON,
),
)
val response =
adminClient().makeRequest(
"POST", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_update/${update.id}?wait_for_active_shards=$waitForActiveShards&refresh=true",
StringEntity(
"{\"doc\":{\"rollup\":{\"schedule\":{\"interval\":{\"start_time\":" +
"\"$startTimeMillis\"}}}}}",
ContentType.APPLICATION_JSON,
),
)

assertEquals("Request failed", RestStatus.OK, response.restStatus())
}
Expand All @@ -248,14 +249,15 @@ abstract class IndexManagementRestTestCase : ODFERestTestCase() {
val millis = Duration.of(intervalSchedule.interval.toLong(), intervalSchedule.unit).minusSeconds(2).toMillis()
val startTimeMillis = desiredStartTimeMillis ?: (Instant.now().toEpochMilli() - millis)
val waitForActiveShards = if (isMultiNode) "all" else "1"
val response = client().makeRequest(
"POST", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_update/${update.id}?wait_for_active_shards=$waitForActiveShards",
StringEntity(
"{\"doc\":{\"transform\":{\"schedule\":{\"interval\":{\"start_time\":" +
"\"$startTimeMillis\"}}}}}",
ContentType.APPLICATION_JSON,
),
)
val response =
adminClient().makeRequest(
"POST", "${IndexManagementPlugin.INDEX_MANAGEMENT_INDEX}/_update/${update.id}?wait_for_active_shards=$waitForActiveShards",
StringEntity(
"{\"doc\":{\"transform\":{\"schedule\":{\"interval\":{\"start_time\":" +
"\"$startTimeMillis\"}}}}}",
ContentType.APPLICATION_JSON,
),
)

assertEquals("Request failed", RestStatus.OK, response.restStatus())
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,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 @@ -393,7 +393,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(
"POST", "source-index/_open",
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 @@ -178,7 +178,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 = createParser(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -451,14 +451,15 @@ abstract class IndexStateManagementRestTestCase : IndexManagementRestTestCase()
val startTimeMillis = desiredStartTimeMillis ?: Instant.now().toEpochMilli() - millis
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(
"POST", endpoint,
StringEntity(
"{\"doc\":{\"managed_index\":{\"schedule\":{\"interval\":{\"start_time\":" +
"\"$startTimeMillis\"}}}}}",
APPLICATION_JSON,
),
)
val response =
adminClient().makeRequest(
"POST", endpoint,
StringEntity(
"{\"doc\":{\"managed_index\":{\"schedule\":{\"interval\":{\"start_time\":" +
"\"$startTimeMillis\"}}}}}",
APPLICATION_JSON,
),
)

assertEquals("Request failed", RestStatus.OK, response.restStatus())
}
Expand Down

0 comments on commit abdf77b

Please sign in to comment.