feat(controlplane): add extra info to discovery endpoint

app/cli/internal/action/attestation_init.go

@@ -127,6 +127,7 @@ func (action *AttestationInit) Run(ctx context.Context, contractRevision int) (s
 
 		workflowRun := runResp.GetResult().GetWorkflowRun()
 		workflowMeta.WorkflowRunId = workflowRun.GetId()
+		workflowMeta.Organization = runResp.GetResult().GetOrganization()
 		action.Logger.Debug().Str("workflow-run-id", workflowRun.GetId()).Msg("attestation initialized in the control plane")
 		attestationID = workflowRun.GetId()
 	}

app/controlplane/api/controlplane/v1/workflow_run.proto

@@ -65,6 +65,8 @@ message AttestationServiceInitResponse {
 
   message Result {
     WorkflowRunItem workflow_run = 2;
+    // organization name
+    string organization = 3;
   }
 }
 

app/controlplane/internal/biz/referrer.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 package biz
 
 import (
-	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -29,7 +27,6 @@ import (
 	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/internal/servicelogger"
 	"github.com/go-kratos/kratos/v2/log"
-	cr_v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/uuid"
 	v1 "github.com/in-toto/attestation/go/v1"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
@@ -250,18 +247,11 @@ func (r *Referrer) MapID() string {
 // 4 - creating link between the attestation and the materials/subjects as needed
 // see tests for examples
 func extractReferrers(att *dsse.Envelope) ([]*Referrer, error) {
-	// Calculate the attestation hash
-	jsonAtt, err := json.Marshal(att)
+	_, h, err := jsonEnvelopeWithDigest(att)
 	if err != nil {
 		return nil, fmt.Errorf("marshaling attestation: %w", err)
 	}
 
-	// Calculate the attestation hash
-	h, _, err := cr_v1.SHA256(bytes.NewBuffer(jsonAtt))
-	if err != nil {
-		return nil, fmt.Errorf("calculating attestation hash: %w", err)
-	}
-
 	referrersMap := make(map[string]*Referrer)
 	// 1 - Attestation referrer
 	// Add the attestation itself as a referrer to the map without references yet
@@ -284,8 +274,11 @@ func extractReferrers(att *dsse.Envelope) ([]*Referrer, error) {
 	// We add both annotations and workflow metadata
 	attestationReferrer.Annotations = predicate.GetAnnotations()
 	attestationReferrer.Metadata = map[string]string{
-		// workflow name
-		"name": predicate.GetMetadata().Name,
+		// workflow name, team and project
+		"name":         predicate.GetMetadata().Name,
+		"team":         predicate.GetMetadata().Team,
+		"project":      predicate.GetMetadata().Project,
+		"organization": predicate.GetMetadata().Organization,
 	}
 
 	// Create new referrers for each material

app/controlplane/internal/biz/referrer_integration_test.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ func (s *referrerIntegrationTestSuite) TestGetFromRootInPublicSharedIndex() {
 	require.NoError(s.T(), json.Unmarshal(attJSON, &envelope))
 
 	wantReferrerAtt := &biz.Referrer{
-		Digest:       "sha256:ad704d286bcad6e155e71c33d48247931231338396acbcd9769087530085b2a2",
+		Digest:       "sha256:de36d470d792499b1489fc0e6623300fc8822b8f0d2981bb5ec563f8dde723c7",
 		Kind:         "ATTESTATION",
 		Downloadable: true,
 	}
@@ -116,7 +116,7 @@ func (s *referrerIntegrationTestSuite) TestExtractAndPersists() {
 	require.NoError(s.T(), json.Unmarshal(attJSON, &envelope))
 
 	wantReferrerAtt := &biz.Referrer{
-		Digest:       "sha256:ad704d286bcad6e155e71c33d48247931231338396acbcd9769087530085b2a2",
+		Digest:       "sha256:de36d470d792499b1489fc0e6623300fc8822b8f0d2981bb5ec563f8dde723c7",
 		Kind:         "ATTESTATION",
 		Downloadable: true,
 	}
@@ -186,7 +186,12 @@ func (s *referrerIntegrationTestSuite) TestExtractAndPersists() {
 		s.Equal(wantReferrerAtt.Downloadable, got.Downloadable)
 		s.Equal(wantReferrerAtt.Kind, got.Kind)
 		// It has metadata
-		s.Equal(map[string]string{"name": "test-new-types"}, got.Metadata)
+		s.Equal(map[string]string{
+			"name":         "test-new-types",
+			"project":      "test",
+			"team":         "my-team",
+			"organization": "my-org",
+		}, got.Metadata)
 		// it has all the references
 		require.Len(t, got.References, 6)
 
@@ -316,9 +321,9 @@ func (s *referrerIntegrationTestSuite) TestExtractAndPersists() {
 		// it should be referenced by two attestations since it's subject of both
 		require.Len(t, got.References, 2)
 		s.Equal("ATTESTATION", got.References[0].Kind)
-		s.Equal(wantReferrerAtt.Digest, got.References[0].Digest)
+		s.Equal("sha256:c90ccaab0b2cfda9980836aef407f62d747680ea9793ddc6ad2e2d7ab615933d", got.References[0].Digest)
 		s.Equal("ATTESTATION", got.References[1].Kind)
-		s.Equal("sha256:c90ccaab0b2cfda9980836aef407f62d747680ea9793ddc6ad2e2d7ab615933d", got.References[1].Digest)
+		s.Equal("sha256:de36d470d792499b1489fc0e6623300fc8822b8f0d2981bb5ec563f8dde723c7", got.References[1].Digest)
 	})
 
 	s.T().Run("if all associated workflows are private, the referrer is private", func(t *testing.T) {

app/controlplane/internal/biz/referrer_test.go

@@ -1,5 +1,5 @@
 //
-// Copyright 2023 The Chainloop Authors.
+// Copyright 2024 The Chainloop Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -94,7 +94,10 @@ func (s *referrerTestSuite) TestExtractReferrers() {
 					Kind:         "ATTESTATION",
 					Downloadable: true,
 					Metadata: map[string]string{
-						"name": "only-sbom",
+						"name":         "only-sbom",
+						"organization": "",
+						"team":         "",
+						"project":      "foo",
 					},
 					Annotations: map[string]string{
 						"branch":   "stable",
@@ -137,7 +140,10 @@ func (s *referrerTestSuite) TestExtractReferrers() {
 						},
 					},
 					Metadata: map[string]string{
-						"name": "test",
+						"name":         "test",
+						"organization": "",
+						"team":         "",
+						"project":      "bar",
 					},
 					Annotations: map[string]string{
 						"version": "oss",
@@ -165,7 +171,10 @@ func (s *referrerTestSuite) TestExtractReferrers() {
 					Kind:         "ATTESTATION",
 					Downloadable: true,
 					Metadata: map[string]string{
-						"name": "only-sbom",
+						"name":         "only-sbom",
+						"organization": "",
+						"team":         "",
+						"project":      "foo",
 					},
 					Annotations: map[string]string{
 						"branch":   "stable",
@@ -212,11 +221,14 @@ func (s *referrerTestSuite) TestExtractReferrers() {
 					Downloadable: true,
 				},
 				{
-					Digest:       "sha256:ad704d286bcad6e155e71c33d48247931231338396acbcd9769087530085b2a2",
+					Digest:       "sha256:de36d470d792499b1489fc0e6623300fc8822b8f0d2981bb5ec563f8dde723c7",
 					Kind:         "ATTESTATION",
 					Downloadable: true,
 					Metadata: map[string]string{
-						"name": "test-new-types",
+						"name":         "test-new-types",
+						"organization": "my-org",
+						"team":         "my-team",
+						"project":      "test",
 					},
 					References: []*Referrer{
 						{
@@ -251,7 +263,7 @@ func (s *referrerTestSuite) TestExtractReferrers() {
 					// the container image is a subject in the attestation
 					References: []*Referrer{
 						{
-							Digest: "sha256:ad704d286bcad6e155e71c33d48247931231338396acbcd9769087530085b2a2",
+							Digest: "sha256:de36d470d792499b1489fc0e6623300fc8822b8f0d2981bb5ec563f8dde723c7",
 							Kind:   "ATTESTATION",
 						},
 					},
@@ -262,7 +274,7 @@ func (s *referrerTestSuite) TestExtractReferrers() {
 					// the git commit a subject in the attestation
 					References: []*Referrer{
 						{
-							Digest: "sha256:ad704d286bcad6e155e71c33d48247931231338396acbcd9769087530085b2a2",
+							Digest: "sha256:de36d470d792499b1489fc0e6623300fc8822b8f0d2981bb5ec563f8dde723c7",
 							Kind:   "ATTESTATION",
 						},
 					},