Skip to content

fix(craftingschema): move annotations to spec #2620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Piskoo merged 1 commit into from
Dec 16, 2025
Merged

fix(craftingschema): move annotations to spec #2620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/cli/pkg/action/attestation_init_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ func TestParseContractV2(t *testing.T) {
assert.Greater(t, len(spec.GetEnvAllowList()), 0, "Should have env allow list")
assert.NotNil(t, spec.GetRunner(), "Should have runner config")

// Verify annotations in metadata
annotations := result.GetMetadata().GetAnnotations()
assert.NotEmpty(t, annotations, "Should have metadata annotations")
// Verify annotations in spec
annotations := spec.GetAnnotations()
assert.NotEmpty(t, annotations, "Should have annotations")
} else {
assert.Nil(t, result, "Expected V2 schema parsing to fail")
}
Expand Down
8 changes: 5 additions & 3 deletions app/cli/pkg/action/testdata/contract_v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ kind: Contract
metadata:
name: test-contract-v2
description: Test contract in V2 format
annotations:
version: "1.0.0"
team: test-team
spec:
annotations:
- name: version
value: "1.0.0"
- name: team
Copy link
Member

@migmartri migmartri Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this work by only providing the name not the value, so the value is recovered at runtime?

Copy link
Collaborator Author

@Piskoo Piskoo Dec 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the annotation value is required if it wasn't provided in the contract

$ cl att push
WRN API contacted in insecure mode
ERR annotations ["environment"] required

value: test-team
materials:
- type: CONTAINER_IMAGE
name: skynet-control-plane
Expand Down
25 changes: 24 additions & 1 deletion app/controlplane/api/gen/frontend/workflowcontract/v1/crafting_schema.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions app/controlplane/api/gen/jsonschema/workflowcontract.v1.CraftingSchemaV2Spec.jsonschema.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions app/controlplane/api/gen/jsonschema/workflowcontract.v1.CraftingSchemaV2Spec.schema.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading