feat(api): remove action plugin when deleting grpc plugin aciton (#6529)

ovh · Apr 11, 2023 · ca0b143 · ca0b143
1 parent 90b4eaa
commit ca0b143
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/engine/api/actionplugin/plugin.go b/engine/api/actionplugin/plugin.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ovh/cds/sdk"
 )
 
-//InsertWithGRPCPlugin creates action in database
+// InsertWithGRPCPlugin creates action in database
 func InsertWithGRPCPlugin(db gorp.SqlExecutor, pl *sdk.GRPCPlugin, params []sdk.Parameter) (*sdk.Action, error) {
 	a := sdk.Action{
 		Name:        pl.Name,
@@ -33,7 +33,7 @@ func InsertWithGRPCPlugin(db gorp.SqlExecutor, pl *sdk.GRPCPlugin, params []sdk.
 	return &a, nil
 }
 
-//UpdateGRPCPlugin creates action in database
+// UpdateGRPCPlugin creates action in database
 func UpdateGRPCPlugin(ctx context.Context, db gorp.SqlExecutor, pl *sdk.GRPCPlugin, params []sdk.Parameter) (*sdk.Action, error) {
 	a := sdk.Action{
 		Name:        pl.Name,
@@ -62,3 +62,17 @@ func UpdateGRPCPlugin(ctx context.Context, db gorp.SqlExecutor, pl *sdk.GRPCPlug
 
 	return &a, nil
 }
+
+// DeleteGRPCPlugin delete action in database
+func DeleteGRPCPlugin(ctx context.Context, db gorp.SqlExecutor, pl *sdk.GRPCPlugin) error {
+	act, err := action.LoadByTypesAndName(ctx, db, []string{sdk.PluginAction}, pl.Name, action.LoadOptions.Default)
+	if err != nil {
+		return err
+	}
+
+	if err := action.Delete(db, act); err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/engine/api/grpc_plugin.go b/engine/api/grpc_plugin.go
@@ -160,11 +160,23 @@ func (api *API) deleteGRPCluginHandler() service.Handler {
 			return sdk.WrapError(err, "unable to load old plugin")
 		}
 
-		if err := plugin.Delete(ctx, api.mustDB(), api.SharedStorage, old); err != nil {
+		tx, err := api.mustDB().Begin()
+		if err != nil {
+			return sdk.WithStack(err)
+		}
+		defer tx.Rollback()
+
+		if old.Type == sdk.GRPCPluginAction {
+			if err := actionplugin.DeleteGRPCPlugin(ctx, tx, old); err != nil {
+				return err
+			}
+		}
+
+		if err := plugin.Delete(ctx, tx, api.SharedStorage, old); err != nil {
 			return sdk.WrapError(err, "unable to delete plugin")
 		}
 
-		return nil
+		return sdk.WithStack(tx.Commit())
 	}
 }
 
@@ -305,8 +317,8 @@ func (api *API) deleteGRPCluginBinaryHandler() service.Handler {
 		}
 
 		if err := plugin.DeleteBinary(ctx, tx, api.SharedStorage, p, os, arch); err != nil {
-      return err
-    }
+			return err
+		}
 
 		if err := tx.Commit(); err != nil {
 			return sdk.WrapError(err, "unable to commit tx")