Migrate disabled plugins to Cloud

helm/botkube/values.yaml

@@ -600,6 +600,7 @@ executors:
     ## Helm executor configuration
     ## Plugin name syntax: <repo>/<plugin>[@<version>]. If version is not provided, the latest version from repository is used.
     botkube/helm:
+      displayName: "Helm"
       # -- If true, enables `helm` commands execution.
       enabled: false
       config:
@@ -616,6 +617,7 @@ executors:
     ## Kubectl executor configuration
     ## Plugin name syntax: <repo>/<plugin>[@<version>]. If version is not provided, the latest version from repository is used.
     botkube/kubectl:
+      displayName: "Kubectl"
       enabled: false
       # -- Custom kubectl configuration.
       # @default -- See the `values.yaml` file for full object including optional properties related to interactive builder.
@@ -642,6 +644,7 @@ executors:
     ## Exec executor configuration.
     ## Plugin name syntax: <repo>/<plugin>[@<version>]. If version is not provided, the latest version from repository is used.
     botkube/exec:
+      displayName: "Exec"
       enabled: false
       context: *default-plugin-context
       ## -- Custom exec plugin configuration.
@@ -657,6 +660,7 @@ executors:
     ## Doctor executor configuration.
     ## Plugin name syntax: <repo>/<plugin>[@<version>]. If version is not provided, the latest version from repository is used.
     botkube/doctor:
+      displayName: "Doctor AI"
       enabled: false
       context: *default-plugin-context
       ## -- Custom doctor plugin configuration.
@@ -679,6 +683,7 @@ executors:
     # Flux executor configuration.
     ## Plugin name syntax: <repo>/<plugin>[@<version>]. If version is not provided, the latest version from repository is used.
     botkube/flux:
+      displayName: "Flux"
       enabled: false
       context:
         rbac:

internal/cli/install/helm/install.go

@@ -2,7 +2,6 @@ package helm
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -75,9 +74,10 @@ func (c *Helm) Install(ctx context.Context, status *printer.StatusPrinter, opts
 			if err != nil {
 				return nil, fmt.Errorf("while confiriming upgrade: %v", err)
 			}
-
 			if !upgrade {
-				return nil, errors.New("upgrade aborted")
+				status.Step("Skipped Botkube installation upgrade.")
+				status.End(true)
+				return nil, nil
 			}
 		}
 		restartAnnotation := fmt.Sprintf(restartAnnotationFmt, time.Now().Unix())

internal/cli/install/install.go

@@ -97,6 +97,11 @@ func Install(ctx context.Context, w io.Writer, k8sCfg *kubex.ConfigWithMeta, opt
 	if err != nil {
 		return err
 	}
+	if rel == nil {
+		//There wasn't any errors and we don't have release.
+		//User answered "no" on prompt: Do you want to upgrade existing installation?
+		return nil
+	}
 
 	if opts.HelmParams.DryRun {
 		return printSuccessInstallMessage(opts.HelmParams.Version, w)

internal/cli/migrate/converter.go

@@ -106,18 +106,23 @@ func (c *Converter) convertExecutors(executors map[string]bkconfig.Executors) ([
 	errs := multierror.New()
 	for cfgName, conf := range executors {
 		for name, p := range conf.Plugins {
-			if !p.Enabled || !strings.HasPrefix(name, "botkube") { // skip all 3rd party plugins
+			if !strings.HasPrefix(name, "botkube") { // skip all 3rd party plugins
 				continue
 			}
 
 			rawCfg, err := json.Marshal(p.Config)
 			if err != nil {
 				return nil, err
 			}
+			displayName := conf.DisplayName
+			if displayName == "" {
+				displayName = name
+			}
 			out = append(out, &gqlModel.PluginConfigurationGroupInput{
 				Name:        name,
-				DisplayName: name,
+				DisplayName: displayName,
 				Type:        gqlModel.PluginTypeExecutor,
+				Enabled:     p.Enabled,
 				Configurations: []*gqlModel.PluginConfigurationInput{
 					{
 						Name:          c.getOrGeneratePluginName(cfgName),
@@ -138,17 +143,22 @@ func (c *Converter) convertSources(sources map[string]bkconfig.Sources) ([]*gqlM
 	errs := multierror.New()
 	for cfgName, conf := range sources {
 		for name, p := range conf.Plugins {
-			if !p.Enabled || !strings.HasPrefix(name, "botkube") { // skip all 3rd party plugins
+			if !strings.HasPrefix(name, "botkube") { // skip all 3rd party plugins
 				continue
 			}
 			rawCfg, err := json.Marshal(p.Config)
 			if err != nil {
 				return nil, err
 			}
+			displayName := conf.DisplayName
+			if displayName == "" {
+				displayName = name
+			}
 			out = append(out, &gqlModel.PluginConfigurationGroupInput{
 				Name:        name,
-				DisplayName: conf.DisplayName,
+				DisplayName: displayName,
 				Type:        gqlModel.PluginTypeSource,
+				Enabled:     p.Enabled,
 				Configurations: []*gqlModel.PluginConfigurationInput{
 					{
 						Name:          c.getOrGeneratePluginName(cfgName),
@@ -164,6 +174,16 @@ func (c *Converter) convertSources(sources map[string]bkconfig.Sources) ([]*gqlM
 }
 
 func (c *Converter) convertRbac(ctx bkconfig.PluginContext) *gqlModel.RBACInput {
+	if ctx.RBAC == nil {
+		return &gqlModel.RBACInput{
+			User: &gqlModel.UserPolicySubjectInput{
+				Type: gqlModel.PolicySubjectTypeEmpty,
+			},
+			Group: &gqlModel.GroupPolicySubjectInput{
+				Type: gqlModel.PolicySubjectTypeEmpty,
+			},
+		}
+	}
 	return &gqlModel.RBACInput{
 		User: &gqlModel.UserPolicySubjectInput{
 			Type:   graphqlPolicySubjectType(ctx.RBAC.User.Type),

pkg/config/config.go

@@ -347,7 +347,8 @@ const (
 
 // Executors contains executors configuration parameters.
 type Executors struct {
-	Plugins Plugins `yaml:",inline" koanf:",remain"`
+	DisplayName string  `yaml:"displayName"`
+	Plugins     Plugins `yaml:",inline" koanf:",remain"`
 }
 
 // CollectCommandPrefixes returns list of command prefixes for all executors, even disabled ones.

pkg/config/testdata/TestLoadConfigSuccess/config.golden.yaml

@@ -22,12 +22,14 @@ sources:
             context: {}
 executors:
     echo:
+        displayName: Echo
         botkube/echo:
             enabled: true
             config:
                 changeResponseToUpperCase: true
             context: {}
     k8s-tools:
+        displayName: K8S Tools
         botkube/helm:
             enabled: true
             config: null

pkg/config/testdata/TestLoadConfigSuccess/executors.yaml

@@ -1,10 +1,12 @@
 executors:
   'k8s-tools':
+    displayName: K8S Tools
     botkube/kubectl:
       enabled: true
     botkube/helm:
       enabled: true
   'echo':
+    displayName: Echo
     botkube/echo:
       enabled: true
       config: