fix!: return latest workflow for retried-persisted workflows (#15030)

(cherry picked from commit e98b6b3)

Signed-off-by: Elliot Gunton <[email protected]>
Signed-off-by: Alan Clucas <[email protected]>

Author: elliotgunton

persist/sqldb/workflow_archive.go

@@ -360,6 +360,7 @@ func phaseEqual(phase string) db.Cond {
 }
 
 func (r *workflowArchive) GetWorkflow(uid string, namespace string, name string) (*wfv1.Workflow, error) {
+	logger := logging.RequireLoggerFromContext(ctx)
 	var err error
 	archivedWf := &archivedWorkflowRecord{}
 	if uid != "" {
@@ -384,14 +385,19 @@ func (r *workflowArchive) GetWorkflow(uid string, namespace string, name string)
 			}
 			num := int64(total.Total)
 			if num > 1 {
-				return nil, fmt.Errorf("found %d archived workflows with namespace/name: %s/%s", num, namespace, name)
+				logger.WithFields(logging.Fields{
+					"namespace": namespace,
+					"name":      name,
+					"num":       num,
+				}).Debug(ctx, "returning latest of archived workflows")
 			}
 			err = r.session.SQL().
 				Select("workflow").
 				From(archiveTableName).
 				Where(r.clusterManagedNamespaceAndInstanceID()).
 				And(namespaceEqual(namespace)).
 				And(nameEqual(name)).
+				OrderBy("-startedat").
 				One(archivedWf)
 		} else {
 			return nil, sutils.ToStatusError(fmt.Errorf("both name and namespace are required if uid is not specified"), codes.InvalidArgument)