Split ProfileService proto to ProfileService and RuleTypeService

The `ProfileService` has methods for both profile and rule types, we want to split them so we can keep relevant methods together Signed-off-by: ChrisJBurns <[email protected]>
mindersec · Aug 21, 2024 · 9e03046 · 9e03046
1 parent 7551cec
commit 9e03046
Show file tree

Hide file tree

Showing 12 changed files with 733 additions and 596 deletions.
diff --git a/cmd/cli/app/quickstart/quickstart.go b/cmd/cli/app/quickstart/quickstart.go
@@ -157,6 +157,7 @@ func quickstartCommand(_ context.Context, cmd *cobra.Command, _ []string, conn *
 	var err error
 	repoClient := minderv1.NewRepositoryServiceClient(conn)
 	profileClient := minderv1.NewProfileServiceClient(conn)
+	ruleClient := minderv1.NewRuleTypeServiceClient(conn)
 
 	project := viper.GetString("project")
 	provider := viper.GetString("provider")
@@ -195,6 +196,7 @@ func quickstartCommand(_ context.Context, cmd *cobra.Command, _ []string, conn *
 		conn = newConn
 		repoClient = minderv1.NewRepositoryServiceClient(conn)
 		profileClient = minderv1.NewProfileServiceClient(conn)
+		ruleClient = minderv1.NewRuleTypeServiceClient(conn)
 	}
 
 	// Step 1 - Confirm enrolling
@@ -293,7 +295,7 @@ func quickstartCommand(_ context.Context, cmd *cobra.Command, _ []string, conn *
 	defer cancel()
 
 	// Create the rule type in minder
-	_, err = profileClient.CreateRuleType(ctx, &minderv1.CreateRuleTypeRequest{
+	_, err = ruleClient.CreateRuleType(ctx, &minderv1.CreateRuleTypeRequest{
 		RuleType: rt,
 	})
 	if err != nil {

diff --git a/cmd/cli/app/ruletype/ruletype_apply.go b/cmd/cli/app/ruletype/ruletype_apply.go
@@ -40,7 +40,7 @@ var applyCmd = &cobra.Command{
 
 // applyCommand is the "rule type" apply subcommand
 func applyCommand(_ context.Context, cmd *cobra.Command, _ []string, conn *grpc.ClientConn) error {
-	client := minderv1.NewProfileServiceClient(conn)
+	client := minderv1.NewRuleTypeServiceClient(conn)
 
 	project := viper.GetString("project")
 

diff --git a/cmd/cli/app/ruletype/ruletype_create.go b/cmd/cli/app/ruletype/ruletype_create.go
@@ -39,7 +39,7 @@ var createCmd = &cobra.Command{
 
 // createCommand is the profile create subcommand
 func createCommand(_ context.Context, cmd *cobra.Command, _ []string, conn *grpc.ClientConn) error {
-	client := minderv1.NewProfileServiceClient(conn)
+	client := minderv1.NewRuleTypeServiceClient(conn)
 
 	project := viper.GetString("project")
 

diff --git a/cmd/cli/app/ruletype/ruletype_delete.go b/cmd/cli/app/ruletype/ruletype_delete.go
@@ -35,7 +35,7 @@ var deleteCmd = &cobra.Command{
 
 // deleteCommand is the rule type delete subcommand
 func deleteCommand(ctx context.Context, cmd *cobra.Command, _ []string, conn *grpc.ClientConn) error {
-	client := minderv1.NewProfileServiceClient(conn)
+	client := minderv1.NewRuleTypeServiceClient(conn)
 
 	project := viper.GetString("project")
 	id := viper.GetString("id")
@@ -108,7 +108,7 @@ func deleteCommand(ctx context.Context, cmd *cobra.Command, _ []string, conn *gr
 
 func deleteRuleTypes(
 	ctx context.Context,
-	client minderv1.ProfileServiceClient,
+	client minderv1.RuleTypeServiceClient,
 	rulesToDelete []*minderv1.RuleType,
 	project string,
 ) ([]string, []string) {

diff --git a/cmd/cli/app/ruletype/ruletype_get.go b/cmd/cli/app/ruletype/ruletype_get.go
@@ -45,7 +45,7 @@ type ruleTypeGetter interface {
 
 // getCommand is the ruletype get subcommand
 func getCommand(ctx context.Context, cmd *cobra.Command, _ []string, conn *grpc.ClientConn) error {
-	client := minderv1.NewProfileServiceClient(conn)
+	client := minderv1.NewRuleTypeServiceClient(conn)
 
 	project := viper.GetString("project")
 	format := viper.GetString("output")

diff --git a/cmd/cli/app/ruletype/ruletype_list.go b/cmd/cli/app/ruletype/ruletype_list.go
@@ -39,7 +39,7 @@ var listCmd = &cobra.Command{
 
 // listCommand is the ruletype list subcommand
 func listCommand(ctx context.Context, cmd *cobra.Command, _ []string, conn *grpc.ClientConn) error {
-	client := minderv1.NewProfileServiceClient(conn)
+	client := minderv1.NewRuleTypeServiceClient(conn)
 
 	project := viper.GetString("project")
 	format := viper.GetString("output")

diff --git a/docs/docs/ref/proto.md b/docs/docs/ref/proto.md
diff --git a/pkg/api/openapi/minder/v1/minder.swagger.json b/pkg/api/openapi/minder/v1/minder.swagger.json