Add CreateStrategy to validate object changes. (#3090)

Author: justinsb

porch/pkg/registry/porch/packagecommon.go

@@ -43,6 +43,7 @@ type packageCommon struct {
 	coreClient     client.Client
 	gr             schema.GroupResource
 	updateStrategy SimpleRESTUpdateStrategy
+	createStrategy SimpleRESTCreateStrategy
 }
 
 func (r *packageCommon) listPackages(ctx context.Context, filter packageFilter, callback func(p repository.PackageRevision) error) error {
@@ -204,11 +205,10 @@ func (r *packageCommon) updatePackageRevision(ctx context.Context, name string,
 			}
 		}
 
-		// TODO: ValidateCreate function ?
-		// fieldErrors := r.updateStrategy.ValidateCreate(ctx, newRuntimeObj, oldRuntimeObj)
-		// if len(fieldErrors) > 0 {
-		// 	return nil, false, apierrors.NewInvalid(api.SchemeGroupVersion.WithKind("PackageRevision").GroupKind(), name, fieldErrors)
-		// }
+		fieldErrors := r.createStrategy.Validate(ctx, newRuntimeObj)
+		if len(fieldErrors) > 0 {
+			return nil, false, apierrors.NewInvalid(api.SchemeGroupVersion.WithKind("PackageRevision").GroupKind(), name, fieldErrors)
+		}
 	}
 
 	r.updateStrategy.Canonicalize(newRuntimeObj)

porch/pkg/registry/porch/packagerevision.go

@@ -134,6 +134,11 @@ func (r *packageRevisions) Create(ctx context.Context, runtimeObject runtime.Obj
 		return nil, apierrors.NewInternalError(fmt.Errorf("error getting repository %v: %w", repositoryID, err))
 	}
 
+	fieldErrors := r.createStrategy.Validate(ctx, runtimeObject)
+	if len(fieldErrors) > 0 {
+		return nil, apierrors.NewInvalid(api.SchemeGroupVersion.WithKind("PackageRevision").GroupKind(), obj.Name, fieldErrors)
+	}
+
 	rev, err := r.cad.CreatePackageRevision(ctx, &repositoryObj, obj)
 	if err != nil {
 		return nil, apierrors.NewInternalError(err)
@@ -265,3 +270,29 @@ func (s packageRevisionStrategy) Canonicalize(obj runtime.Object) {
 		pr.Spec.Lifecycle = api.PackageRevisionLifecycleDraft
 	}
 }
+
+var _ SimpleRESTCreateStrategy = packageRevisionStrategy{}
+
+// Validate returns an ErrorList with validation errors or nil.  Validate
+// is invoked after default fields in the object have been filled in
+// before the object is persisted.  This method should not mutate the
+// object.
+func (s packageRevisionStrategy) Validate(ctx context.Context, runtimeObj runtime.Object) field.ErrorList {
+	allErrs := field.ErrorList{}
+
+	obj := runtimeObj.(*api.PackageRevision)
+
+	switch lifecycle := obj.Spec.Lifecycle; lifecycle {
+	case "", api.PackageRevisionLifecycleDraft:
+		// valid
+
+	default:
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "lifecycle"), lifecycle, fmt.Sprintf("value can be only created as %s",
+			strings.Join([]string{
+				string(api.PackageRevisionLifecycleDraft),
+			}, ",")),
+		))
+	}
+
+	return allErrs
+}

porch/pkg/registry/porch/packagerevisions_approval.go

@@ -91,3 +91,17 @@ func (s packageRevisionApprovalStrategy) ValidateUpdate(ctx context.Context, obj
 }
 
 func (s packageRevisionApprovalStrategy) Canonicalize(obj runtime.Object) {}
+
+var _ SimpleRESTCreateStrategy = packageRevisionApprovalStrategy{}
+
+// Validate returns an ErrorList with validation errors or nil.  Validate
+// is invoked after default fields in the object have been filled in
+// before the object is persisted.  This method should not mutate the
+// object.
+func (s packageRevisionApprovalStrategy) Validate(ctx context.Context, runtimeObj runtime.Object) field.ErrorList {
+	allErrs := field.ErrorList{}
+
+	// obj := runtimeObj.(*api.PackageRevision)
+
+	return allErrs
+}

porch/pkg/registry/porch/rest.go

@@ -29,6 +29,16 @@ type SimpleRESTUpdateStrategy interface {
 	Canonicalize(obj runtime.Object)
 }
 
+// SimpleRESTCreateStrategy is similar to rest.RESTCreateStrategy, though only contains
+// methods currently required.
+type SimpleRESTCreateStrategy interface {
+	// Validate returns an ErrorList with validation errors or nil.  Validate
+	// is invoked after default fields in the object have been filled in
+	// before the object is persisted.  This method should not mutate the
+	// object.
+	Validate(ctx context.Context, obj runtime.Object) field.ErrorList
+}
+
 type NoopUpdateStrategy struct{}
 
 func (s NoopUpdateStrategy) PrepareForUpdate(ctx context.Context, obj, old runtime.Object) {}

porch/pkg/registry/porch/storage.go

@@ -36,6 +36,7 @@ func NewRESTStorage(scheme *runtime.Scheme, codecs serializer.CodecFactory, cad
 			gr:             porch.Resource("packagerevisions"),
 			coreClient:     coreClient,
 			updateStrategy: packageRevisionStrategy{},
+			createStrategy: packageRevisionStrategy{},
 		},
 	}
 
@@ -46,6 +47,7 @@ func NewRESTStorage(scheme *runtime.Scheme, codecs serializer.CodecFactory, cad
 			coreClient:     coreClient,
 			gr:             porch.Resource("packagerevisions"),
 			updateStrategy: packageRevisionApprovalStrategy{},
+			createStrategy: packageRevisionApprovalStrategy{},
 		},
 	}