Replace SECURE_SESSION_NO_TEE_PROVIDER with SECURE_SESSION_NO_TEE_FRAMEWORK (#265)

Author: jbern0rd

CHANGELOG.md

@@ -11,6 +11,8 @@ All notable changes to this project will be documented in this file.
 ### Quality
 
 - Configure Gradle JVM Test Suite Plugin. (#259)
+- Replace `SECURE_SESSION_NO_TEE_PROVIDER` with `SECURE_SESSION_NO_TEE_FRAMEWORK`
+  in `TeeSessionGenerationError`. (#265)
 
 ### Dependency Upgrades
 

iexec-sms-library/src/main/java/com/iexec/sms/api/TeeSessionGenerationError.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IEXEC BLOCKCHAIN TECH
+ * Copyright 2022-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.
@@ -49,16 +49,16 @@ public enum TeeSessionGenerationError {
     // region Secure session generation
     SECURE_SESSION_STORAGE_CALL_FAILED,
     SECURE_SESSION_GENERATION_FAILED,
+    SECURE_SESSION_NO_TEE_FRAMEWORK,
+    @Deprecated(forRemoval = true)
     SECURE_SESSION_NO_TEE_PROVIDER,
-    SECURE_SESSION_UNKNOWN_TEE_PROVIDER,
     // endregion
 
     // region Miscellaneous
     GET_TASK_DESCRIPTION_FAILED,
     NO_SESSION_REQUEST,
     NO_TASK_DESCRIPTION,
-    GET_SESSION_FAILED,
-
+    // worker side
     UNKNOWN_ISSUE
     // endregion
 }

src/main/java/com/iexec/sms/tee/session/TeeSessionService.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.
@@ -27,7 +27,7 @@
 import org.springframework.stereotype.Service;
 
 import static com.iexec.sms.api.TeeSessionGenerationError.GET_TASK_DESCRIPTION_FAILED;
-import static com.iexec.sms.api.TeeSessionGenerationError.SECURE_SESSION_NO_TEE_PROVIDER;
+import static com.iexec.sms.api.TeeSessionGenerationError.SECURE_SESSION_NO_TEE_FRAMEWORK;
 
 @Service
 public class TeeSessionService {
@@ -64,7 +64,7 @@ public TeeSessionGenerationResponse generateTeeSession(
         final TeeFramework teeFramework = taskDescription.getTeeFramework();
         if (teeFramework == null) {
             throw new TeeSessionGenerationException(
-                    SECURE_SESSION_NO_TEE_PROVIDER,
+                    SECURE_SESSION_NO_TEE_FRAMEWORK,
                     String.format("TEE framework can't be null [taskId:%s]", taskId));
         }
 

src/test/java/com/iexec/sms/tee/session/TeeSessionServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2022-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.
@@ -24,15 +24,16 @@
 import com.iexec.sms.tee.session.generic.TeeSessionGenerationException;
 import com.iexec.sms.tee.session.gramine.GramineSessionHandlerService;
 import com.iexec.sms.tee.session.scone.SconeSessionHandlerService;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
+@ExtendWith(MockitoExtension.class)
 class TeeSessionServiceTests {
     private final static String TASK_ID = "0x0";
     private final static String WORKER_ADDRESS = "0x1";
@@ -45,11 +46,6 @@ class TeeSessionServiceTests {
     @Mock
     private IexecHubService iexecHubService;
 
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-    }
-
     @Test
     void shouldGenerateSconeSession()
             throws TeeSessionGenerationException {
@@ -119,10 +115,9 @@ void shouldNotGenerateTeeSessionSinceNoTeeFramework() {
         final TeeSessionGenerationException teeSessionGenerationException = assertThrows(
                 TeeSessionGenerationException.class,
                 () -> teeSessionService.generateTeeSession(TASK_ID, WORKER_ADDRESS, TEE_CHALLENGE));
-        assertEquals(TeeSessionGenerationError.SECURE_SESSION_NO_TEE_PROVIDER,
+        assertEquals(TeeSessionGenerationError.SECURE_SESSION_NO_TEE_FRAMEWORK,
                 teeSessionGenerationException.getError());
-        assertEquals(String.format("TEE framework can't be null [taskId:%s]",
-                TASK_ID),
+        assertEquals(String.format("TEE framework can't be null [taskId:%s]", TASK_ID),
                 teeSessionGenerationException.getMessage());
     }