fix validation and update for v2 schema

Signed-off-by: Sylwester Piskozub <sylwesterpiskozub@gmail.com>

Author: Piskoo

app/cli/cmd/workflow_contract_create.go

@@ -43,9 +43,6 @@ func newWorkflowContractCreateCmd() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&name, "name", "", "contract name")
-	err := cmd.MarkFlagRequired("name")
-	cobra.CheckErr(err)
-
 	cmd.Flags().StringVarP(&contractPath, "contract", "f", "", "path or URL to the contract schema")
 	cmd.Flags().StringVar(&description, "description", "", "description of the contract")
 	cmd.Flags().StringVar(&projectName, "project", "", "project name used to scope the contract, if not set the contract will be created in the organization")

app/cli/cmd/workflow_contract_update.go

@@ -53,12 +53,7 @@ func newWorkflowContractUpdateCmd() *cobra.Command {
 	}
 
 	cmd.Flags().StringVar(&name, "name", "", "contract name")
-	err := cmd.MarkFlagRequired("name")
-	cobra.CheckErr(err)
-
 	cmd.Flags().StringVarP(&contractPath, "contract", "f", "", "path or URL to the contract schema")
-
-	cobra.CheckErr(err)
 	cmd.Flags().StringVar(&description, "description", "", "description of the contract")
 
 	return cmd

app/controlplane/api/controlplane/v1/workflow_contract.pb.go

@@ -38,13 +38,7 @@ message WorkflowContractServiceListResponse {
 }
 
 message WorkflowContractServiceCreateRequest {
-  string name = 1 [(buf.validate.field) = {
-    cel: {
-      message: "must contain only lowercase letters, numbers, and hyphens."
-      expression: "this.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')"
-      id: "name.dns-1123"
-    }
-  }];
+  string name = 1;
 
   // Raw representation of the contract in json, yaml or cue
   bytes raw_contract = 4;
@@ -53,25 +47,41 @@ message WorkflowContractServiceCreateRequest {
 
   // You might need to specify a project reference if you want/need to create a contract scoped to a project
   IdentityReference project_reference = 5;
+  
+  option (buf.validate.message).cel = {
+    id: "name.dns-1122"
+    message: "must contain only lowercase letters, numbers, and hyphens."
+    expression: "this.name == '' || this.name.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')"
+  };
+  option (buf.validate.message).cel = {
+    id: "name_required_without_contract"
+    message: "name is required when raw_contract is not provided"
+    expression: "this.name != '' || size(this.raw_contract) > 0"
+  };
 }
 
 message WorkflowContractServiceCreateResponse {
   WorkflowContractItem result = 1;
 }
 
 message WorkflowContractServiceUpdateRequest {
-  string name = 1 [(buf.validate.field) = {
-    cel: {
-      message: "must contain only lowercase letters, numbers, and hyphens."
-      expression: "this.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')"
-      id: "name.dns-1123"
-    }
-  }];
+  string name = 1;
 
   // Raw representation of the contract in json, yaml or cue
   bytes raw_contract = 5;
 
   optional string description = 4;
+  
+  option (buf.validate.message).cel = {
+    id: "name.dns-1122"
+    message: "must contain only lowercase letters, numbers, and hyphens."
+    expression: "this.name == '' || this.name.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')"
+  };
+  option (buf.validate.message).cel = {
+    id: "name_required_without_contract"
+    message: "name is required when raw_contract is not provided"
+    expression: "this.name != '' || size(this.raw_contract) > 0"
+  };
 }
 
 message WorkflowContractServiceUpdateResponse {

app/controlplane/api/controlplane/v1/workflow_contract.proto

@@ -320,7 +320,7 @@ func extractContractName(rawContract []byte, name string) (string, error) {
 		return name, err
 	}
 
-	// Try parsing as v2 Contract 
+	// Try parsing as v2 Contract
 	v2Contract := &schemav1.CraftingSchemaV2{}
 	if err := unmarshal.FromRaw(rawContract, format, v2Contract, true); err == nil {
 		if v2Contract.GetMetadata() != nil {

app/controlplane/internal/service/workflowcontract.go

@@ -215,15 +215,19 @@ var EmptyDefaultContract = &Contract{
 }
 
 func (uc *WorkflowContractUseCase) Create(ctx context.Context, opts *WorkflowContractCreateOpts) (*WorkflowContract, error) {
-	if opts.OrgID == "" || opts.Name == "" {
-		return nil, NewErrValidationStr("organization and name are required")
+	if opts.OrgID == "" {
+		return nil, NewErrValidationStr("organization is required")
 	}
 
 	orgUUID, err := uuid.Parse(opts.OrgID)
 	if err != nil {
 		return nil, err
 	}
 
+	if opts.Name == "" {
+		return nil, NewErrValidationStr("name is required")
+	}
+
 	if err := ValidateIsDNS1123(opts.Name); err != nil {
 		return nil, NewErrValidation(err)
 	}
@@ -399,7 +403,8 @@ func (uc *WorkflowContractUseCase) ValidateContractPolicies(rawSchema []byte, to
 		return NewErrValidation(err)
 	}
 
-	if c.isV1Schema() {
+	switch {
+	case c.isV1Schema():
 		// Handle v1 schema
 		schema := c.Schema
 		for _, att := range schema.GetPolicies().GetAttestation() {
@@ -417,7 +422,7 @@ func (uc *WorkflowContractUseCase) ValidateContractPolicies(rawSchema []byte, to
 				return NewErrValidation(err)
 			}
 		}
-	} else if c.isV2Schema() {
+	case c.isV2Schema():
 		// Handle v2 schema
 		spec := c.Schemav2.GetSpec()
 		if spec.GetPolicies() != nil {
@@ -437,7 +442,7 @@ func (uc *WorkflowContractUseCase) ValidateContractPolicies(rawSchema []byte, to
 				return NewErrValidation(err)
 			}
 		}
-	} else {
+	default:
 		return NewErrValidation(fmt.Errorf("invalid schema format"))
 	}
 

app/controlplane/pkg/biz/workflowcontract.go

@@ -29,7 +29,6 @@ import (
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/workflow"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/workflowcontract"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/workflowcontractversion"
-	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/unmarshal"
 
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/google/uuid"
@@ -358,12 +357,12 @@ func entContractVersionToBizContractVersion(w *ent.WorkflowContractVersion) (*bi
 		// Scenario 2: contracts that have been updated after the introduction of the raw_body field will have the raw_body field populated
 		// but we also want to keep the Body field populated for backward compatibility
 	} else if len(w.Body) == 0 {
-		schema := &schemav1.CraftingSchema{}
-		err := unmarshal.FromRaw(w.RawBody, w.RawBodyFormat, schema, false)
+		parsedContract, err := biz.UnmarshalAndValidateRawContract(w.RawBody, w.RawBodyFormat)
 		if err != nil {
 			return nil, fmt.Errorf("failed to unmarshal raw body: %w", err)
 		}
-		contract.Schema = schema
+		contract.Schema = parsedContract.Schema
+		contract.Schemav2 = parsedContract.Schemav2
 	}
 
 	return &biz.WorkflowContractVersion{