fix: Priority don't work in workflow spec. Fixes #10374 (#10483)

Signed-off-by: shraddhazpy <contact@shraddhafive.in>

cmd/argo/commands/submit.go

@@ -205,7 +205,9 @@ func submitWorkflows(ctx context.Context, serviceClient workflowpkg.WorkflowServ
 		}
 		err := util.ApplySubmitOpts(&wf, submitOpts)
 		errors.CheckError(err)
-		wf.Spec.Priority = cliOpts.Priority
+		if cliOpts.Priority != nil {
+			wf.Spec.Priority = cliOpts.Priority
+		}
 		options := &metav1.CreateOptions{}
 		if submitOpts.DryRun {
 			options.DryRun = []string{"All"}

cmd/argo/commands/submit_test.go

@@ -0,0 +1,53 @@
+package commands
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/argoproj/argo-workflows/v3/cmd/argo/commands/common"
+	workflowpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/workflow"
+	workflowmocks "github.com/argoproj/argo-workflows/v3/pkg/apiclient/workflow/mocks"
+	wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
+)
+
+func Test_submitWorkflows(t *testing.T) {
+	t.Run("Submit workflow with priority set in spec", func(t *testing.T) {
+		c := &workflowmocks.WorkflowServiceClient{}
+		priority := int32(70)
+		workflow := wfv1.Workflow{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "argo"}, Spec: wfv1.WorkflowSpec{Priority: &priority}}
+
+		c.On("CreateWorkflow", mock.Anything, mock.Anything).Return(&wfv1.Workflow{}, nil)
+		submitWorkflows(context.TODO(), c, "argo", []wfv1.Workflow{workflow}, &wfv1.SubmitOpts{}, &common.CliSubmitOpts{})
+
+		arg := c.Mock.Calls[0].Arguments[1]
+		wfC, ok := arg.(*workflowpkg.WorkflowCreateRequest)
+		if !ok {
+			assert.Fail(t, "type is not WorkflowCreateRequest")
+		}
+		assert.Equal(t, priority, *wfC.Workflow.Spec.Priority)
+
+	})
+
+	t.Run("Submit workflow with priority set from cli", func(t *testing.T) {
+		c := &workflowmocks.WorkflowServiceClient{}
+		priority := int32(70)
+		workflow := wfv1.Workflow{ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "argo"}, Spec: wfv1.WorkflowSpec{Priority: &priority}}
+
+		priorityCLI := int32(100)
+		cliSubmitOpts := common.CliSubmitOpts{Priority: &priorityCLI}
+
+		c.On("CreateWorkflow", mock.Anything, mock.Anything).Return(&wfv1.Workflow{}, nil)
+		submitWorkflows(context.TODO(), c, "argo", []wfv1.Workflow{workflow}, &wfv1.SubmitOpts{}, &cliSubmitOpts)
+
+		arg := c.Mock.Calls[0].Arguments[1]
+		wfC, ok := arg.(*workflowpkg.WorkflowCreateRequest)
+		if !ok {
+			assert.Fail(t, "type is not WorkflowCreateRequest")
+		}
+		assert.Equal(t, priorityCLI, *wfC.Workflow.Spec.Priority)
+	})
+}