Skip to content

feat(cp): expose CAS upload/inline status in API #342

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
Sep 14, 2023
Merged

feat(cp): expose CAS upload/inline status in API #342

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
20 changes: 12 additions & 8 deletions app/cli/internal/action/workflow_run_describe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@ type WorkflowRunAttestationItem struct {
type Material struct {
Name string `json:"name"`
// filename, container image name, string value, ...
Value string `json:"value"`
Hash string `json:"hash"`
Type string `json:"type"`
Annotations []*Annotation `json:"annotations,omitempty"`
Value string `json:"value"`
Hash string `json:"hash"`
Type string `json:"type"`
Annotations []*Annotation `json:"annotations,omitempty"`
UploadedToCAS bool `json:"uploadedToCAS,omitempty"`
EmbeddedInline bool `json:"embeddedInline,omitempty"`
}

type EnvVar struct {
Expand Down Expand Up @@ -163,10 +165,12 @@ func (action *WorkflowRunDescribe) Run(runID string, verify bool, publicKey stri

func materialPBToAction(in *pb.AttestationItem_Material) *Material {
m := &Material{
Name: in.Name,
Value: in.Value,
Type: in.Type,
Hash: in.Hash,
Name: in.Name,
Value: in.Value,
Type: in.Type,
Hash: in.Hash,
UploadedToCAS: in.UploadedToCas,
EmbeddedInline: in.EmbeddedInline,
}

// append annotations sorted
Expand Down
225 changes: 124 additions & 101 deletions app/controlplane/api/controlplane/v1/response_messages.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions app/controlplane/api/controlplane/v1/response_messages.pb.validate.go
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions app/controlplane/api/controlplane/v1/response_messages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ message AttestationItem {
string type = 3;
map<string, string> annotations = 4;
string hash = 5;
// it's been uploaded to an actual CAS backend
bool uploaded_to_cas = 6;
// the content instead if inline
bool embedded_inline = 7;
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/controlplane/api/controlplane/v1/status_http.pb.go
View file
Open in desktop

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

32 changes: 31 additions & 1 deletion app/controlplane/api/gen/frontend/controlplane/v1/response_messages.ts
View file
Open in desktop

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

10 changes: 6 additions & 4 deletions app/controlplane/internal/service/attestation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,12 @@ func extractMaterials(in []*chainloop.NormalizedMaterial) ([]*cpAPI.AttestationI
res := make([]*cpAPI.AttestationItem_Material, 0, len(in))
for _, m := range in {
materialItem := &cpAPI.AttestationItem_Material{
Name: m.Name,
Type: m.Type,
Annotations: m.Annotations,
Value: m.Value,
Name: m.Name,
Type: m.Type,
Annotations: m.Annotations,
Value: m.Value,
UploadedToCas: m.UploadedToCAS,
EmbeddedInline: m.EmbeddedInline,
}

if m.Hash != nil {
Expand Down