From 630f7f6c1e7c53cb69a92a4ed1b42820806e2bb4 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 29 Nov 2024 10:59:14 +0100
Subject: [PATCH] fill values for farm with correct values

---
 .../publish/collect_farm_env_variables.py     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/plugins/publish/collect_farm_env_variables.py b/client/ayon_core/plugins/publish/collect_farm_env_variables.py
index 2e28b1b164..cb52e5c32e 100644
--- a/client/ayon_core/plugins/publish/collect_farm_env_variables.py
+++ b/client/ayon_core/plugins/publish/collect_farm_env_variables.py
@@ -2,6 +2,7 @@
 
 import pyblish.api
 
+from ayon_core.lib import get_ayon_username
 from ayon_core.pipeline.publish import FARM_JOB_ENV_DATA_KEY
 
 
@@ -15,16 +16,22 @@ def process(self, context):
         env = context.data.setdefault(FARM_JOB_ENV_DATA_KEY, {})
 
         # Disable colored logs on farm
-        env["AYON_LOG_NO_COLORS"] = "1"
+        for key, value in (
+            ("AYON_LOG_NO_COLORS", "1"),
+            ("AYON_PROJECT_NAME", context.data["projectName"]),
+            ("AYON_FOLDER_PATH", context.data.get("folderPath")),
+            ("AYON_TASK_NAME", context.data.get("task")),
+            # NOTE we should use 'context.data["user"]' but that has higher
+            #   order.
+            ("AYON_USERNAME", get_ayon_username()),
+        ):
+            if value:
+                self.log.debug(f"Setting job env: {key}: {value}")
+                env[key] = value
 
         for key in [
             "AYON_BUNDLE_NAME",
             "AYON_DEFAULT_SETTINGS_VARIANT",
-            "AYON_USERNAME",
-            "AYON_PROJECT_NAME",
-            "AYON_FOLDER_PATH",
-            "AYON_TASK_NAME",
-            "AYON_LOG_NO_COLORS",
             "AYON_IN_TESTS",
             # NOTE Not sure why workdir is needed?
             "AYON_WORKDIR",