use dataInputSchema.schema as pointer

Signed-off-by: Spolti <[email protected]>

Author: spolti

model/workflow.go

@@ -507,7 +507,7 @@ type StateDataFilter struct {
 // DataInputSchema Used to validate the workflow data input against a defined JSON Schema
 type DataInputSchema struct {
 	// +kubebuilder:validation:Required
-	Schema Object `json:"schema" validate:"required"`
+	Schema *Object `json:"schema" validate:"required"`
 	// +kubebuilder:validation:Required
 	FailOnValidationErrors bool `json:"failOnValidationErrors"`
 }
@@ -519,7 +519,8 @@ func (d *DataInputSchema) UnmarshalJSON(data []byte) error {
 	d.ApplyDefault()
 	if data[0] == '"' && len(data) > 0 {
 		replaced := bytes.Replace(data, []byte(`"`), []byte(``), -1)
-		d.Schema = FromString(string(replaced))
+		repp := FromString(string(replaced))
+		d.Schema = &repp
 	} else {
 		return util.UnmarshalObject("dataInputSchema", data, (*dataInputSchemaUnmarshal)(d))
 	}

model/workflow_test.go

@@ -496,6 +496,9 @@ func TestTransitionUnmarshalJSON(t *testing.T) {
 }
 
 func TestDataInputSchemaUnmarshalJSON(t *testing.T) {
+
+	schemaName := FromString("schema name")
+
 	type testCase struct {
 		desp   string
 		data   string
@@ -508,7 +511,7 @@ func TestDataInputSchemaUnmarshalJSON(t *testing.T) {
 			desp: "string success",
 			data: `"schema name"`,
 			expect: DataInputSchema{
-				Schema:                 FromString("schema name"),
+				Schema:                 &schemaName,
 				FailOnValidationErrors: true,
 			},
 			err: ``,
@@ -517,7 +520,7 @@ func TestDataInputSchemaUnmarshalJSON(t *testing.T) {
 			desp: `object success`,
 			data: `{"schema": "schema name"}`,
 			expect: DataInputSchema{
-				Schema:                 FromString("schema name"),
+				Schema:                 &schemaName,
 				FailOnValidationErrors: true,
 			},
 			err: ``,
@@ -526,7 +529,7 @@ func TestDataInputSchemaUnmarshalJSON(t *testing.T) {
 			desp: `object fail`,
 			data: `{"schema": "schema name}`,
 			expect: DataInputSchema{
-				Schema:                 FromString("schema name"),
+				Schema:                 &schemaName,
 				FailOnValidationErrors: true,
 			},
 			err: `unexpected end of JSON input`,

model/workflow_validator_test.go

@@ -425,26 +425,28 @@ func TestDataInputSchemaStructLevelValidation(t *testing.T) {
 	action1 := buildActionByOperationState(operationState, "action 1")
 	buildFunctionRef(baseWorkflow, action1, "function 1")
 
+	sampleSchema := FromString("sample schema")
+
 	testCases := []ValidationCase{
 		// TODO Empty DataInoputSchema will have this instead nil:
 		// 	&{Schema:{Type:0 StringValue: IntValue:0 FloatValue:0 MapValue:map[] SliceValue:[] BoolValue:false}
 		// We can, make Schema pointer, or, find a way to make all fields from Object as pointer.
 		// Using Schema: FromNull does have the same effect than just not set it.
-		//{
-		//	Desp: "empty DataInputSchema",
-		//	Model: func() Workflow {
-		//		model := baseWorkflow.DeepCopy()
-		//		model.DataInputSchema = &DataInputSchema{}
-		//		return *model
-		//	},
-		//	Err: `workflow.dataInputSchema.schema is required`,
-		//},
+		{
+			Desp: "empty DataInputSchema",
+			Model: func() Workflow {
+				model := baseWorkflow.DeepCopy()
+				model.DataInputSchema = &DataInputSchema{}
+				return *model
+			},
+			Err: `workflow.dataInputSchema.schema is required`,
+		},
 		{
 			Desp: "filled Schema, default failOnValidationErrors",
 			Model: func() Workflow {
 				model := baseWorkflow.DeepCopy()
 				model.DataInputSchema = &DataInputSchema{
-					Schema: FromString("sample schema"),
+					Schema: &sampleSchema,
 				}
 				return *model
 			},

model/zz_generated.deepcopy.go

@@ -583,8 +583,8 @@ func TestFromFile(t *testing.T) {
 		}, {
 			"./testdata/workflows/dataInputSchemaValidation.yaml", func(t *testing.T, w *model.Workflow) {
 				assert.NotNil(t, w.DataInputSchema)
-
-				assert.Equal(t, model.FromString("sample schema"), w.DataInputSchema.Schema)
+				expected := model.FromString("sample schema")
+				assert.Equal(t, &expected, w.DataInputSchema.Schema)
 				assert.Equal(t, false, w.DataInputSchema.FailOnValidationErrors)
 			},
 		}, {
@@ -597,7 +597,7 @@ func TestFromFile(t *testing.T) {
 					&expected)
 				fmt.Printf("err: %s\n", err)
 				fmt.Printf("schema: %+v\n", expected)
-				assert.Equal(t, expected, w.DataInputSchema.Schema)
+				assert.Equal(t, &expected, w.DataInputSchema.Schema)
 				assert.Equal(t, false, w.DataInputSchema.FailOnValidationErrors)
 			},
 		},