From ee923175c80e366888fefc272bce2bead5e9558a Mon Sep 17 00:00:00 2001
From: Yun Wu <wuyun1618@gmail.com>
Date: Mon, 19 Aug 2024 12:18:29 -0700
Subject: [PATCH] Update function name; revert bugfix

---
 metaflow/plugins/aip/aip.py                              | 5 +++--
 metaflow/plugins/aip/argo_utils.py                       | 4 ++--
 metaflow/plugins/aip/tests/flows/flow_triggering_flow.py | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/metaflow/plugins/aip/aip.py b/metaflow/plugins/aip/aip.py
index 04b7af03bb5..1d81a697e65 100644
--- a/metaflow/plugins/aip/aip.py
+++ b/metaflow/plugins/aip/aip.py
@@ -291,9 +291,10 @@ def _create_workflow_yaml(
             # Note the name has to follow k8s format.
             # self.name is typically CamelCase as it's python class name.
             # generateName contains a sanitized version of self.name from aip.compiler
-            default_workflow_name = workflow["metadata"].pop("generateName").rstrip("-")
             workflow["metadata"]["name"] = (
-                sanitize_k8s_name(name) if name else default_workflow_name
+                sanitize_k8s_name(name)
+                if name
+                else workflow["metadata"].pop("generateName").rstrip("-")
             )
 
             # Service account is added through webhooks.
diff --git a/metaflow/plugins/aip/argo_utils.py b/metaflow/plugins/aip/argo_utils.py
index 44c8e23520a..e5321da6d36 100644
--- a/metaflow/plugins/aip/argo_utils.py
+++ b/metaflow/plugins/aip/argo_utils.py
@@ -26,7 +26,7 @@ def __init__(self, kubernetes_namespace: str = KUBERNETES_NAMESPACE):
         """
         self._client = ArgoClient(namespace=kubernetes_namespace)
 
-    def trigger(
+    def trigger_exact(
         self,
         template_name: Optional[str] = None,
         parameters: Optional[dict] = None,
@@ -100,7 +100,7 @@ def trigger_latest(
             filter_func=filter_func,
         )
 
-        return self.trigger(
+        return self.trigger_exact(
             template_name=template_name,
             parameters=parameters,
             wait_timeout=wait_timeout,
diff --git a/metaflow/plugins/aip/tests/flows/flow_triggering_flow.py b/metaflow/plugins/aip/tests/flows/flow_triggering_flow.py
index 457329748f1..b6fc454c48f 100644
--- a/metaflow/plugins/aip/tests/flows/flow_triggering_flow.py
+++ b/metaflow/plugins/aip/tests/flows/flow_triggering_flow.py
@@ -126,7 +126,7 @@ def end(self):
 
             # ====== Test template triggering ======
             logger.info("\n Testing ArgoHelper.trigger")
-            run_id, run_uid = argo_helper.trigger(
+            run_id, run_uid = argo_helper.trigger_exact(
                 template_name=self.workflow_template_names[0],
                 parameters={
                     "trigger_enabled": False,