Set feature flags for IndexTemplatesV2 and Data Streams in top… (#53897)

Resolves #53892

Author: dakrone

build.gradle

@@ -545,3 +545,15 @@ allprojects {
     }
   }
 }
+
+// TODO: remove this once 7.7 is released and the 7.x branch is 7.8
+subprojects {
+  pluginManager.withPlugin('elasticsearch.testclusters') {
+    testClusters.all {
+      if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) {
+        systemProperty 'es.itv2_feature_flag_registered', 'true'
+        systemProperty 'es.datastreams_feature_flag_registered', 'true'
+      }
+    }
+  }
+}

distribution/archives/integ-test-zip/build.gradle

@@ -1,4 +1,3 @@
-import org.elasticsearch.gradle.info.BuildParams
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -33,10 +32,3 @@ integTest.runner {
     systemProperty 'tests.logfile', '--external--'
   }
 }
-
-testClusters.integTest {
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.itv2_feature_flag_registered', 'true'
-    systemProperty 'es.datastreams_feature_flag_registered', 'true'
-  }
-}

qa/smoke-test-multinode/build.gradle

@@ -16,9 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import org.elasticsearch.gradle.info.BuildParams
-
-import org.elasticsearch.gradle.info.BuildParams
 
 apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.standalone-rest-test'
@@ -49,10 +46,3 @@ integTest.runner {
     ].join(',')
   }
 }
-
-testClusters.integTest {
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.itv2_feature_flag_registered', 'true'
-    systemProperty 'es.datastreams_feature_flag_registered', 'true'
-  }
-}

server/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -381,9 +381,6 @@ public class ActionModule extends AbstractModule {
 
     static {
         final String property = System.getProperty("es.itv2_feature_flag_registered");
-        if (Build.CURRENT.isSnapshot() && property != null) {
-            throw new IllegalArgumentException("es.itv2_feature_flag_registered is only supported in non-snapshot builds");
-        }
         if (Build.CURRENT.isSnapshot() || "true".equals(property)) {
             ITV2_FEATURE_FLAG_REGISTERED = true;
         } else if ("false".equals(property) || property == null) {
@@ -398,9 +395,6 @@ public class ActionModule extends AbstractModule {
 
     static {
         final String property = System.getProperty("es.datastreams_feature_flag_registered");
-        if (Build.CURRENT.isSnapshot() && property != null) {
-            throw new IllegalArgumentException("es.datastreams_feature_flag_registered is only supported in non-snapshot builds");
-        }
         if (Build.CURRENT.isSnapshot() || "true".equals(property)) {
             DATASTREAMS_FEATURE_FLAG_REGISTERED = true;
         } else if ("false".equals(property) || property == null) {

x-pack/qa/core-rest-tests-with-security/build.gradle

@@ -1,5 +1,3 @@
-import org.elasticsearch.gradle.info.BuildParams
-
 apply plugin: 'elasticsearch.testclusters'
 apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.rest-test'
@@ -39,10 +37,3 @@ testClusters.integTest {
   user username: System.getProperty('tests.rest.cluster.username', 'test_user'),
     password: System.getProperty('tests.rest.cluster.password', 'x-pack-test-password')
 }
-
-testClusters.integTest {
-  if (BuildParams.isSnapshotBuild() == false) {
-    systemProperty 'es.itv2_feature_flag_registered', 'true'
-    systemProperty 'es.datastreams_feature_flag_registered', 'true'
-  }
-}