Skip to content

Updates the cleanup phase of YAML tests #1116

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

Merged
merged 1 commit into from
Mar 18, 2021
Merged
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
86 changes: 59 additions & 27 deletions tests/Elasticsearch/Tests/Utility.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ private static function wipeCluster(Client $client): void
{
if (getenv('TEST_SUITE') === 'platinum') {
self::wipeRollupJobs($client);
self::waitForPendingRollupTasks($client);
self::waitForPendingRollupTasks($client);
}

if (version_compare(getenv('STACK_VERSION'), '7.3.99') > 0) {
self::deleteAllSLMPolicies($client);
}

Expand Down Expand Up @@ -262,9 +265,24 @@ private static function deleteAllSLMPolicies(Client $client): void
*/
private static function wipeDataStreams(Client $client): void
{
$client->indices()->deleteDataStream([
'name' => '*'
]);
try {
if (version_compare(getenv('STACK_VERSION'), '7.8.99') > 0) {
$client->indices()->deleteDataStream([
'name' => '*',
'expand_wildcards' => 'all'
]);
}
} catch (ElasticsearchException $e) {
// We hit a version of ES that doesn't understand expand_wildcards, try again without it
try {
$client->indices()->deleteDataStream([
'name' => '*'
]);
} catch (ElasticsearchException $e) {
// We hit a version of ES that doesn't serialize DeleteDataStreamAction.Request#wildcardExpressionsOriginallySpecified
// field or that doesn't support data streams so it's safe to ignore
}
}
}

/**
Expand Down Expand Up @@ -293,39 +311,51 @@ private static function wipeAllIndices(Client $client): void
*/
private static function wipeTemplateForXpack(Client $client): void
{
$result = $client->cat()->templates([
'h' => 'name'
]);
$templates = explode("\n", $result);
foreach ($templates as $template) {
if (empty($template) || self::isXPackTemplate($template)) {
continue;
}
if (version_compare(getenv('STACK_VERSION'), '7.6.99') > 0) {
try {
$client->indices()->deleteTemplate([
'name' => $template
]);
} catch (Missing404Exception $e) {
$msg = sprintf("index_template [%s] missing", $template);
if (strpos($e->getMessage(), $msg) !== false) {
$client->indices()->deleteIndexTemplate([
'name' => $template
$result = $client->indices()->getIndexTemplate();
foreach ($result['index_templates'] as $template) {
if (self::isXPackTemplate($template['name'])) {
continue;
}
try {
$client->indices()->deleteIndexTemplate([
'name' => $template['name']
]);
} catch (ElasticsearchException $e) {
// unable to remove index template
}
}
} catch (ElasticsearchException $e) {
// We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
}
// Delete component template
$result = $client->cluster()->getComponentTemplate();
foreach ($result['component_templates'] as $component) {
if (self::isXPackTemplate($component['name'])) {
continue;
}
try {
$client->cluster()->deleteComponentTemplate([
'name' => $component['name']
]);
} catch (ElasticsearchException $e) {
// We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
}
}
}
// Delete component template
$result = $client->cluster()->getComponentTemplate();
foreach ($result['component_templates'] as $component) {
if (self::isXPackTemplate($component['name'])) {
// Always check for legacy templates
$result = $client->indices()->getTemplate();
foreach ($result as $name => $value) {
if (self::isXPackTemplate($name)) {
continue;
}
try {
$client->cluster()->deleteComponentTemplate([
'name' => $component['name']
$result = $client->indices()->deleteTemplate([
'name' => $name
]);
} catch (ElasticsearchException $e) {
// We hit a version of ES that doesn't support index templates v2 yet, so it's safe to ignore
// unable to remove index template
}
}
}
Expand Down Expand Up @@ -398,6 +428,8 @@ private static function isXPackTemplate(string $name): bool
case "synthetics-mappings":
case ".snapshot-blob-cache":
case ".deprecation-indexing-template":
case "logstash-index-template":
case "security-index-template":
return true;
}
return false;
Expand Down