Skip to content

feat(attestation): add annotations to subject materials #398

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
merged 1 commit into from
Oct 29, 2023
Merged

feat(attestation): add annotations to subject materials #398

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
4 changes: 4 additions & 0 deletions internal/attestation/renderer/chainloop/testdata/attestation.output-2.v0.2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"name": "index.docker.io/bitnami/nginx",
"digest": {
"sha256": "fbd9335f55d83d8aaf9ab1a539b0f2a87b444e8c54f34c9a1ca9d7df15605db4"
},
"annotations": {
"chainloop.material.name": "image",
"chainloop.material.type": "CONTAINER_IMAGE"
}
}
],
Expand Down
12 changes: 8 additions & 4 deletions internal/attestation/renderer/chainloop/testdata/attestation.output.v0.2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
"sha256": "b403d1bb2b7739495df20f6d3838956333b04a66bc81d43bc7c64cee1433b604"
}
},
{
"name": "index.docker.io/bitnami/nginx",
"digest": {
{
"name": "index.docker.io/bitnami/nginx",
"digest": {
"sha256": "580ac09da7771920dfd0c214964e7bfe4c27903bcbe075769a4044a67c9a390a"
}
},
"annotations": {
Copy link
Contributor

Choose a reason for hiding this comment

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

[not blocking / just a consideration]
Is it expected to have a JSON key in plural which value is not an array? In this case, it's annotations, meaning that 1 annotation is <key, value> in that hash.

Copy link
Member Author

@migmartri migmartri Oct 24, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, it's part of the in-toto spec upstream.

In fact, it seems that a key-value pair is what makes indeed one annotation.

"chainloop.material.name": "skynet-control-plane",
"chainloop.material.type": "CONTAINER_IMAGE"
}
}
],
"predicate_type": "chainloop.dev/attestation/v0.2",
Expand Down
5 changes: 3 additions & 2 deletions internal/attestation/renderer/chainloop/v02.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,9 @@ func (r *RendererV02) subject() ([]*intoto.ResourceDescriptor, error) {
for _, m := range normalizedMaterials {
if m.Digest != nil {
subject = append(subject, &intoto.ResourceDescriptor{
Name: m.Name,
Digest: m.Digest,
Name: m.Name,
Digest: m.Digest,
Annotations: m.Annotations,
})
}
}
Expand Down