fix: add suspend column alias and improve test coverage for review feedback

Signed-off-by: Mario Apostolov <mario.apostolov@mariadb.com>

Author: mariadb-MarioEApostolov

persist/sqldb/workflow_archive.go

@@ -187,8 +187,8 @@ func (r *workflowArchive) ListWorkflows(ctx context.Context, options sutils.List
 					db.Raw("coalesce(JSON_EXTRACT(workflow, '$.metadata.labels'), '{}') as labels"),
 					db.Raw("coalesce(JSON_EXTRACT(workflow, '$.metadata.annotations'), '{}') as annotations"),
 					db.Raw("coalesce(JSON_UNQUOTE(JSON_EXTRACT(workflow, '$.status.progress')), '') as progress"),
-					db.Raw("JSON_UNQUOTE(JSON_EXTRACT(workflow, '$.spec.suspend'))"),
-					db.Raw("coalesce(JSON_UNQUOTE(JSON_EXTRACT(workflow, '$.spec.arguments')), '{}') as arguments"),
+					db.Raw("JSON_UNQUOTE(JSON_EXTRACT(workflow, '$.spec.suspend')) as suspend"),
+					db.Raw("coalesce(JSON_EXTRACT(workflow, '$.spec.arguments'), '{}') as arguments"),
 					db.Raw("coalesce(JSON_UNQUOTE(JSON_EXTRACT(workflow, '$.status.message')), '') as message"),
 					db.Raw("coalesce(JSON_UNQUOTE(JSON_EXTRACT(workflow, '$.status.estimatedDuration')), '0') as estimatedduration"),
 					db.Raw("coalesce(JSON_EXTRACT(workflow, '$.status.resourcesDuration'), '{}') as resourcesduration"),

persist/sqldb/workflow_archive_mysql_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/testcontainers/testcontainers-go/wait"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/utils/ptr"
 
 	"github.com/argoproj/argo-workflows/v4/config"
 	wfv1 "github.com/argoproj/argo-workflows/v4/pkg/apis/workflow/v1alpha1"
@@ -33,7 +34,8 @@ var mysqlVariants = map[string]mysqlVariant{
 	"MariaDB": {image: "mariadb:11.4", waitMessage: "mariadbd: ready for connections"},
 }
 
-func setupMySQLArchiveTest(ctx context.Context, t *testing.T, v mysqlVariant) (WorkflowArchive, func()) {
+// setupMySQLArchiveTest starts a MySQL or MariaDB container, runs migrations, and returns a WorkflowArchive.
+func setupMySQLArchiveTest(ctx context.Context, t *testing.T, v mysqlVariant) WorkflowArchive {
 	t.Helper()
 
 	c, err := testmysql.Run(ctx,
@@ -48,6 +50,7 @@ func setupMySQLArchiveTest(ctx context.Context, t *testing.T, v mysqlVariant) (W
 			)),
 	)
 	require.NoError(t, err)
+	t.Cleanup(func() { testcontainers.TerminateContainer(c) }) //nolint:errcheck
 
 	host, err := c.Host(ctx)
 	require.NoError(t, err)
@@ -74,10 +77,9 @@ func setupMySQLArchiveTest(ctx context.Context, t *testing.T, v mysqlVariant) (W
 	err = Migrate(ctx, proxy.Session(), "test", "argo_workflows", proxy.DBType())
 	require.NoError(t, err)
 
-	return NewWorkflowArchive(proxy, "test", "", instanceid.NewService("")), func() {
-		proxy.Close()
-		testcontainers.TerminateContainer(c) //nolint:errcheck
-	}
+	t.Cleanup(func() { proxy.Close() })
+
+	return NewWorkflowArchive(proxy, "test", "", instanceid.NewService(""))
 }
 
 // TestMySQLListWorkflows verifies that JSON_EXTRACT/JSON_UNQUOTE queries in
@@ -90,8 +92,7 @@ func TestMySQLListWorkflows(t *testing.T) {
 	for name, variant := range mysqlVariants {
 		t.Run(name, func(t *testing.T) {
 			ctx := logging.TestContext(t.Context())
-			archive, cleanup := setupMySQLArchiveTest(ctx, t, variant)
-			defer cleanup()
+			archive := setupMySQLArchiveTest(ctx, t, variant)
 
 			now := metav1.Now()
 			err := archive.ArchiveWorkflow(ctx, &wfv1.Workflow{
@@ -106,6 +107,7 @@ func TestMySQLListWorkflows(t *testing.T) {
 					},
 				},
 				Spec: wfv1.WorkflowSpec{
+					Suspend: ptr.To(true),
 					Arguments: wfv1.Arguments{
 						Parameters: []wfv1.Parameter{
 							{Name: "msg", Value: wfv1.AnyStringPtr("hello")},
@@ -132,6 +134,7 @@ func TestMySQLListWorkflows(t *testing.T) {
 			assert.Equal(t, wfv1.Progress("1/1"), wf.Status.Progress)
 			assert.Equal(t, "completed", wf.Status.Message)
 			assert.Equal(t, "test", wf.GetLabels()["env"])
+			assert.Equal(t, ptr.To(true), wf.Spec.Suspend)
 		})
 	}
 }

util/sqldb/sqldb_test.go

@@ -26,7 +26,8 @@ var mysqlVariants = map[string]mysqlVariant{
 	"MariaDB": {image: "mariadb:11.4", waitMessage: "mariadbd: ready for connections"},
 }
 
-func setupMySQLContainer(ctx context.Context, t *testing.T, v mysqlVariant) (config.DBConfig, func()) {
+// setupMySQLContainer starts a MySQL or MariaDB container and returns the corresponding DBConfig.
+func setupMySQLContainer(ctx context.Context, t *testing.T, v mysqlVariant) config.DBConfig {
 	t.Helper()
 
 	c, err := testmysql.Run(ctx,
@@ -41,6 +42,7 @@ func setupMySQLContainer(ctx context.Context, t *testing.T, v mysqlVariant) (con
 			)),
 	)
 	require.NoError(t, err)
+	t.Cleanup(func() { testcontainers.TerminateContainer(c) }) //nolint:errcheck
 
 	host, err := c.Host(ctx)
 	require.NoError(t, err)
@@ -57,7 +59,7 @@ func setupMySQLContainer(ctx context.Context, t *testing.T, v mysqlVariant) (con
 				Port:     port,
 			},
 		},
-	}, func() { testcontainers.TerminateContainer(c) } //nolint:errcheck
+	}
 }
 
 // TestMySQLSessionConnect verifies that CreateDBSessionWithCreds can connect
@@ -70,8 +72,7 @@ func TestMySQLSessionConnect(t *testing.T) {
 	for name, variant := range mysqlVariants {
 		t.Run(name, func(t *testing.T) {
 			ctx := logging.TestContext(t.Context())
-			dbConfig, cleanup := setupMySQLContainer(ctx, t, variant)
-			defer cleanup()
+			dbConfig := setupMySQLContainer(ctx, t, variant)
 
 			sess, dbType, err := CreateDBSessionWithCreds(dbConfig, "argo", "argo")
 			require.NoError(t, err)