Skip to content

Commit 286e9a4

Browse files
authored
[DOCS] Remove testenv annotations from doc snippet tests (#80023) (#80457)
Removes `testenv` annotations and related code. These annotations originally let you skip x-pack snippet tests in the docs. However, that's no longer possible. Relates to #79309, #31619
1 parent ed2b7a2 commit 286e9a4

File tree

336 files changed

+1
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+1
-357
lines changed

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -264,19 +264,6 @@ class RestTestsFromSnippetsTask extends SnippetsTask {
264264
current.println(" - stash_in_path")
265265
current.println(" - stash_path_replace")
266266
current.println(" - warnings")
267-
if (test.testEnv != null) {
268-
switch (test.testEnv) {
269-
case 'basic':
270-
case 'gold':
271-
case 'platinum':
272-
case 'enterprise':
273-
current.println(" - xpack")
274-
break;
275-
default:
276-
throw new InvalidUserDataException('Unsupported testEnv: '
277-
+ test.testEnv)
278-
}
279-
}
280267
}
281268
if (test.skip) {
282269
if (test.continued) {

build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/SnippetsTask.groovy

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ class SnippetsTask extends DefaultTask {
7373
Snippet snippet = null
7474
StringBuilder contents = null
7575
List substitutions = null
76-
String testEnv = null
7776
Closure emit = {
7877
snippet.contents = contents.toString()
7978
contents = null
@@ -140,14 +139,10 @@ class SnippetsTask extends DefaultTask {
140139
}
141140
file.eachLine('UTF-8') { String line, int lineNumber ->
142141
Matcher matcher
143-
matcher = line =~ /\[testenv="([^"]+)"\]\s*/
144-
if (matcher.matches()) {
145-
testEnv = matcher.group(1)
146-
}
147142
if (line ==~ /-{4,}\s*/) { // Four dashes looks like a snippet
148143
if (snippet == null) {
149144
Path path = docs.dir.toPath().relativize(file.toPath())
150-
snippet = new Snippet(path: path, start: lineNumber, testEnv: testEnv, name: name)
145+
snippet = new Snippet(path: path, start: lineNumber, name: name)
151146
if (lastLanguageLine == lineNumber - 1) {
152147
snippet.language = lastLanguage
153148
}
@@ -333,7 +328,6 @@ class SnippetsTask extends DefaultTask {
333328
int start
334329
int end = NOT_FINISHED
335330
String contents
336-
String testEnv
337331

338332
Boolean console = null
339333
boolean test = false
@@ -362,9 +356,6 @@ class SnippetsTask extends DefaultTask {
362356
}
363357
if (test) {
364358
result += '// TEST'
365-
if (testEnv != null) {
366-
result += "[testenv=$testEnv]"
367-
}
368359
if (catchPart) {
369360
result += "[catch: $catchPart]"
370361
}

docs/reference/aggregations/bucket/multi-terms-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/metrics/boxplot-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/metrics/geoline-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/metrics/rate-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/metrics/string-stats-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/metrics/t-test-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/metrics/top-metrics-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

docs/reference/aggregations/pipeline/bucket-correlation-aggregation.asciidoc

Lines changed: 0 additions & 1 deletion

0 commit comments

Comments
 (0)