Skip to content

feat: rename newly created variables with IEXEC_ prefix #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbern0rd merged 1 commit into from
Oct 7, 2025
+12 −12
Merged

feat: rename newly created variables with IEXEC_ prefix #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# x-release-please-start-version
version=9.1.0
# x-release-please-end
iexecCommonsPocoVersion=5.1.0
iexecCommonsPocoVersion=5.2.0

nexusUser
nexusPassword
8 changes: 4 additions & 4 deletions src/main/java/com/iexec/common/utils/IexecEnvUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class IexecEnvUtils {

// bulk processing
public static final String BULK_ENV_VAR_PREFIX = "BULK_DATASET_";
// dataset prefix, mostly for bulk processing
public static final String IEXEC_DATASET_PREFIX = "IEXEC_DATASET_";
// input files
public static final String IEXEC_INPUT_FILE_NAME_PREFIX = "IEXEC_INPUT_FILE_NAME_";
public static final String IEXEC_INPUT_FILE_URL_PREFIX = "IEXEC_INPUT_FILE_URL_";
Expand Down Expand Up @@ -80,8 +80,8 @@ public static Map<String, String> getAllIexecEnv(final TaskDescription taskDescr
*/
public static Map<String, String> getComputeStageEnvMap(final TaskDescription taskDescription) {
final Map<String, String> map = new HashMap<>();
map.put(DEAL_ID.name(), taskDescription.getChainDealId());
map.put(TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()));
map.put(IEXEC_DEAL_ID.name(), taskDescription.getChainDealId());
map.put(IEXEC_TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()));
map.put(IEXEC_TASK_ID.name(), taskDescription.getChainTaskId());
map.put(IEXEC_IN.name(), IexecFileHelper.SLASH_IEXEC_IN);
map.put(IEXEC_OUT.name(), IexecFileHelper.SLASH_IEXEC_OUT);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/iexec/common/worker/tee/TeeSessionEnvironmentVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

public enum TeeSessionEnvironmentVariable {
// common
DEAL_ID,
TASK_INDEX,
IEXEC_DEAL_ID,
IEXEC_TASK_INDEX,
IEXEC_TASK_ID,
SIGN_WORKER_ADDRESS,
SIGN_TEE_CHALLENGE_PRIVATE_KEY,
Expand All @@ -38,7 +38,7 @@ public enum TeeSessionEnvironmentVariable {
IEXEC_INPUT_FILES_NUMBER,
IEXEC_INPUT_FILES_FOLDER,
IEXEC_PRE_COMPUTE_OUT,
BULK_SIZE,
IEXEC_BULK_SLICE_SIZE,
// post-compute
RESULT_ENCRYPTION,
RESULT_ENCRYPTION_PUBLIC_KEY,
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/iexec/common/utils/IexecEnvUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ void shouldGetComputeStageEnvList() {
.dealParams(dealParams)
.build();
final List<String> expected = List.of(
"DEAL_ID=chainDealId",
"TASK_INDEX=0",
"IEXEC_DEAL_ID=chainDealId",
"IEXEC_TASK_INDEX=0",
"IEXEC_TASK_ID=chainTaskId",
"IEXEC_IN=/iexec_in",
"IEXEC_OUT=/iexec_out",
Expand All @@ -148,8 +148,8 @@ void shouldGetComputeStageEnvList() {

private Map<String, String> getExpectedComputeStageMapValues(final TaskDescription taskDescription) {
return Map.of(
TeeSessionEnvironmentVariable.DEAL_ID.name(), taskDescription.getChainDealId(),
TeeSessionEnvironmentVariable.TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()),
TeeSessionEnvironmentVariable.IEXEC_DEAL_ID.name(), taskDescription.getChainDealId(),
TeeSessionEnvironmentVariable.IEXEC_TASK_INDEX.name(), String.valueOf(taskDescription.getBotIndex()),
TeeSessionEnvironmentVariable.IEXEC_TASK_ID.name(), taskDescription.getChainTaskId(),
TeeSessionEnvironmentVariable.IEXEC_IN.name(), IexecFileHelper.SLASH_IEXEC_IN,
TeeSessionEnvironmentVariable.IEXEC_OUT.name(), IexecFileHelper.SLASH_IEXEC_OUT,
Expand Down