'get_product_name' now expects 'task_name' and 'task_type'

This commit is contained in:
Jakub Trllo 2024-03-11 12:11:22 +01:00
parent a8f9ac5569
commit 7e9dfd5b47
15 changed files with 108 additions and 37 deletions

View file

@ -514,6 +514,12 @@ class BaseCreator:
if host_name is None:
host_name = self.create_context.host_name
task_name = task_type = None
if task_entity:
task_name = task_entity["name"]
task_type = task_entity["taskType"]
dynamic_data = self.get_dynamic_data(
project_name,
folder_entity,
@ -525,7 +531,8 @@ class BaseCreator:
return get_product_name(
project_name,
task_entity,
task_name,
task_type,
host_name,
self.product_type,
variant,

View file

@ -149,10 +149,14 @@ class LegacyCreator(object):
dynamic_data = cls.get_dynamic_data(
project_name, folder_entity, task_entity, variant, host_name
)
task_name = task_type = None
if task_entity:
task_name = task_entity["name"]
task_type = task_entity["taskType"]
return get_product_name(
project_name,
task_entity,
task_name,
task_type,
host_name,
cls.product_type,
variant,

View file

@ -81,7 +81,8 @@ def get_product_name_template(
def get_product_name(
project_name,
task_entity,
task_name,
task_type,
host_name,
product_type,
variant,
@ -106,7 +107,8 @@ def get_product_name(
Args:
project_name (str): Project name.
task_entity (Dict[str, Any]): Task entity.
task_name (Union[str, None]): Task name.
task_type (Union[str, None]): Task type.
host_name (str): Host name.
product_type (str): Product type.
variant (str): In most of the cases it is user input during creation.
@ -129,11 +131,6 @@ def get_product_name(
if not product_type:
return ""
task_name = task_type = None
if task_entity:
task_name = task_entity["name"]
task_type = task_entity["taskType"]
template = get_product_name_template(
project_name,
product_type_filter or product_type,