feat(crafting-schema): add schema v2 support to cli by Piskoo · Pull Request #2467 · chainloop-dev/chainloop

Piskoo · 2025-10-14T10:41:31Z

Summary

This PR adds support for contract schema v2 in CLI workflow contract create, update, and apply operations.

Note: The default contract body for create will be updated once v2 schema support is available everywhere.

Changes

CLI can now create and update contracts using v2 schema format:

  apiVersion: ...
  kind: ...
  metadata:
    name: ...
  spec:
    ...

Contract name can now be extracted from the v2 field metadata.name, removing the need for the --name flag.
Validation ensures only one name source is provided (either --name flag or metadata.name in the contract).

migmartri · 2025-10-17T11:41:42Z

app/cli/cmd/workflow_contract_create.go


 	cmd.Flags().StringVar(&name, "name", "", "contract name")
-	err := cmd.MarkFlagRequired("name")
-	cobra.CheckErr(err)


missing validation

migmartri · 2025-10-17T11:47:51Z

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

+    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 = {


this validation doesnt mean much in legacy format

migmartri · 2025-10-17T11:56:22Z

app/controlplane/pkg/data/workflowcontract.go

 			return nil, fmt.Errorf("failed to unmarshal raw body: %w", err)
 		}
-		contract.Schema = schema
+		contract.Schema = parsedContract.Schema


This might be broken, because Schema is necessary for compatibility reasons.

Old CLIs must keep working with new contracts

migmartri · 2025-10-17T11:58:46Z

app/controlplane/pkg/data/workflowcontract.go

 		}
-		contract.Schema = schema
+		contract.Schema = parsedContract.Schema
+		contract.Schemav2 = parsedContract.Schemav2


This second option we don't want it.

migmartri · 2025-10-17T12:00:15Z

app/controlplane/internal/service/workflowcontract.go

 }
+
+// extractContractName extracts the contract name from v2 metadata or returns the fallback name
+func extractContractName(rawContract []byte, name string) (string, error) {


validate that exactly one item is present

migmartri · 2025-10-17T12:01:24Z

app/controlplane/pkg/biz/workflowcontract.go

-		if _, err := uc.findAndValidatePolicy(att, token); err != nil {
-			return NewErrValidation(err)
+	switch {
+	case c.isV1Schema():


mark as deprecated

app/controlplane/pkg/biz/workflowcontract.go

jiparis · 2025-10-22T09:52:46Z

app/controlplane/pkg/data/workflowcontract.go

 	} 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)


This looks awkward. Data layer shouldn't call biz layer logic.

https://github.com/chainloop-dev/chainloop/blob/main/app/controlplane/pkg/data/workflowcontract.go#L354
That is already the case currently

I see, let's address it in another PR then.

jiparis

I've been testing this locally with different server/client version combinations without any issue.

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

Piskoo marked this pull request as ready for review October 14, 2025 12:37

Piskoo requested review from javirln, jiparis and migmartri October 14, 2025 12:37

Piskoo mentioned this pull request Oct 17, 2025

feat(crafting-schema): support schema v2 during attestation process #2468

Merged

migmartri reviewed Oct 17, 2025

View reviewed changes

Piskoo marked this pull request as draft October 20, 2025 07:08

Piskoo mentioned this pull request Oct 20, 2025

feat(cli): extend workflow contract with apply #2469

Merged

Piskoo force-pushed the feat-use-contract-v2-for-contract-operations branch from 3918cc5 to 39deb09 Compare October 21, 2025 11:53

Piskoo marked this pull request as ready for review October 22, 2025 08:16

jiparis reviewed Oct 22, 2025

View reviewed changes

app/controlplane/pkg/biz/workflowcontract.go Show resolved Hide resolved

jiparis reviewed Oct 22, 2025

View reviewed changes

jiparis approved these changes Oct 28, 2025

View reviewed changes

Piskoo added 9 commits October 28, 2025 12:06

use contract v2 for contract operations

bd2990b

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

fix validation and update for v2 schema

232174b

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

lint

0a9563f

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

lint

8263dce

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

test fix

56207ec

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

fix validation and compatibility issues

408c9ca

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

lint

3976220

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

add name validation in service

5609fe3

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

update error messages

a2824ae

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

Piskoo force-pushed the feat-use-contract-v2-for-contract-operations branch from 0dcd82f to a2824ae Compare October 28, 2025 11:06

Piskoo merged commit f355374 into chainloop-dev:main Oct 28, 2025
13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(crafting-schema): add schema v2 support to cli#2467

feat(crafting-schema): add schema v2 support to cli#2467
Piskoo merged 9 commits intochainloop-dev:mainfrom
Piskoo:feat-use-contract-v2-for-contract-operations

Piskoo commented Oct 14, 2025 •

edited

Loading

Uh oh!

migmartri Oct 17, 2025

Uh oh!

migmartri Oct 17, 2025

Uh oh!

migmartri Oct 17, 2025

Uh oh!

migmartri Oct 17, 2025

Uh oh!

migmartri Oct 17, 2025

Uh oh!

migmartri Oct 17, 2025

Uh oh!

migmartri Oct 17, 2025

Uh oh!

Uh oh!

jiparis Oct 22, 2025

Uh oh!

Piskoo Oct 23, 2025

Uh oh!

jiparis Oct 28, 2025

Uh oh!

jiparis left a comment •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

Piskoo commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Changes

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jiparis left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Piskoo commented Oct 14, 2025 •

edited

Loading

jiparis left a comment •

edited

Loading