update v1

pkg/apis/pipeline/v1/result_validation.go

@@ -35,7 +35,9 @@ func (tr TaskResult) Validate(ctx context.Context) (errs *apis.FieldError) {
 	}
 	// Array and Object are alpha features
 	if tr.Type == ResultsTypeArray || tr.Type == ResultsTypeObject {
-		return errs.Also(version.ValidateEnabledAPIFields(ctx, "results type", config.AlphaAPIFields))
+		errs := errs.Also(validateObjectResult(tr))
+		errs = errs.Also(version.ValidateEnabledAPIFields(ctx, "results type", config.AlphaAPIFields))
+		return errs
 	}
 
 	// Resources created before the result. Type was introduced may not have Type set
@@ -51,3 +53,25 @@ func (tr TaskResult) Validate(ctx context.Context) (errs *apis.FieldError) {
 
 	return nil
 }
+
+
+func validateObjectResult(tr TaskResult) (errs *apis.FieldError) {
+	if ParamType(tr.Type) == ParamTypeObject && tr.Properties == nil {
+		return apis.ErrMissingField(fmt.Sprintf("%s.properties", tr.Name))
+	}
+
+	invalidKeys := []string{}
+	for key, propertySpec := range tr.Properties {
+		if propertySpec.Type != ParamTypeString {
+			invalidKeys = append(invalidKeys, key)
+		}
+	}
+
+	if len(invalidKeys) != 0 {
+		return &apis.FieldError{
+			Message: fmt.Sprintf("The value type specified for these keys %v is invalid", invalidKeys),
+			Paths:   []string{fmt.Sprintf("%s.properties", tr.Name)},
+		}
+	}
+	return nil
+}

pkg/apis/pipeline/v1/result_validation_test.go

@@ -44,7 +44,7 @@ func TestResultsValidate(t *testing.T) {
 		name: "valid result type string",
 		Result: v1.TaskResult{
 			Name:        "MY-RESULT",
-			Type:        "string",
+			Type:        v1.ResultsTypeString,
 			Description: "my great result",
 		},
 
@@ -53,7 +53,7 @@ func TestResultsValidate(t *testing.T) {
 		name: "valid result type array",
 		Result: v1.TaskResult{
 			Name:        "MY-RESULT",
-			Type:        "array",
+			Type:        v1.ResultsTypeArray,
 			Description: "my great result",
 		},
 
@@ -62,10 +62,10 @@ func TestResultsValidate(t *testing.T) {
 		name: "valid result type object",
 		Result: v1.TaskResult{
 			Name:        "MY-RESULT",
-			Type:        "array",
+			Type:        v1.ResultsTypeObject,
 			Description: "my great result",
+			Properties:  map[string]v1.PropertySpec{"hello": {Type: v1.ParamTypeString}},
 		},
-
 		apiFields: "alpha",
 	}}
 	for _, tt := range tests {
@@ -117,7 +117,7 @@ func TestResultsValidateError(t *testing.T) {
 		name: "invalid array result type in stable",
 		Result: v1.TaskResult{
 			Name:        "MY-RESULT",
-			Type:        "array",
+			Type:        v1.ResultsTypeArray,
 			Description: "my great result",
 		},
 		apiFields: "stable",
@@ -128,13 +128,39 @@ func TestResultsValidateError(t *testing.T) {
 		name: "invalid object result type in stable",
 		Result: v1.TaskResult{
 			Name:        "MY-RESULT",
-			Type:        "object",
+			Type:        v1.ResultsTypeObject,
 			Description: "my great result",
+			Properties:  map[string]v1.PropertySpec{"hello": {Type: v1.ParamTypeString}},
 		},
 		apiFields: "stable",
 		expectedError: apis.FieldError{
 			Message: "results type requires \"enable-api-fields\" feature gate to be \"alpha\" but it is \"stable\"",
 		},
+	}, {
+		name: "invalid object properties type",
+		Result: v1.TaskResult{
+			Name:        "MY-RESULT",
+			Type:        v1.ResultsTypeObject,
+			Description: "my great result",
+			Properties:  map[string]v1.PropertySpec{"hello": {Type: "wrong type"}},
+		},
+		apiFields: "alpha",
+		expectedError: apis.FieldError{
+			Message: "The value type specified for these keys [hello] is invalid",
+			Paths:   []string{"MY-RESULT.properties"},
+		},
+	}, {
+		name: "invalid object properties empty",
+		Result: v1.TaskResult{
+			Name:        "MY-RESULT",
+			Type:        v1.ResultsTypeObject,
+			Description: "my great result",
+		},
+		apiFields: "alpha",
+		expectedError: apis.FieldError{
+			Message: "missing field(s)",
+			Paths:   []string{"MY-RESULT.properties"},
+		},
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/apis/pipeline/v1/task_validation_test.go

@@ -328,6 +328,10 @@ func TestTaskSpecValidate(t *testing.T) {
 				Name:        "MY-RESULT",
 				Type:        v1.ResultsTypeObject,
 				Description: "my great result",
+				Properties: map[string]v1.PropertySpec{
+					"url":    {"string"},
+					"commit": {"string"},
+				},
 			}},
 		},
 	}, {