fix: plugins updating

outblocks · Jul 27, 2021 · b54c22f · b54c22f
1 parent 5e83df1
commit b54c22f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/cmd/executor_config.go b/cmd/executor_config.go
@@ -11,7 +11,7 @@ import (
 	"github.com/outblocks/outblocks-cli/pkg/plugins"
 )
 
-func (e *Executor) loadProjectConfig(ctx context.Context, cfgPath string, vals map[string]interface{}, skipLoadPlugins bool) error {
+func (e *Executor) loadProjectConfig(ctx context.Context, cfgPath string, vals map[string]interface{}, skipLoadPlugins, skipCheck bool) error {
 	cfg, err := config.LoadProjectConfig(cfgPath, vals, &config.ProjectOptions{
 		Env: e.opts.env,
 	})
@@ -28,19 +28,22 @@ func (e *Executor) loadProjectConfig(ctx context.Context, cfgPath string, vals m
 	}
 
 	e.loader = plugins.NewLoader(cfg.Path, e.PluginsCacheDir())
+	e.cfg = cfg
 
 	if !skipLoadPlugins {
 		if err := cfg.LoadPlugins(ctx, e.log, e.loader); err != nil {
 			return err
 		}
 	}
 
+	if skipLoadPlugins || skipCheck {
+		return nil
+	}
+
 	if err := cfg.FullCheck(); err != nil {
 		return err
 	}
 
-	e.cfg = cfg
-
 	return nil
 }
 

diff --git a/cmd/plugins.go b/cmd/plugins.go
@@ -40,7 +40,7 @@ func (e *Executor) newPluginsCmd() *cobra.Command {
 		Long:  `Update installed plugins to matching versions from config.`,
 		Annotations: map[string]string{
 			cmdGroupAnnotation:           cmdGroupMain,
-			cmdSkipLoadPluginsAnnotation: "1",
+			cmdSkipCheckConfigAnnotation: "1",
 		},
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {

diff --git a/cmd/root.go b/cmd/root.go
@@ -22,6 +22,7 @@ import (
 
 const (
 	cmdSkipLoadConfigAnnotation  = "cmd_skip_load_config"
+	cmdSkipCheckConfigAnnotation = "cmd_skip_check_config"
 	cmdSkipLoadPluginsAnnotation = "cmd_skip_load_plugins"
 	cmdGroupAnnotation           = "cmd_group"
 	cmdGroupDelimiter            = "-"
@@ -293,9 +294,10 @@ func (e *Executor) newRoot() *cobra.Command {
 
 			vals := map[string]interface{}{"var": v}
 			skipLoadPlugins := cmd.Annotations[cmdSkipLoadPluginsAnnotation] == "1"
+			skipCheckConfig := cmd.Annotations[cmdSkipCheckConfigAnnotation] == "1"
 
 			// Load config file.
-			if err := e.loadProjectConfig(cmd.Context(), cfgPath, vals, skipLoadPlugins); err != nil && !errors.Is(err, config.ErrProjectConfigNotFound) {
+			if err := e.loadProjectConfig(cmd.Context(), cfgPath, vals, skipLoadPlugins, skipCheckConfig); err != nil && !errors.Is(err, config.ErrProjectConfigNotFound) {
 				return err
 			}