chore(attestation): Move attestation to pkg (chainloop-dev#1195)

Signed-off-by: Javier Rodriguez <javier@chainloop.dev>
aarlint · Aug 7, 2024 · 902fc7f · 902fc7f
1 parent dd42b5d
commit 902fc7f
Show file tree

Hide file tree

Showing 145 changed files with 116 additions and 117 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ API_PROTO_FILES=$(shell find api -name *.proto)
 .PHONY: api
 # generate api proto
 api:
-	cd ./internal/attestation/crafter/api && buf generate
+	cd ./pkg/attestation/crafter/api && buf generate
 	make -C ./app/controlplane api
 	make -C ./app/artifact-cas api
 

diff --git a/app/cli/cmd/workflow_workflow_run_describe.go b/app/cli/cmd/workflow_workflow_run_describe.go
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/cli/internal/action"
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/jedib0t/go-pretty/v6/text"
 	"github.com/muesli/reflow/wrap"

diff --git a/app/cli/internal/action/action.go b/app/cli/internal/action/action.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/statemanager/filesystem"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/statemanager/remote"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/statemanager/filesystem"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/statemanager/remote"
 	"github.com/rs/zerolog"
 	"google.golang.org/grpc"
 )

diff --git a/app/cli/internal/action/attestation_add.go b/app/cli/internal/action/attestation_add.go
@@ -22,9 +22,9 @@ import (
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
 	"github.com/chainloop-dev/chainloop/internal/grpcconn"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
 	"google.golang.org/grpc"
 )
 

diff --git a/app/cli/internal/action/attestation_init.go b/app/cli/internal/action/attestation_init.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
-	clientAPI "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
+	clientAPI "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 )
 
 type AttestationInitOpts struct {

diff --git a/app/cli/internal/action/attestation_push.go b/app/cli/internal/action/attestation_push.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer"
-	"github.com/chainloop-dev/chainloop/internal/attestation/signer"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/signer"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/types/known/timestamppb"

diff --git a/app/cli/internal/action/attestation_reset.go b/app/cli/internal/action/attestation_reset.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
 	"github.com/go-kratos/kratos/v2/errors"
 )
 

diff --git a/app/cli/internal/action/attestation_status.go b/app/cli/internal/action/attestation_status.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	pbc "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 )
 
 type AttestationStatusOpts struct {

diff --git a/app/cli/internal/action/attestation_status_test.go b/app/cli/internal/action/attestation_status_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	craftingpb "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/app/cli/internal/action/workflow_contract_create.go b/app/cli/internal/action/workflow_contract_create.go
@@ -19,7 +19,7 @@ import (
 	"context"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
 )
 
 type WorkflowContractCreate struct {

diff --git a/app/cli/internal/action/workflow_contract_update.go b/app/cli/internal/action/workflow_contract_update.go
@@ -19,7 +19,7 @@ import (
 	"context"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
 )
 
 type WorkflowContractUpdate struct {

diff --git a/app/cli/internal/action/workflow_run_describe.go b/app/cli/internal/action/workflow_run_describe.go
@@ -24,7 +24,7 @@ import (
 	"sort"
 
 	pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/sigstore/cosign/v2/pkg/blob"
 	"github.com/sigstore/cosign/v2/pkg/cosign"
 	sigs "github.com/sigstore/cosign/v2/pkg/signature"

diff --git a/app/cli/internal/telemetry/telemetry.go b/app/cli/internal/telemetry/telemetry.go
@@ -20,7 +20,7 @@ import (
 	"runtime"
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
 	"github.com/denisbrodbeck/machineid"
 	"github.com/rs/zerolog"
 )

diff --git a/app/controlplane/api/controlplane/v1/attestation_state.pb.go b/app/controlplane/api/controlplane/v1/attestation_state.pb.go
diff --git a/app/controlplane/api/controlplane/v1/response_messages.pb.go b/app/controlplane/api/controlplane/v1/response_messages.pb.go
diff --git a/app/controlplane/internal/dispatcher/dispatcher.go b/app/controlplane/internal/dispatcher/dispatcher.go
@@ -29,7 +29,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/pkg/credentials"
 	"github.com/chainloop-dev/chainloop/pkg/servicelogger"
 	"github.com/go-kratos/kratos/v2/log"

diff --git a/app/controlplane/internal/service/attestation.go b/app/controlplane/internal/service/attestation.go
@@ -28,9 +28,9 @@ import (
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext"
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
 	casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/pkg/credentials"
 
 	errors "github.com/go-kratos/kratos/v2/errors"

diff --git a/app/controlplane/internal/service/attestation_test.go b/app/controlplane/internal/service/attestation_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	cpAPI "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	crv1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/app/controlplane/pkg/biz/attestation.go b/app/controlplane/pkg/biz/attestation.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/chainloop-dev/chainloop/internal/attestation"
+	"github.com/chainloop-dev/chainloop/pkg/attestation"
 	"github.com/chainloop-dev/chainloop/pkg/servicelogger"
 	"github.com/go-kratos/kratos/v2/log"
 

diff --git a/app/controlplane/pkg/biz/attestationstate.go b/app/controlplane/pkg/biz/attestationstate.go
@@ -25,7 +25,7 @@ import (
 	"fmt"
 	"io"
 
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 	"github.com/google/uuid"
 	"golang.org/x/crypto/pbkdf2"
 	"google.golang.org/protobuf/proto"

diff --git a/app/controlplane/pkg/biz/attestationstate_integration_test.go b/app/controlplane/pkg/biz/attestationstate_integration_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers"
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 	"github.com/chainloop-dev/chainloop/pkg/credentials"
 	creds "github.com/chainloop-dev/chainloop/pkg/credentials/mocks"
 	"github.com/google/uuid"

diff --git a/app/controlplane/pkg/biz/casmapping.go b/app/controlplane/pkg/biz/casmapping.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/pkg/servicelogger"
 	"github.com/go-kratos/kratos/v2/log"
 	cr_v1 "github.com/google/go-containerregistry/pkg/v1"

diff --git a/app/controlplane/pkg/biz/referrer.go b/app/controlplane/pkg/biz/referrer.go
@@ -24,8 +24,8 @@ import (
 	"time"
 
 	conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/pkg/servicelogger"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/google/uuid"

diff --git a/app/controlplane/pkg/biz/workflowrun.go b/app/controlplane/pkg/biz/workflowrun.go
@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/pagination"
-	"github.com/chainloop-dev/chainloop/internal/attestation"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"

diff --git a/app/controlplane/plugins/core/dependency-track/v1/extension_test.go b/app/controlplane/plugins/core/dependency-track/v1/extension_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/app/controlplane/plugins/sdk/v1/fanout.go b/app/controlplane/plugins/sdk/v1/fanout.go
@@ -28,7 +28,7 @@ import (
 	crv1 "github.com/google/go-containerregistry/pkg/v1"
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/pkg/servicelogger"
 	"github.com/go-kratos/kratos/v2/log"
 	intoto "github.com/in-toto/attestation/go/v1"

diff --git a/app/controlplane/plugins/sdk/v1/helpers.go b/app/controlplane/plugins/sdk/v1/helpers.go
@@ -20,7 +20,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/muesli/reflow/wrap"
 )

diff --git a/app/controlplane/plugins/sdk/v1/helpers_test.go b/app/controlplane/plugins/sdk/v1/helpers_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/app/controlplane/plugins/sdk/v1/plugin/api/translation.go b/app/controlplane/plugins/sdk/v1/plugin/api/translation.go
@@ -21,7 +21,7 @@ import (
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	cr_v1 "github.com/google/go-containerregistry/pkg/v1"
 	status "google.golang.org/grpc/status"
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"

diff --git a/app/controlplane/plugins/sdk/v1/plugin/grpc_server.go b/app/controlplane/plugins/sdk/v1/plugin/grpc_server.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1/plugin/api"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
 )
 

diff --git a/buf.work.yaml b/buf.work.yaml
@@ -6,4 +6,4 @@ directories:
   - app/artifact-cas/internal/conf
   - app/artifact-cas/api
   - pkg/credentials/api
-  - internal/attestation/crafter/api
+  - pkg/attestation/crafter/api
diff --git a/internal/attestation/attestations.go → pkg/attestation/attestations.go b/internal/attestation/attestations.go → pkg/attestation/attestations.go
diff --git a/...fter/api/attestation/v1/crafting_state.go → ...fter/api/attestation/v1/crafting_state.go b/...fter/api/attestation/v1/crafting_state.go → ...fter/api/attestation/v1/crafting_state.go
diff --git a/...r/api/attestation/v1/crafting_state.pb.go → ...r/api/attestation/v1/crafting_state.pb.go b/...r/api/attestation/v1/crafting_state.pb.go → ...r/api/attestation/v1/crafting_state.pb.go
diff --git a/...r/api/attestation/v1/crafting_state.proto → ...r/api/attestation/v1/crafting_state.proto b/...r/api/attestation/v1/crafting_state.proto → ...r/api/attestation/v1/crafting_state.proto
@@ -21,7 +21,7 @@ import "buf/validate/validate.proto";
 import "google/protobuf/timestamp.proto";
 import "workflowcontract/v1/crafting_schema.proto";
 
-option go_package = "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1";
+option go_package = "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1";
 
 message Attestation {
   google.protobuf.Timestamp initialized_at = 1 [(buf.validate.field).required = true];

diff --git a/...api/attestation/v1/crafting_state_test.go → ...api/attestation/v1/crafting_state_test.go b/...api/attestation/v1/crafting_state_test.go → ...api/attestation/v1/crafting_state_test.go
diff --git a/...estation/v1/crafting_state_validations.go → ...estation/v1/crafting_state_validations.go b/...estation/v1/crafting_state_validations.go → ...estation/v1/crafting_state_validations.go
diff --git a/...rnal/attestation/crafter/api/buf.gen.yaml → pkg/attestation/crafter/api/buf.gen.yaml b/...rnal/attestation/crafter/api/buf.gen.yaml → pkg/attestation/crafter/api/buf.gen.yaml
diff --git a/internal/attestation/crafter/api/buf.lock → pkg/attestation/crafter/api/buf.lock b/internal/attestation/crafter/api/buf.lock → pkg/attestation/crafter/api/buf.lock
diff --git a/internal/attestation/crafter/api/buf.yaml → pkg/attestation/crafter/api/buf.yaml b/internal/attestation/crafter/api/buf.yaml → pkg/attestation/crafter/api/buf.yaml
diff --git a/internal/attestation/crafter/crafter.go → pkg/attestation/crafter/crafter.go b/internal/attestation/crafter/crafter.go → pkg/attestation/crafter/crafter.go
@@ -30,10 +30,10 @@ import (
 	"github.com/bufbuild/protovalidate-go"
 	v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	api "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/materials"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
 	"github.com/chainloop-dev/chainloop/internal/ociauth"
+	api "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/materials"
 	"github.com/chainloop-dev/chainloop/pkg/policies"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"

diff --git a/internal/attestation/crafter/crafter_test.go → pkg/attestation/crafter/crafter_test.go b/internal/attestation/crafter/crafter_test.go → pkg/attestation/crafter/crafter_test.go
@@ -24,13 +24,13 @@ import (
 	"time"
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter"
-	v1 "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/materials"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/runners"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/statemanager/filesystem"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
 	mUploader "github.com/chainloop-dev/chainloop/internal/casclient/mocks"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter"
+	v1 "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/materials"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/runners"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/statemanager/filesystem"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"

diff --git a/.../attestation/crafter/crafter_unit_test.go → pkg/attestation/crafter/crafter_unit_test.go b/.../attestation/crafter/crafter_unit_test.go → pkg/attestation/crafter/crafter_unit_test.go
diff --git a/...attestation/crafter/materials/artifact.go → ...attestation/crafter/materials/artifact.go b/...attestation/crafter/materials/artifact.go → ...attestation/crafter/materials/artifact.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	api "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
+	api "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 	"github.com/rs/zerolog"
 )
 

diff --git a/...tation/crafter/materials/artifact_test.go → ...tation/crafter/materials/artifact_test.go b/...tation/crafter/materials/artifact_test.go → ...tation/crafter/materials/artifact_test.go
@@ -22,10 +22,10 @@ import (
 
 	"code.cloudfoundry.org/bytefmt"
 	contractAPI "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	attestationApi "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/crafter/materials"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
 	mUploader "github.com/chainloop-dev/chainloop/internal/casclient/mocks"
+	attestationApi "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/crafter/materials"
 	"github.com/rs/zerolog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/...estation/crafter/materials/attestation.go → ...estation/crafter/materials/attestation.go b/...estation/crafter/materials/attestation.go → ...estation/crafter/materials/attestation.go
@@ -23,10 +23,10 @@ import (
 	"path"
 
 	schemaapi "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation"
-	api "github.com/chainloop-dev/chainloop/internal/attestation/crafter/api/attestation/v1"
-	"github.com/chainloop-dev/chainloop/internal/attestation/renderer/chainloop"
 	"github.com/chainloop-dev/chainloop/internal/casclient"
+	"github.com/chainloop-dev/chainloop/pkg/attestation"
+	api "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
+	"github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop"
 	"github.com/rs/zerolog"
 	"github.com/secure-systems-lab/go-securesystemslib/dsse"
 )