chore(policies): Refactor policy Registry to pkg (#1247)

Signed-off-by: Javier Rodriguez <[email protected]>

Author: javirln

app/controlplane/cmd/wire.go

@@ -23,13 +23,13 @@ package main
 import (
 	conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/dispatcher"
-	"github.com/chainloop-dev/chainloop/app/controlplane/internal/policies"
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/server"
 	"github.com/chainloop-dev/chainloop/app/controlplane/internal/service"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/ca"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data"
+	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
 	"github.com/chainloop-dev/chainloop/pkg/blobmanager/loader"
 	"github.com/chainloop-dev/chainloop/pkg/credentials"
@@ -57,6 +57,7 @@ func wireApp(*conf.Bootstrap, credentials.ReaderWriter, log.Logger, sdk.Availabl
 			newApp,
 			newProtoValidator,
 			newDataConf,
+			newPolicyProviderConfig,
 		),
 	)
 }
@@ -65,6 +66,14 @@ func newDataConf(in *conf.Data_Database) *data.NewConfig {
 	return &data.NewConfig{Driver: in.Driver, Source: in.Source}
 }
 
+func newPolicyProviderConfig(in []*conf.PolicyProvider) []*policies.NewRegistryConfig {
+	out := make([]*policies.NewRegistryConfig, 0, len(in))
+	for _, p := range in {
+		out = append(out, &policies.NewRegistryConfig{Name: p.Name, Host: p.Host, Default: p.Default})
+	}
+	return out
+}
+
 func serviceOpts(l log.Logger) []service.NewOpt {
 	return []service.NewOpt{
 		service.WithLogger(l),

app/controlplane/cmd/wire_gen.go

@@ -31,6 +31,7 @@ import (
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data"
+	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
 	robotaccount "github.com/chainloop-dev/chainloop/internal/robotaccount/cas"
 	backends "github.com/chainloop-dev/chainloop/pkg/blobmanager"
@@ -208,8 +209,12 @@ func NewDataConfig(in *conf.Data) *data.NewConfig {
 	}
 }
 
-func NewPolicyProviders(in *conf.Bootstrap) []*conf.PolicyProvider {
-	return in.PolicyProviders
+func NewPolicyProviderConfig(in *conf.Bootstrap) []*policies.NewRegistryConfig {
+	out := make([]*policies.NewRegistryConfig, 0, len(in.PolicyProviders))
+	for _, p := range in.PolicyProviders {
+		out = append(out, &policies.NewRegistryConfig{Name: p.Name, Host: p.Host, Default: p.Default})
+	}
+	return out
 }
 
 func (db *TestDatabase) Close(t *testing.T) {

app/controlplane/pkg/biz/testhelpers/database.go

@@ -24,11 +24,11 @@ import (
 	"testing"
 
 	conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
-	"github.com/chainloop-dev/chainloop/app/controlplane/internal/policies"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz"
 	config "github.com/chainloop-dev/chainloop/app/controlplane/pkg/conf/controlplane/config/v1"
 	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/data"
+	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies"
 	"github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1"
 	robotaccount "github.com/chainloop-dev/chainloop/internal/robotaccount/cas"
 	backends "github.com/chainloop-dev/chainloop/pkg/blobmanager"
@@ -49,7 +49,7 @@ func WireTestData(*TestDatabase, *testing.T, log.Logger, credentials.ReaderWrite
 			NewConfData,
 			NewDataConfig,
 			NewPromSpec,
-			NewPolicyProviders,
+			NewPolicyProviderConfig,
 			policies.NewRegistry,
 			authz.NewDatabaseEnforcer,
 			wire.FieldsOf(new(*conf.Data), "Database"),

app/controlplane/pkg/biz/testhelpers/wire.go

@@ -26,7 +26,7 @@ import (
 	"github.com/bufbuild/protovalidate-go"
 	"github.com/bufbuild/protoyaml-go"
 	schemav1 "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1"
-	"github.com/chainloop-dev/chainloop/app/controlplane/internal/policies"
+	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies"
 	loader "github.com/chainloop-dev/chainloop/pkg/policies"
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/google/uuid"

app/controlplane/pkg/biz/testhelpers/wire_gen.go

@@ -17,16 +17,20 @@ package policies
 
 import (
 	"fmt"
-
-	conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
 )
 
+type NewRegistryConfig struct {
+	Name    string
+	Host    string
+	Default bool
+}
+
 // Registry manages policy providers
 type Registry struct {
 	providers map[string]*PolicyProvider
 }
 
-func NewRegistry(conf ...*conf.PolicyProvider) (*Registry, error) {
+func NewRegistry(conf ...*NewRegistryConfig) (*Registry, error) {
 	r := &Registry{providers: make(map[string]*PolicyProvider)}
 	var hasDefault bool
 

app/controlplane/pkg/biz/workflowcontract.go

@@ -18,7 +18,6 @@ package policies
 import (
 	"testing"
 
-	conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -34,7 +33,7 @@ func TestProviderSuite(t *testing.T) {
 
 func (s *providerTestSuite) SetupTest() {
 	var err error
-	s.registry, err = NewRegistry([]*conf.PolicyProvider{
+	s.registry, err = NewRegistry([]*NewRegistryConfig{
 		{Name: "p1", Host: "https://p1host"},
 		{Name: "p2", Host: "https://p2host"},
 		{Name: "p3", Host: "https://p3host", Default: true},
@@ -43,7 +42,7 @@ func (s *providerTestSuite) SetupTest() {
 }
 
 func (s *providerTestSuite) TestDuplicateDefault() {
-	_, err := NewRegistry([]*conf.PolicyProvider{
+	_, err := NewRegistry([]*NewRegistryConfig{
 		{Name: "p1", Host: "https://p1host"},
 		{Name: "p2", Host: "https://p2host", Default: true},
 		{Name: "p3", Host: "https://p3host", Default: true},