Add delete provider command

Fix #2897

cmd/cli/app/provider/provider.go

@@ -37,6 +37,7 @@ var ProviderCmd = &cobra.Command{
 func init() {
 	app.RootCmd.AddCommand(ProviderCmd)
 	// Flags for all subcommands
+	// TODO: remove the provider flag from here and add it only to the subcommands that need it
 	ProviderCmd.PersistentFlags().StringP("provider", "p", ghclient.Github, "Name of the provider, i.e. github")
 	ProviderCmd.PersistentFlags().StringP("project", "j", "", "ID of the project")
 }

cmd/cli/app/provider/provider_delete.go

@@ -0,0 +1,77 @@
+//
+// Copyright 2024 Stacklok, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package provider
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"google.golang.org/grpc"
+
+	"github.com/stacklok/minder/internal/util/cli"
+	minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
+)
+
+var deleteCmd = &cobra.Command{
+	Use:   "delete",
+	Short: "Delete a given provider available in a specific project",
+	Long:  `The minder provider delete command deletes a given provider available in a specific project.`,
+	RunE:  cli.GRPCClientWrapRunE(DeleteProviderCommand),
+}
+
+func init() {
+	ProviderCmd.AddCommand(deleteCmd)
+
+	deleteCmd.Flags().StringP("name", "n", "", "Name of the provider to delete")
+	deleteCmd.Flags().StringP("id", "i", "", "ID of the provider to delete")
+	// We allow deleting by name or ID but not both. One of them must be specified.
+	deleteCmd.MarkFlagsMutuallyExclusive("name", "id")
+	deleteCmd.MarkFlagsOneRequired("name", "id")
+}
+
+// DeleteProviderCommand deletes the provider in a specific project
+func DeleteProviderCommand(ctx context.Context, cmd *cobra.Command, conn *grpc.ClientConn) error {
+	client := minderv1.NewProvidersServiceClient(conn)
+
+	project := viper.GetString("project")
+	name := viper.GetString("name")
+	id := viper.GetString("id")
+
+	if id != "" {
+		resp, err := client.DeleteProviderByID(ctx, &minderv1.DeleteProviderByIDRequest{
+			Context: &minderv1.Context{
+				Project: &project,
+			},
+			Id: id,
+		})
+		if err != nil {
+			return cli.MessageAndError("Error deleting provider by id", err)
+		}
+		cmd.Println("Successfully deleted provider with id:", resp.Id)
+	} else {
+		// delete provider by name
+		resp, err := client.DeleteProvider(ctx, &minderv1.DeleteProviderRequest{
+			Context: &minderv1.Context{Provider: &name, Project: &project},
+		})
+		if err != nil {
+			return cli.MessageAndError("Error deleting provider by name", err)
+		}
+		cmd.Println("Successfully deleted provider with name:", resp.Name)
+	}
+
+	return nil
+}

database/query/providers.sql

@@ -58,4 +58,5 @@ UPDATE providers
     WHERE id = sqlc.arg('id') AND project_id = sqlc.arg('project_id');
 
 -- name: DeleteProvider :exec
-DELETE FROM providers WHERE id = $1;
+DELETE FROM providers
+   WHERE id = $1 AND project_id = sqlc.arg('project_id');

docs/docs/ref/cli/minder_provider.md

@@ -35,6 +35,7 @@ minder provider [flags]
 ### SEE ALSO
 
 * [minder](minder.md)	 - Minder controls the hosted minder service
+* [minder provider delete](minder_provider_delete.md)	 - Delete a given provider available in a specific project
 * [minder provider enroll](minder_provider_enroll.md)	 - Enroll a provider within the minder control plane
 * [minder provider get](minder_provider_get.md)	 - Get a given provider available in a specific project
 * [minder provider list](minder_provider_list.md)	 - List the providers available in a specific project

docs/docs/ref/cli/minder_provider_delete.md

@@ -0,0 +1,40 @@
+---
+title: minder provider delete
+---
+## minder provider delete
+
+Delete a given provider available in a specific project
+
+### Synopsis
+
+The minder provider delete command deletes a given provider available in a specific project.
+
+```
+minder provider delete [flags]
+```
+
+### Options
+
+```
+  -h, --help          help for delete
+  -i, --id string     ID of the provider to delete
+  -n, --name string   Name of the provider to delete
+```
+
+### Options inherited from parent commands
+
+```
+      --config string            Config file (default is $PWD/config.yaml)
+      --grpc-host string         Server host (default "api.stacklok.com")
+      --grpc-insecure            Allow establishing insecure connections
+      --grpc-port int            Server port (default 443)
+      --identity-client string   Identity server client ID (default "minder-cli")
+      --identity-url string      Identity server issuer URL (default "https://auth.stacklok.com")
+  -j, --project string           ID of the project
+  -p, --provider string          Name of the provider, i.e. github (default "github")
+```
+
+### SEE ALSO
+
+* [minder provider](minder_provider.md)	 - Manage providers within a minder control plane
+

internal/controlplane/handlers_providers.go

@@ -19,6 +19,7 @@ import (
 	"database/sql"
 	"errors"
 
+	"github.com/google/uuid"
 	"github.com/rs/zerolog"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -31,6 +32,7 @@ import (
 	"github.com/stacklok/minder/internal/util"
 	cursorutil "github.com/stacklok/minder/internal/util/cursor"
 	minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
+	provinfv1 "github.com/stacklok/minder/pkg/providers/v1"
 )
 
 // GetProvider gets a given provider available in a specific project.
@@ -156,6 +158,103 @@ func (_ *Server) ListProviderClasses(
 	}, nil
 }
 
+// DeleteProvider deletes a provider by name from a specific project.
+func (s *Server) DeleteProvider(
+	ctx context.Context,
+	_ *minderv1.DeleteProviderRequest,
+) (*minderv1.DeleteProviderResponse, error) {
+	entityCtx := engine.EntityFromContext(ctx)
+	projectID := entityCtx.Project.ID
+	providerName := entityCtx.Provider.Name
+
+	if providerName == "" {
+		return nil, status.Errorf(codes.InvalidArgument, "provider name is required")
+	}
+
+	provider, err := s.providerStore.GetByNameInSpecificProject(ctx, projectID, providerName)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, util.UserVisibleError(codes.NotFound, "provider not found")
+		}
+		return nil, status.Errorf(codes.Internal, "error getting provider: %v", err)
+	}
+
+	err = s.deleteProvider(ctx, provider, projectID)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "error deleting provider: %v", err)
+	}
+
+	return &minderv1.DeleteProviderResponse{
+		Name: providerName,
+	}, nil
+}
+
+// DeleteProviderByID deletes a provider by ID from a specific project.
+func (s *Server) DeleteProviderByID(
+	ctx context.Context,
+	in *minderv1.DeleteProviderByIDRequest,
+) (*minderv1.DeleteProviderByIDResponse, error) {
+	entityCtx := engine.EntityFromContext(ctx)
+	projectID := entityCtx.Project.ID
+
+	parsedProviderID, err := uuid.Parse(in.Id)
+	if err != nil {
+		return nil, util.UserVisibleError(codes.InvalidArgument, "invalid provider ID")
+	}
+
+	provider, err := s.providerStore.GetByID(ctx, parsedProviderID)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, util.UserVisibleError(codes.NotFound, "provider not found")
+		}
+		return nil, status.Errorf(codes.Internal, "error getting provider: %v", err)
+	}
+
+	err = s.deleteProvider(ctx, provider, projectID)
+	if err != nil {
+		return nil, status.Errorf(codes.Internal, "error deleting provider: %v", err)
+	}
+
+	return &minderv1.DeleteProviderByIDResponse{
+		Id: in.Id,
+	}, nil
+}
+
+func (s *Server) deleteProvider(ctx context.Context, provider *db.Provider, projectID uuid.UUID) error {
+	pbOpts := []providers.ProviderBuilderOption{
+		providers.WithProviderMetrics(s.provMt),
+		providers.WithRestClientCache(s.restClientCache),
+	}
+
+	p, err := providers.GetProviderBuilder(ctx, *provider, s.store, s.cryptoEngine, &s.cfg.Provider, pbOpts...)
+	if err != nil {
+		return status.Errorf(codes.Internal, "cannot get provider builder: %v", err)
+	}
+
+	// If the provider is a GitHub provider with a valid credential, delete all repositories associated with the provider
+	if p.Implements(db.ProviderTypeGithub) &&
+		providers.GetCredentialStateForProvider(ctx, *provider, s.store, s.cryptoEngine, &s.cfg.Provider) ==
+			provinfv1.CredentialStateSet {
+		client, err := p.GetGitHub()
+		if err != nil {
+			return status.Errorf(codes.Internal, "error creating github provider: %v", err)
+		}
+
+		// Delete all repositories associated with the provider and remove the webhooks
+		err = s.repos.DeleteRepositoriesByProvider(ctx, client, provider.Name, projectID)
+		if err != nil {
+			return status.Errorf(codes.Internal, "error deleting repositories: %v", err)
+		}
+	}
+
+	// Delete the provider itself
+	err = s.providers.DeleteProvider(ctx, provider)
+	if err != nil {
+		return status.Errorf(codes.Internal, "error deleting provider: %v", err)
+	}
+	return nil
+}
+
 func protobufProviderImplementsFromDB(ctx context.Context, p db.Provider) []minderv1.ProviderType {
 	impls := make([]minderv1.ProviderType, 0, len(p.Implements))
 	for _, i := range p.Implements {