Remove usage of deprecated Provider#forUseAtConfigurationTime (#83932)

Remove gradle api usage that has been deprecated with Gradle 7.4

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/VersionPropertiesLoader.java

@@ -43,7 +43,6 @@ public class VersionPropertiesLoader {
             );
         }
         String qualifier = providers.systemProperty("build.version_qualifier")
-                .forUseAtConfigurationTime()
                 .getOrElse("");
         if (qualifier.isEmpty() == false) {
             if (qualifier.matches("(alpha|beta|rc)\\d+") == false) {
@@ -52,7 +51,6 @@ public class VersionPropertiesLoader {
             elasticsearch += "-" + qualifier;
         }
         final String buildSnapshotSystemProperty = providers.systemProperty("build.snapshot")
-                .forUseAtConfigurationTime()
                 .getOrElse("true");
         switch (buildSnapshotSystemProperty) {
             case "true":

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/VersionPropertiesPlugin.java

@@ -32,6 +32,6 @@ public class VersionPropertiesPlugin implements Plugin<Project> {
                 .registerIfAbsent("versions", VersionPropertiesBuildService.class, spec -> {
             spec.getParameters().getInfoPath().set(infoPath);
         });
-        project.getExtensions().add("versions", serviceProvider.forUseAtConfigurationTime().get().getProperties());
+        project.getExtensions().add("versions", serviceProvider.get().getProperties());
     }
 }

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/info/ParallelDetector.java

@@ -78,7 +78,7 @@ public class ParallelDetector {
     }
 
     private static boolean isMac(ProviderFactory providers) {
-        return providers.systemProperty("os.name").forUseAtConfigurationTime().getOrElse("").startsWith("Mac");
+        return providers.systemProperty("os.name").getOrElse("").startsWith("Mac");
     }
 
 }

build-tools-internal/src/main/groovy/elasticsearch.authenticated-testclusters.gradle

@@ -10,10 +10,8 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask
 
 def clusterCredentials = [
         username: providers.systemProperty('tests.rest.cluster.username')
-                .forUseAtConfigurationTime()
                 .getOrElse('test_admin'),
         password: providers.systemProperty('tests.rest.cluster.password')
-                .forUseAtConfigurationTime()
                 .getOrElse('x-pack-test-password')
 ]
 

build-tools-internal/src/main/groovy/elasticsearch.ide.gradle

@@ -69,7 +69,7 @@ tasks.register('configureIdeCheckstyle') {
 }
 
 // Applying this stuff, particularly the idea-ext plugin, has a cost so avoid it unless we're running in the IDE
-if (providers.systemProperty('idea.active').forUseAtConfigurationTime().getOrNull() == 'true') {
+if (providers.systemProperty('idea.active').getOrNull() == 'true') {
   project.apply(plugin: org.jetbrains.gradle.ext.IdeaExtPlugin)
 
   tasks.register('configureIdeaGradleJvm') {

build-tools-internal/src/main/groovy/elasticsearch.run.gradle

@@ -14,9 +14,9 @@ import org.elasticsearch.gradle.testclusters.RunTask
 // apply plugin: 'elasticsearch.internal-testclusters'
 
 testClusters.register("runTask") {
-    testDistribution = providers.systemProperty('run.distribution').orElse('default').forUseAtConfigurationTime().get()
-    if (providers.systemProperty('run.distribution').forUseAtConfigurationTime().getOrElse('default') == 'default') {
-      String licenseType = providers.systemProperty("run.license_type").forUseAtConfigurationTime().getOrElse("basic")
+    testDistribution = providers.systemProperty('run.distribution').orElse('default').get()
+    if (providers.systemProperty('run.distribution').getOrElse('default') == 'default') {
+      String licenseType = providers.systemProperty("run.license_type").getOrElse("basic")
       if (licenseType == 'trial') {
         setting 'xpack.ml.enabled', 'true'
         setting 'xpack.graph.enabled', 'true'

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalBwcGitPlugin.java

@@ -84,25 +84,20 @@ public class InternalBwcGitPlugin implements Plugin<Project> {
             String remoteRepo = remote.get();
             // for testing only we can override the base remote url
             String remoteRepoUrl = providerFactory.systemProperty("testRemoteRepo")
-                .forUseAtConfigurationTime()
                 .getOrElse("https://github.com/" + remoteRepo + "/elasticsearch.git");
             addRemote.setCommandLine(asList("git", "remote", "add", remoteRepo, remoteRepoUrl));
         });
 
         TaskProvider<LoggedExec> fetchLatestTaskProvider = tasks.register("fetchLatest", LoggedExec.class, fetchLatest -> {
-            var gitFetchLatest = project.getProviders()
-                .systemProperty("tests.bwc.git_fetch_latest")
-                .forUseAtConfigurationTime()
-                .orElse("true")
-                .map(fetchProp -> {
-                    if ("true".equals(fetchProp)) {
-                        return true;
-                    }
-                    if ("false".equals(fetchProp)) {
-                        return false;
-                    }
-                    throw new GradleException("tests.bwc.git_fetch_latest must be [true] or [false] but was [" + fetchProp + "]");
-                });
+            var gitFetchLatest = project.getProviders().systemProperty("tests.bwc.git_fetch_latest").orElse("true").map(fetchProp -> {
+                if ("true".equals(fetchProp)) {
+                    return true;
+                }
+                if ("false".equals(fetchProp)) {
+                    return false;
+                }
+                throw new GradleException("tests.bwc.git_fetch_latest must be [true] or [false] but was [" + fetchProp + "]");
+            });
             fetchLatest.onlyIf(t -> project.getGradle().getStartParameter().isOffline() == false && gitFetchLatest.get());
             fetchLatest.dependsOn(addRemoteTaskProvider);
             fetchLatest.setWorkingDir(gitExtension.getCheckoutDir().get());

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java

@@ -269,7 +269,7 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
     }
 
     private String findJavaHome(String version) {
-        Provider<String> javaHomeNames = providers.gradleProperty("org.gradle.java.installations.fromEnv").forUseAtConfigurationTime();
+        Provider<String> javaHomeNames = providers.gradleProperty("org.gradle.java.installations.fromEnv");
         String javaHomeEnvVar = getJavaHomeEnvVarName(version);
 
         // Provide a useful error if we're looking for a Java home version that we haven't told Gradle about yet

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java

@@ -78,6 +78,6 @@ public class RestTestBasePlugin implements Plugin<Project> {
     }
 
     private String systemProperty(String propName) {
-        return providerFactory.systemProperty(propName).forUseAtConfigurationTime().getOrNull();
+        return providerFactory.systemProperty(propName).getOrNull();
     }
 }

build.gradle

@@ -177,8 +177,8 @@ allprojects {
   // injecting groovy property variables into all projects
   project.ext {
     // for ide hacks...
-    isEclipse = providers.systemProperty("eclipse.launcher").forUseAtConfigurationTime().isPresent() ||   // Detects gradle launched from Eclipse's IDE
-            providers.systemProperty("eclipse.application").forUseAtConfigurationTime().isPresent() ||    // Detects gradle launched from the Eclipse compiler server
+    isEclipse = providers.systemProperty("eclipse.launcher").isPresent() ||   // Detects gradle launched from Eclipse's IDE
+            providers.systemProperty("eclipse.application").isPresent() ||    // Detects gradle launched from the Eclipse compiler server
             gradle.startParameter.taskNames.contains('eclipse') ||  // Detects gradle launched from the command line to do eclipse stuff
             gradle.startParameter.taskNames.contains('cleanEclipse')
   }

client/rest-high-level/build.gradle

@@ -64,11 +64,9 @@ File pkiTrustCert = file("./src/test/resources/org/elasticsearch/client/security
 
 def clusterUserNameProvider = providers.systemProperty('tests.rest.cluster.username')
         .orElse('test_user')
-        .forUseAtConfigurationTime()
 
 def clusterPasswordProvider = providers.systemProperty('tests.rest.cluster.password')
         .orElse('test-user-password')
-        .forUseAtConfigurationTime()
 
 tasks.named('splitPackagesAudit').configure {
   // the client package should be owned by the client, but server has some classes there too

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

@@ -43,7 +43,7 @@ tasks.named("integTest").configure {
    * 2. *One* of these tests is incompatible with that and should be skipped
    *    when running against an external cluster.
    */
-  if (project.providers.systemProperty("tests.rest.cluster").forUseAtConfigurationTime().isPresent()) {
+  if (project.providers.systemProperty("tests.rest.cluster").isPresent()) {
     nonInputProperties.systemProperty 'tests.logfile', testClusters.named('integTest').map(c -> c.singleNode().serverLog)
   } else {
     systemProperty 'tests.logfile', '--external--'

distribution/build.gradle

@@ -37,7 +37,6 @@ tasks.register("generateDependenciesReport", ConcatFilesTask) {
   headerLine = "name,version,url,license,sourceURL"
   target = new File(providers.systemProperty('csv')
                       .orElse("${project.buildDir}/reports/dependencies/es-dependencies.csv")
-                      .forUseAtConfigurationTime()
                       .get()
   )
   // explicitly add our dependency on the JDK

distribution/docker/build.gradle

@@ -18,7 +18,7 @@ apply plugin: 'elasticsearch.rest-resources'
 
 ext.cloudflareZlibVersion = '1.2.8'
 
-String buildId = providers.systemProperty('build.id').forUseAtConfigurationTime().getOrNull()
+String buildId = providers.systemProperty('build.id').getOrNull()
 boolean useLocalArtifacts = buildId != null && buildId.isBlank() == false
 
 repositories {

distribution/packages/build.gradle

@@ -273,7 +273,7 @@ ospackage {
     signingKeyPassphrase = project.property('signing.password')
     signingKeyRingFile = project.hasProperty('signing.secretKeyRingFile') ?
       project.file(project.property('signing.secretKeyRingFile')) :
-      new File(new File(project.providers.systemProperty('user.home').orElse('.gnupg').forUseAtConfigurationTime().get()), 'secring.gpg')
+      new File(new File(project.providers.systemProperty('user.home').orElse('.gnupg').get()), 'secring.gpg')
   }
 
   // version found on oldest supported distro, centos-6

modules/ingest-geoip/build.gradle

@@ -35,7 +35,6 @@ restResources {
 }
 
 def useFixture = providers.environmentVariable("geoip_use_service")
-  .forUseAtConfigurationTime()
   .map { s -> Boolean.parseBoolean(s) == false }
   .getOrElse(true)
 

modules/lang-painless/build.gradle

@@ -181,7 +181,7 @@ tasks.register("generateContextApiSpec", DefaultTestClustersTask) {
       classpath = sourceSets.doc.runtimeClasspath
       systemProperty "cluster.uri", "${-> generateContextApiSpecCluster.get().singleNode().getAllHttpSocketURI().get(0)}"
       systemProperty "jdksrc", providers.systemProperty("jdksrc").getOrNull()
-      systemProperty "packageSources", providers.systemProperty("packageSources").forUseAtConfigurationTime().getOrNull()
+      systemProperty "packageSources", providers.systemProperty("packageSources").getOrNull()
     }.assertNormalExitValue()
   }
 }

modules/repository-azure/build.gradle

@@ -358,7 +358,7 @@ testClusters.matching { it.name == "yamlRestTest" }.configureEach {
       setting 'azure.client.integration_test.endpoint_suffix', azureAddress
       String firstPartOfSeed = BuildParams.testSeed.tokenize(':').get(0)
 
-      def ignoreTestSeed = providers.systemProperty('ignore.tests.seed').forUseAtConfigurationTime().isPresent() ? PropertyNormalization.IGNORE_VALUE : PropertyNormalization.DEFAULT
+      def ignoreTestSeed = providers.systemProperty('ignore.tests.seed').isPresent() ? PropertyNormalization.IGNORE_VALUE : PropertyNormalization.DEFAULT
       setting 'thread_pool.repository_azure.max', (Math.abs(Long.parseUnsignedLong(firstPartOfSeed, 16) % 10) + 1).toString(), ignoreTestSeed
     }
 }

qa/remote-clusters/build.gradle

@@ -65,7 +65,7 @@ tasks.named("preProcessFixture").configure {
 
 dockerCompose {
   tcpPortsToIgnoreWhenWaiting = [9600, 9601]
-  if ('default'.equalsIgnoreCase(providers.systemProperty('tests.distribution').forUseAtConfigurationTime().getOrElse('default'))) {
+  if ('default'.equalsIgnoreCase(providers.systemProperty('tests.distribution').getOrElse('default'))) {
     useComposeFiles = ['docker-compose.yml']
   } else {
     useComposeFiles = ['docker-compose-oss.yml']

x-pack/plugin/core/build.gradle

@@ -77,7 +77,7 @@ tasks.named("processResources").configure {
     inputs.properties(expansions)
     filter("tokens" : expansions, ReplaceTokens.class)
   }
-  String licenseKey = providers.systemProperty("license.key").forUseAtConfigurationTime().getOrNull()
+  String licenseKey = providers.systemProperty("license.key").getOrNull()
   if (licenseKey != null) {
     println "Using provided license key from ${licenseKey}"
   } else if (BuildParams.isSnapshotBuild()) {

x-pack/plugin/eql/qa/correctness/build.gradle

@@ -15,13 +15,11 @@ dependencies {
 }
 
 File serviceAccountFile = providers.environmentVariable('eql_test_credentials_file')
-  .forUseAtConfigurationTime()
   .orElse(providers.systemProperty('eql.test.credentials.file').forUseAtConfigurationTime())
   .map { s -> new File(s)}
   .getOrNull()
 
 Boolean preserveData = providers.systemProperty('eql.test.preserve.data')
-  .forUseAtConfigurationTime()
   .map { s -> Boolean.parseBoolean(s) }
   .getOrElse(false)
 

x-pack/plugin/ml/build.gradle

@@ -16,7 +16,7 @@ repositories {
     forRepository {
       ivy {
         name "ml-cpp"
-        url providers.systemProperty('build.ml_cpp.repo').forUseAtConfigurationTime().orElse('https://prelert-artifacts.s3.amazonaws.com').get()
+        url providers.systemProperty('build.ml_cpp.repo').orElse('https://prelert-artifacts.s3.amazonaws.com').get()
         metadataSources {
           // no repository metadata, look directly for the artifact
           artifact()

x-pack/plugin/sql/sql-cli/build.gradle

@@ -54,7 +54,7 @@ tasks.register("runcli") {
   dependsOn "shadowJar"
   doLast {
     List command = ["${BuildParams.runtimeJavaHome}/bin/java"]
-    if ('true'.equals(providers.systemProperty('debug').orElse('false').forUseAtConfigurationTime().get())) {
+    if ('true'.equals(providers.systemProperty('debug').orElse('false').get())) {
       command += '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000'
     }
     command += ['-jar', shadowJar.archiveFile.get().asFile.absolutePath]