Merge pull request #604 from iExecBlockchainComputing/release/8.5.0

Release/8.5.0

Author: jbern0rd

CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[8.5.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.5.0) 2024-06-19
+
+### New Features
+
+- Add `iexec-core-library` dependency and use it. (#595)
+- Create `ConfigServerClient` instance and use it instead of `BlockchainAdapterApiClient`. (#596)
+- Replace `CredentialsService` with `SignerService`. (#602)
+
+### Bug fixes
+
+- Fix `LoginServiceTests#shouldLoginOnceOnSimultaneousCalls` test. (#587)
+- Always use `WorkerpoolAuhorization` to retrieve JWT on Result Proxy. (#588)
+- Improve checks when receiving a `computed.json` file from a REST call. (#598)
+- Avoid `NullPointerException` on empty enclave configuration during TEE pre-compute. (#601)
+
+### Quality
+
+- Configure Gradle JVM Test Suite Plugin. (#589)
+- Remove `ResponseEntity` wrapper in feign client. (#593)
+- Use constructor injection in `Application` class. (#594)
+- Transform `CoreConfigurationService` to immutable `SchedulerConfiguration` class. (#597)
+- Move `ReplicateActionResponse` from `iexec-common` to `iexec-worker`. (#599)
+- Use `ReplicateTaskSummary` from `iexce-core-library`. (#600)
+
+### Dependency Upgrades
+
+- Upgrade to Gradle 8.7. (#590)
+- Upgrade to `eclipse-temurin:11.0.22_7-jre-focal`. (#591)
+- Upgrade to Spring Boot 2.7.18. (#592)
+- Upgrade to `iexec-commons-poco` 4.1.0. (#603)
+- Upgrade to `iexec-common` 8.5.0. (#603)
+- Upgrade to `iexec-commons-containers` 1.2.2. (#603)
+- Upgrade to `iexec-result-proxy-library` 8.5.0. (#603)
+- Upgrade to `iexec-sms-library` 8.6.0. (#603)
+- Upgrade to `iexec-core-library` 8.5.0. (#603)
+
 ## [[8.4.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.4.0) 2024-02-29
 
 ### New Features
@@ -19,9 +55,9 @@ All notable changes to this project will be documented in this file.
 ### Dependency Upgrades
 
 - Upgrade to `iexec-common` 8.4.0. (#583)
-- Upgrade to `iexec-blockchain-adapter` 8.4.0. (#584)
-- Upgrade to `iexec-result-proxy` 8.4.0. (#584)
-- Upgrade to `iexec-sms` 8.5.0. (#584)
+- Upgrade to `iexec-blockchain-adapter-library` 8.4.0. (#584)
+- Upgrade to `iexec-result-proxy-library` 8.4.0. (#584)
+- Upgrade to `iexec-sms-library` 8.5.0. (#584)
 
 ## [[8.3.0]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.3.0) 2024-01-11
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:11.0.21_9-jre-focal
+FROM eclipse-temurin:11.0.22_7-jre-focal
 
 ARG jar
 

build.gradle

@@ -1,10 +1,10 @@
 plugins {
     id 'java'
-    id 'io.freefair.lombok' version '8.2.2'
-    id 'org.springframework.boot' version '2.7.17'
+    id 'io.freefair.lombok' version '8.6'
+    id 'org.springframework.boot' version '2.7.18'
     id 'io.spring.dependency-management' version '1.1.4'
     id 'jacoco'
-    id 'org.sonarqube' version '4.2.1.3168'
+    id 'org.sonarqube' version '5.0.0.4638'
     id 'maven-publish'
 }
 
@@ -13,6 +13,7 @@ group = 'com.iexec.worker'
 ext {
     springCloudVersion = '2021.0.8'
     commonsMathsVersion = '3.6.1'
+    testContainersVersion = '1.19.3'
 }
 
 if (!project.hasProperty('gitBranch')) {
@@ -49,9 +50,9 @@ dependencies {
     implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
     implementation "com.iexec.commons:iexec-commons-containers:$iexecCommonsContainersVersion"
-    implementation "com.iexec.blockchain:iexec-blockchain-adapter-api-library:$iexecBlockchainAdapterVersion"
     implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion"
     implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion"
+    implementation "com.iexec.core:iexec-core-library:$iexecCoreVersion"
 
     // spring
     implementation "org.springframework.boot:spring-boot-starter"
@@ -84,14 +85,6 @@ dependencies {
 
     // expiring map
     implementation 'net.jodah:expiringmap:0.5.10'
-
-    // tests
-    testImplementation "org.springframework.boot:spring-boot-starter-test"
-    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-    testImplementation "org.mockito:mockito-inline" // activates mocking final classes/methods
-
-    // awaitility
-    testImplementation "org.awaitility:awaitility"
 }
 
 java {
@@ -113,8 +106,26 @@ tasks.named("bootJar") {
     }
 }
 
-test {
-    useJUnitPlatform()
+testing {
+    suites {
+        test {
+            useJUnitJupiter()
+            dependencies {
+                implementation "org.springframework.boot:spring-boot-starter-test"
+                implementation "org.mockito:mockito-inline" // activates mocking final classes/methods
+
+                // awaitility
+                implementation "org.awaitility:awaitility"
+
+                // testcontainers
+                implementation "org.testcontainers:junit-jupiter:$testContainersVersion"
+            }
+        }
+    }
+}
+
+tasks.withType(Test).configureEach {
+    finalizedBy jacocoTestReport
 }
 
 tasks.register('itest') {
@@ -128,7 +139,6 @@ jacocoTestReport {
         xml.required = true
     }
 }
-tasks.test.finalizedBy tasks.jacocoTestReport
 tasks.sonarqube.dependsOn tasks.jacocoTestReport
 
 publishing {

gradle.properties

@@ -1,10 +1,9 @@
-version=8.4.0
-iexecCommonVersion=8.4.0
-iexecCommonsContainersVersion=1.2.1
-iexecCommonsPocoVersion=3.2.0
-iexecBlockchainAdapterVersion=8.4.0
-iexecResultVersion=8.4.0
-iexecSmsVersion=8.5.0
-
+version=8.5.0
+iexecCommonVersion=8.5.0
+iexecCommonsContainersVersion=1.2.2
+iexecCommonsPocoVersion=4.1.0
+iexecResultVersion=8.5.0
+iexecSmsVersion=8.6.0
+iexecCoreVersion=8.5.0
 nexusUser
 nexusPassword

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

gradlew.bat

@@ -16,7 +16,6 @@
 
 package com.iexec.worker;
 
-
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.feign.LoginService;
 import com.iexec.worker.replicate.ReplicateRecoveryService;
@@ -25,7 +24,6 @@
 import com.iexec.worker.worker.WorkerService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -44,23 +42,26 @@
 @ConfigurationPropertiesScan
 public class Application implements CommandLineRunner {
 
-    @Autowired
-    private String workerWalletAddress;
-
-    @Autowired
-    private IexecHubService iexecHubService;
-
-    @Autowired
-    private LoginService loginService;
-
-    @Autowired
-    private WorkerService workerService;
-
-    @Autowired
-    private ReplicateRecoveryService replicateRecoveryService;
-
-    @Autowired
-    private ResultService resultService;
+    private final String workerWalletAddress;
+    private final IexecHubService iexecHubService;
+    private final LoginService loginService;
+    private final WorkerService workerService;
+    private final ReplicateRecoveryService replicateRecoveryService;
+    private final ResultService resultService;
+
+    public Application(String workerWalletAddress,
+                       IexecHubService iexecHubService,
+                       LoginService loginService,
+                       WorkerService workerService,
+                       ReplicateRecoveryService replicateRecoveryService,
+                       ResultService resultService) {
+        this.workerWalletAddress = workerWalletAddress;
+        this.iexecHubService = iexecHubService;
+        this.loginService = loginService;
+        this.workerService = workerService;
+        this.replicateRecoveryService = replicateRecoveryService;
+        this.resultService = resultService;
+    }
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

src/main/java/com/iexec/worker/Application.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,8 @@
 
 package com.iexec.worker;
 
-import com.iexec.worker.config.CoreConfigurationService;
+import com.iexec.core.api.SchedulerClient;
 import com.iexec.worker.feign.LoginService;
-import com.iexec.worker.feign.client.CoreClient;
 import com.iexec.worker.utils.AsyncUtils;
 import com.iexec.worker.utils.ExecutorUtils;
 import com.iexec.worker.worker.WorkerService;
@@ -38,19 +37,18 @@ public class PingService {
     private static final int PING_RATE_IN_SECONDS = 10;
 
     private final Executor executor;
-    private final CoreClient coreClient;
-    private final CoreConfigurationService coreConfigurationService;
+    private final SchedulerClient schedulerClient;
     private final LoginService loginService;
     private final WorkerService workerService;
 
-    public PingService(CoreClient coreClient,
-                       CoreConfigurationService coreConfigurationService,
+    private String coreSessionId;
+
+    public PingService(SchedulerClient schedulerClient,
                        LoginService loginService,
                        WorkerService workerService) {
         executor = ExecutorUtils
                 .newSingleThreadExecutorWithFixedSizeQueue(1, "ping-");
-        this.coreClient = coreClient;
-        this.coreConfigurationService = coreConfigurationService;
+        this.schedulerClient = schedulerClient;
         this.loginService = loginService;
         this.workerService = workerService;
     }
@@ -78,7 +76,7 @@ void pingScheduler() {
         log.debug("Sending ping to scheduler");
         final String sessionId;
         try {
-            sessionId = coreClient.ping(loginService.getToken());
+            sessionId = schedulerClient.ping(loginService.getToken());
         } catch (FeignException e) {
             log.warn("The worker cannot ping the core [status:{}]", e.status());
             if (e instanceof FeignException.Unauthorized) {
@@ -97,16 +95,15 @@ void pingScheduler() {
         if (now.getMinute() == 0 && now.getSecond() <= PING_RATE_IN_SECONDS) {
             log.info("Sent ping to scheduler [sessionId:{}]", sessionId);
         }
-        String currentSessionId = coreConfigurationService.getCoreSessionId();
-        if (StringUtils.isEmpty(currentSessionId)) {
+        if (StringUtils.isEmpty(coreSessionId)) {
             log.info("First ping from the worker, setting the sessionId [coreSessionId:{}]", sessionId);
-            coreConfigurationService.setCoreSessionId(sessionId);
+            coreSessionId = sessionId;
             return;
         }
-        if (!sessionId.equalsIgnoreCase(currentSessionId)) {
+        if (!sessionId.equalsIgnoreCase(coreSessionId)) {
             // need to reconnect to the core by restarting the worker
-            log.warn("Scheduler seems to have restarted [currentSessionId:{}, " +
-                    "coreSessionId:{}]", currentSessionId, sessionId);
+            log.warn("Scheduler seems to have restarted [currentSessionId:{}, coreSessionId:{}]",
+                    coreSessionId, sessionId);
             workerService.restartGracefully();
         }
     }