Skip to content

Commit

Permalink
[DOCS] Remove testenv annotations from doc snippet tests (#80023) (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
jrodewig authored Nov 5, 2021
1 parent ed2b7a2 commit 286e9a4
Show file tree
Hide file tree
Showing 336 changed files with 1 addition and 357 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -264,19 +264,6 @@ class RestTestsFromSnippetsTask extends SnippetsTask {
current.println(" - stash_in_path")
current.println(" - stash_path_replace")
current.println(" - warnings")
if (test.testEnv != null) {
switch (test.testEnv) {
case 'basic':
case 'gold':
case 'platinum':
case 'enterprise':
current.println(" - xpack")
break;
default:
throw new InvalidUserDataException('Unsupported testEnv: '
+ test.testEnv)
}
}
}
if (test.skip) {
if (test.continued) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ class SnippetsTask extends DefaultTask {
Snippet snippet = null
StringBuilder contents = null
List substitutions = null
String testEnv = null
Closure emit = {
snippet.contents = contents.toString()
contents = null
Expand Down Expand Up @@ -140,14 +139,10 @@ class SnippetsTask extends DefaultTask {
}
file.eachLine('UTF-8') { String line, int lineNumber ->
Matcher matcher
matcher = line =~ /\[testenv="([^"]+)"\]\s*/
if (matcher.matches()) {
testEnv = matcher.group(1)
}
if (line ==~ /-{4,}\s*/) { // Four dashes looks like a snippet
if (snippet == null) {
Path path = docs.dir.toPath().relativize(file.toPath())
snippet = new Snippet(path: path, start: lineNumber, testEnv: testEnv, name: name)
snippet = new Snippet(path: path, start: lineNumber, name: name)
if (lastLanguageLine == lineNumber - 1) {
snippet.language = lastLanguage
}
Expand Down Expand Up @@ -333,7 +328,6 @@ class SnippetsTask extends DefaultTask {
int start
int end = NOT_FINISHED
String contents
String testEnv

Boolean console = null
boolean test = false
Expand Down Expand Up @@ -362,9 +356,6 @@ class SnippetsTask extends DefaultTask {
}
if (test) {
result += '// TEST'
if (testEnv != null) {
result += "[testenv=$testEnv]"
}
if (catchPart) {
result += "[catch: $catchPart]"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-bucket-multi-terms-aggregation]]
=== Multi Terms aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-metrics-boxplot-aggregation]]
=== Boxplot aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="gold"]
[[search-aggregations-metrics-geo-line]]
=== Geo-Line Aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-metrics-rate-aggregation]]
=== Rate aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-metrics-string-stats-aggregation]]
=== String stats aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-metrics-ttest-aggregation]]
=== T-test aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-metrics-top-metrics]]
=== Top metrics aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-bucket-correlation-aggregation]]
=== Bucket correlation aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-bucket-count-ks-test-aggregation]]
=== Bucket count K-S test correlation aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-pipeline-cumulative-cardinality-aggregation]]
=== Cumulative cardinality aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-pipeline-inference-bucket-aggregation]]
=== {infer-cap} bucket aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-pipeline-moving-percentiles-aggregation]]
=== Moving percentiles aggregation
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[search-aggregations-pipeline-normalize-aggregation]]
=== Normalize aggregation
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/autoscaling/apis/autoscaling-apis.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-apis]]
== Autoscaling APIs

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-delete-autoscaling-policy]]
=== Delete autoscaling policy API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-get-autoscaling-capacity]]
=== Get autoscaling capacity API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-get-autoscaling-policy]]
=== Get autoscaling policy API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-put-autoscaling-policy]]
=== Create or update autoscaling policy API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/autoscaling/autoscaling-deciders.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-deciders]]
== Autoscaling deciders

Expand Down
1 change: 0 additions & 1 deletion docs/reference/autoscaling/deciders/fixed-decider.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-fixed-decider]]
=== Fixed decider

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-machine-learning-decider]]
=== Machine learning decider

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[autoscaling-proactive-storage-decider]]
=== Proactive storage decider

Expand Down
1 change: 0 additions & 1 deletion docs/reference/autoscaling/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="enterprise"]
[[xpack-autoscaling]]
= Autoscaling

Expand Down
1 change: 0 additions & 1 deletion docs/reference/cat/anomaly-detectors.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[cat-anomaly-detectors]]
=== cat anomaly detectors API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/cat/datafeeds.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[cat-datafeeds]]
=== cat {dfeeds} API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/cat/dataframeanalytics.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[cat-dfanalytics]]
=== cat {dfanalytics} API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/cat/trainedmodel.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[cat-trained-model]]
=== cat trained model API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-delete-auto-follow-pattern]]
=== Delete auto-follow pattern API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-get-auto-follow-pattern]]
=== Get auto-follow pattern API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-pause-auto-follow-pattern]]
=== Pause auto-follow pattern API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-put-auto-follow-pattern]]
=== Create auto-follow pattern API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-resume-auto-follow-pattern]]
=== Resume auto-follow pattern API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/ccr-apis.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-apis]]
== {ccr-cap} APIs

Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow-request-body.asciidoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[testenv="platinum"]
`settings`::
(object) Settings to override from the leader index. Note that certain
settings can not be overrode (e.g., `index.number_of_shards`).
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow/get-follow-info.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-get-follow-info]]
=== Get follower info API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow/get-follow-stats.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-get-follow-stats]]
=== Get follower stats API
++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-post-forget-follower]]
=== Forget follower API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow/post-pause-follow.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-post-pause-follow]]
=== Pause follower API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow/post-resume-follow.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-post-resume-follow]]
=== Resume follower API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow/post-unfollow.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-post-unfollow]]
=== Unfollow API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/follow/put-follow.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-put-follow]]
=== Create follower API
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/apis/get-ccr-stats.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-get-stats]]
=== Get {ccr} stats API
[subs="attributes"]
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/auto-follow.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-auto-follow]]
=== Manage auto-follow patterns
To replicate time series indices, you configure an auto-follow pattern so that
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/getting-started.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-getting-started-tutorial]]
=== Tutorial: Set up {ccr}
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/index.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[xpack-ccr]]
== {ccr-cap}
With {ccr}, you can replicate indices across clusters to:
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/managing.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]

[[ccr-managing]]
=== Manage {ccr}
Expand Down
1 change: 0 additions & 1 deletion docs/reference/ccr/upgrading.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="platinum"]
[[ccr-upgrading]]
=== Upgrading clusters using {ccr}
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/delete-async-eql-search-api.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]

[[delete-async-eql-search-api]]
=== Delete async EQL search API
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/detect-threats-with-eql.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[eql-ex-threat-detection]]
== Example: Detect threats with EQL

Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/eql-search-api.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]

[[eql-search-api]]
=== EQL search API
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/eql.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[eql]]
= EQL search
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/functions.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[eql-function-ref]]
== EQL function reference
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/get-async-eql-search-api.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]

[[get-async-eql-search-api]]
=== Get async EQL search API
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/get-async-eql-status-api.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]

[[get-async-eql-status-api]]
=== Get async EQL status API
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/pipes.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[eql-pipe-ref]]
== EQL pipe reference
++++
Expand Down
1 change: 0 additions & 1 deletion docs/reference/eql/syntax.asciidoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[role="xpack"]
[testenv="basic"]
[[eql-syntax]]
== EQL syntax reference
++++
Expand Down
Loading

0 comments on commit 286e9a4

Please sign in to comment.