Move ruletypes from internal to pkg

Signed-off-by: Radoslav Dimitrov <[email protected]>

internal/controlplane/handlers_evalstatus.go

@@ -24,9 +24,9 @@ import (
 	propSvc "github.com/mindersec/minder/internal/entities/properties/service"
 	"github.com/mindersec/minder/internal/history"
 	ghprop "github.com/mindersec/minder/internal/providers/github/properties"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/internal/util"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 const (

internal/controlplane/handlers_profile.go

@@ -26,9 +26,9 @@ import (
 	"github.com/mindersec/minder/internal/logger"
 	prof "github.com/mindersec/minder/internal/profiles"
 	ghprop "github.com/mindersec/minder/internal/providers/github/properties"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/internal/util"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 // CreateProfile creates a profile for a project

internal/controlplane/handlers_ruletype.go

@@ -24,9 +24,9 @@ import (
 	"github.com/mindersec/minder/internal/db"
 	"github.com/mindersec/minder/internal/engine/engcontext"
 	"github.com/mindersec/minder/internal/logger"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/internal/util"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 var (

internal/controlplane/handlers_ruletype_test.go

@@ -15,8 +15,8 @@ import (
 	mockdb "github.com/mindersec/minder/database/mock"
 	df "github.com/mindersec/minder/database/mock/fixtures"
 	db "github.com/mindersec/minder/internal/db"
-	sf "github.com/mindersec/minder/internal/ruletypes/mock/fixtures"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	sf "github.com/mindersec/minder/pkg/ruletypes/mock/fixtures"
 )
 
 func TestCreateRuleType(t *testing.T) {

internal/controlplane/server.go

@@ -62,9 +62,9 @@ import (
 	"github.com/mindersec/minder/internal/providers/session"
 	reposvc "github.com/mindersec/minder/internal/repositories"
 	"github.com/mindersec/minder/internal/roles"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/internal/util"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 const metricsPath = "/metrics"

internal/engine/rtengine/cache.go

@@ -14,9 +14,9 @@ import (
 	"github.com/mindersec/minder/internal/db"
 	"github.com/mindersec/minder/internal/engine/ingestcache"
 	eoptions "github.com/mindersec/minder/internal/engine/options"
-	"github.com/mindersec/minder/internal/ruletypes"
 	rtengine2 "github.com/mindersec/minder/pkg/engine/v1/rtengine"
 	provinfv1 "github.com/mindersec/minder/pkg/providers/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 // Cache contains a set of RuleTypeEngine instances

internal/marketplaces/factory.go

@@ -11,9 +11,9 @@ import (
 	"github.com/mindersec/minder/internal/config/server"
 	sub "github.com/mindersec/minder/internal/marketplaces/subscriptions"
 	"github.com/mindersec/minder/internal/profiles"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/pkg/mindpak"
 	src "github.com/mindersec/minder/pkg/mindpak/sources"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 // NewMarketplaceFromServiceConfig takes the Minder service config and

internal/marketplaces/subscriptions/service.go

@@ -16,10 +16,10 @@ import (
 
 	"github.com/mindersec/minder/internal/db"
 	profsvc "github.com/mindersec/minder/internal/profiles"
-	"github.com/mindersec/minder/internal/ruletypes"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
 	"github.com/mindersec/minder/pkg/mindpak"
 	"github.com/mindersec/minder/pkg/mindpak/reader"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 //go:generate go run go.uber.org/mock/mockgen -package mock_$GOPACKAGE -destination=./mock/$GOFILE -source=./$GOFILE

internal/marketplaces/subscriptions/service_test.go

@@ -19,9 +19,9 @@ import (
 	"github.com/mindersec/minder/internal/marketplaces/subscriptions"
 	"github.com/mindersec/minder/internal/profiles"
 	psf "github.com/mindersec/minder/internal/profiles/mock/fixtures"
-	"github.com/mindersec/minder/internal/ruletypes"
-	rsf "github.com/mindersec/minder/internal/ruletypes/mock/fixtures"
 	"github.com/mindersec/minder/pkg/mindpak/reader"
+	"github.com/mindersec/minder/pkg/ruletypes"
+	rsf "github.com/mindersec/minder/pkg/ruletypes/mock/fixtures"
 )
 
 func TestSubscriptionService_Subscribe(t *testing.T) {

internal/profiles/validator.go

@@ -18,9 +18,9 @@ import (
 
 	"github.com/mindersec/minder/internal/db"
 	"github.com/mindersec/minder/internal/engine/selectors"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/internal/util"
 	minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 // Validator encapsulates the logic for validating profiles

internal/service/service.go

@@ -51,7 +51,7 @@ import (
 	"github.com/mindersec/minder/internal/reminderprocessor"
 	"github.com/mindersec/minder/internal/repositories"
 	"github.com/mindersec/minder/internal/roles"
-	"github.com/mindersec/minder/internal/ruletypes"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 // AllInOneServerService is a helper function that starts the gRPC and HTTP servers,

internal/ruletypes/mock/fixtures/service.go → pkg/ruletypes/mock/fixtures/service.go

@@ -10,7 +10,7 @@ package fixtures
 import (
 	"errors"
 
-	mockrulesvc "github.com/mindersec/minder/internal/ruletypes/mock"
+	mockrulesvc "github.com/mindersec/minder/pkg/ruletypes/mock"
 	"go.uber.org/mock/gomock"
 )
 

internal/ruletypes/service_test.go → pkg/ruletypes/service_test.go

@@ -17,9 +17,9 @@ import (
 
 	"github.com/mindersec/minder/internal/db"
 	dbf "github.com/mindersec/minder/internal/db/fixtures"
-	"github.com/mindersec/minder/internal/ruletypes"
 	"github.com/mindersec/minder/internal/util/ptr"
 	pb "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
+	"github.com/mindersec/minder/pkg/ruletypes"
 )
 
 // both create and update are bundled together since the testing harness is