fix: plugin loading, added relative values reader

23doors · 23doors · commit 2ef10a514bf6 · 2021-07-26T17:04:26.000+02:00
diff --git a/cmd/apps.go b/cmd/apps.go
@@ -0,0 +1,74 @@
+package cmd
+
+import (
+	"github.com/outblocks/outblocks-cli/pkg/config"
+	"github.com/spf13/cobra"
+)
+
+func (e *Executor) newAppsCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:     "apps",
+		Aliases: []string{"app", "application", "applications"},
+		Short:   "App management",
+		Long:    `Applications management - list, add or delete.`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation: cmdGroupMain,
+		},
+	}
+
+	list := &cobra.Command{
+		Use:   "list",
+		Short: "List apps",
+		Long:  `List configured applications.`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation: cmdGroupMain,
+		},
+		SilenceUsage: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// TODO: app list
+			return nil
+		},
+	}
+
+	del := &cobra.Command{
+		Use:     "delete",
+		Aliases: []string{"del", "remove"},
+		Short:   "Delete an app",
+		Long:    `Delete an existing application config.`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation:           cmdGroupMain,
+			cmdSkipLoadPluginsAnnotation: "1",
+		},
+		SilenceUsage: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if e.cfg == nil {
+				return config.ErrProjectConfigNotFound
+			}
+
+			// TODO: app deletion
+			return nil
+		},
+	}
+
+	add := &cobra.Command{
+		Use:   "add",
+		Short: "Add a new app",
+		Long:  `Add a new application (generates new config).`,
+		Annotations: map[string]string{
+			cmdGroupAnnotation: cmdGroupMain,
+		},
+		SilenceUsage: true,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			// TODO: app add
+			return nil
+		},
+	}
+
+	cmd.AddCommand(
+		list,
+		del,
+		add,
+	)
+
+	return cmd
+}
diff --git a/cmd/executor_config.go b/cmd/executor_config.go
@@ -11,8 +11,8 @@ import (
 	"github.com/outblocks/outblocks-cli/pkg/plugins"
 )
 
-func (e *Executor) loadProjectConfig(ctx context.Context, vals map[string]interface{}, skipLoadPlugins bool) error {
-	cfg, err := config.LoadProjectConfig(vals, &config.ProjectOptions{
+func (e *Executor) loadProjectConfig(ctx context.Context, cfgPath string, vals map[string]interface{}, skipLoadPlugins bool) error {
+	cfg, err := config.LoadProjectConfig(cfgPath, vals, &config.ProjectOptions{
 		Env: e.opts.env,
 	})
 	if err != nil {
@@ -29,7 +29,7 @@ func (e *Executor) loadProjectConfig(ctx context.Context, vals map[string]interf
 
 	e.loader = plugins.NewLoader(cfg.Path, e.PluginsCacheDir())
 
-	if skipLoadPlugins {
+	if !skipLoadPlugins {
 		if err := cfg.LoadPlugins(ctx, e.log, e.loader); err != nil {
 			return err
 		}
diff --git a/cmd/init.go b/cmd/init.go
@@ -13,17 +13,17 @@ func (e *Executor) newInitCmd() *cobra.Command {
 		Short: "Initialize new config",
 		Long:  `Initialize new Outblocks project config with opinionated defaults.`,
 		Annotations: map[string]string{
-			cmdGroupAnnotation:           cmdGroupMain,
-			cmdSkipLoadPluginsAnnotation: "1",
+			cmdGroupAnnotation:          cmdGroupMain,
+			cmdSkipLoadConfigAnnotation: "1",
 		},
 		SilenceUsage: true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return actions.NewInit(e.Log(), e.loader, e.PluginsCacheDir(), opts).Run(cmd.Context(), e.cfg)
+			return actions.NewInit(e.Log(), e.PluginsCacheDir(), opts).Run(cmd.Context())
 		},
 	}
 
 	f := cmd.Flags()
-	f.BoolVar(&opts.Overwrite, "overwrite", false, "do not ask if project file alrady exists")
+	f.BoolVar(&opts.Overwrite, "overwrite", false, "do not ask if project file already exists")
 	f.StringVar(&opts.Name, "name", "", "project name")
 	f.StringVar(&opts.DeployPlugin, "deploy-plugin", "", "deploy plugin to use (e.g. gcp)")
 	f.StringVar(&opts.RunPlugin, "run-plugin", "", "deploy plugin to use (e.g. docker)")
diff --git a/cmd/plugins.go b/cmd/plugins.go
@@ -11,7 +11,7 @@ func (e *Executor) newPluginsCmd() *cobra.Command {
 		Use:     "plugins",
 		Aliases: []string{"plugin"},
 		Short:   "Plugin management",
-		Long:    `Plugin management - list, update, add or remove.`,
+		Long:    `Plugin management - list, update, add or delete.`,
 		Annotations: map[string]string{
 			cmdGroupAnnotation: cmdGroupMain,
 		},
diff --git a/cmd/root.go b/cmd/root.go
@@ -4,9 +4,12 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"os"
+	"path/filepath"
 	"sort"
 	"strings"
 
+	"github.com/outblocks/outblocks-cli/internal/fileutil"
 	"github.com/outblocks/outblocks-cli/internal/version"
 	"github.com/outblocks/outblocks-cli/pkg/cli/values"
 	"github.com/outblocks/outblocks-cli/pkg/config"
@@ -18,6 +21,7 @@ import (
 )
 
 const (
+	cmdSkipLoadConfigAnnotation  = "cmd_skip_load_config"
 	cmdSkipLoadPluginsAnnotation = "cmd_skip_load_plugins"
 	cmdGroupAnnotation           = "cmd_group"
 	cmdGroupDelimiter            = "-"
@@ -263,14 +267,26 @@ func (e *Executor) newRoot() *cobra.Command {
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			e.opts.env = e.v.GetString("env")
 
+			skipLoadConfig := cmd.Annotations[cmdSkipLoadConfigAnnotation] == "1"
+			if skipLoadConfig {
+				return nil
+			}
+
 			// Load values.
 			for i, v := range e.opts.valueOpts.ValueFiles {
 				e.opts.valueOpts.ValueFiles[i] = strings.ReplaceAll(v, "<env>", e.opts.env)
 			}
 
 			defValuesYAML := strings.ReplaceAll(defaultValuesYAML, "<env>", e.opts.env)
 
-			v, err := e.opts.valueOpts.MergeValues(cmd.Context(), getter.All())
+			pwd, err := os.Getwd()
+			if err != nil {
+				return fmt.Errorf("cannot find current directory: %w", err)
+			}
+
+			cfgPath := fileutil.FindYAMLGoingUp(pwd, config.ProjectYAMLName)
+
+			v, err := e.opts.valueOpts.MergeValues(cmd.Context(), filepath.Dir(cfgPath), getter.All())
 			if err != nil && (len(e.opts.valueOpts.ValueFiles) != 1 || e.opts.valueOpts.ValueFiles[0] != defValuesYAML) {
 				return err
 			}
@@ -279,7 +295,7 @@ func (e *Executor) newRoot() *cobra.Command {
 			skipLoadPlugins := cmd.Annotations[cmdSkipLoadPluginsAnnotation] == "1"
 
 			// Load config file.
-			if err := e.loadProjectConfig(cmd.Context(), vals, skipLoadPlugins); err != nil && !errors.Is(err, config.ErrProjectConfigNotFound) {
+			if err := e.loadProjectConfig(cmd.Context(), cfgPath, vals, skipLoadPlugins); err != nil && !errors.Is(err, config.ErrProjectConfigNotFound) {
 				return err
 			}
 
@@ -317,6 +333,7 @@ func (e *Executor) newRoot() *cobra.Command {
 		e.newPluginsCmd(),
 		e.newForceUnlockCmd(),
 		e.newInitCmd(),
+		e.newAppsCmd(),
 	)
 
 	return cmd
diff --git a/pkg/actions/init.go b/pkg/actions/init.go
@@ -15,6 +15,7 @@ import (
 	"github.com/AlecAivazis/survey/v2/terminal"
 	"github.com/Masterminds/sprig"
 	"github.com/goccy/go-yaml"
+	"github.com/outblocks/outblocks-cli/internal/fileutil"
 	"github.com/outblocks/outblocks-cli/pkg/config"
 	"github.com/outblocks/outblocks-cli/pkg/logger"
 	"github.com/outblocks/outblocks-cli/pkg/plugins"
@@ -29,7 +30,6 @@ var (
 
 type Init struct {
 	log            logger.Logger
-	loader         *plugins.Loader
 	pluginCacheDir string
 	opts           *InitOptions
 }
@@ -48,10 +48,9 @@ type InitOptions struct {
 	}
 }
 
-func NewInit(log logger.Logger, loader *plugins.Loader, pluginCacheDir string, opts *InitOptions) *Init {
+func NewInit(log logger.Logger, pluginCacheDir string, opts *InitOptions) *Init {
 	return &Init{
 		log:            log,
-		loader:         loader,
 		pluginCacheDir: pluginCacheDir,
 		opts:           opts,
 	}
@@ -63,17 +62,16 @@ func funcMap() template.FuncMap {
 	}
 }
 
-func (d *Init) Run(ctx context.Context, cfg *config.Project) error {
+func (d *Init) Run(ctx context.Context) error {
 	curDir, err := os.Getwd()
 	if err != nil {
 		return fmt.Errorf("getting current working dir error: %w", err)
 	}
 
-	if cfg == nil {
-		cfg = &config.Project{}
+	cfg := &config.Project{}
+	loader := plugins.NewLoader(curDir, d.pluginCacheDir)
 
-		d.loader = plugins.NewLoader(curDir, d.pluginCacheDir)
-	} else if !d.opts.Overwrite {
+	if !d.opts.Overwrite && fileutil.FindYAML(filepath.Join(curDir, config.ProjectYAMLName)) != "" {
 		proceed := false
 		prompt := &survey.Confirm{
 			Message: "Project config already exists! Do you want to overwrite it?",
@@ -87,7 +85,7 @@ func (d *Init) Run(ctx context.Context, cfg *config.Project) error {
 		}
 	}
 
-	cfg, err = d.prompt(ctx, cfg, curDir)
+	cfg, err = d.prompt(ctx, cfg, loader, curDir)
 	if errors.Is(err, errInitCanceled) {
 		d.log.Println("Init canceled.")
 		return nil
@@ -97,7 +95,7 @@ func (d *Init) Run(ctx context.Context, cfg *config.Project) error {
 		return err
 	}
 
-	err = cfg.LoadPlugins(ctx, d.log, d.loader)
+	err = cfg.LoadPlugins(ctx, d.log, loader)
 	if err != nil {
 		return err
 	}
@@ -160,7 +158,7 @@ func (d *Init) Run(ctx context.Context, cfg *config.Project) error {
 	return err
 }
 
-func (d *Init) prompt(ctx context.Context, cfg *config.Project, curDir string) (*config.Project, error) {
+func (d *Init) prompt(ctx context.Context, cfg *config.Project, loader *plugins.Loader, curDir string) (*config.Project, error) {
 	var qs []*survey.Question
 
 	if d.opts.Name == "" {
@@ -228,12 +226,12 @@ func (d *Init) prompt(ctx context.Context, cfg *config.Project, curDir string) (
 
 	cfg.Name = answers.Name
 
-	_, latestDeployVersion, err := d.loader.MatchingVersion(ctx, answers.DeployPlugin, "", nil)
+	_, latestDeployVersion, err := loader.MatchingVersion(ctx, answers.DeployPlugin, "", nil)
 	if err != nil {
 		return nil, fmt.Errorf("error retrieving latest version of plugin '%s': %w", answers.RunPlugin, err)
 	}
 
-	_, latestRunVersion, err := d.loader.MatchingVersion(ctx, answers.RunPlugin, "", nil)
+	_, latestRunVersion, err := loader.MatchingVersion(ctx, answers.RunPlugin, "", nil)
 	if err != nil {
 		return nil, fmt.Errorf("error retrieving latest version of plugin '%s': %w", answers.RunPlugin, err)
 	}
diff --git a/pkg/cli/values/options.go b/pkg/cli/values/options.go
@@ -3,10 +3,12 @@ package values
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/goccy/go-yaml"
@@ -19,16 +21,30 @@ type Options struct {
 	Values     []string
 }
 
+func (opts *Options) readFile(ctx context.Context, rootPath, filePath string, p getter.Providers) ([]byte, error) {
+	bytes, err := readFile(ctx, filePath, p)
+	if err != nil {
+		var perr *os.PathError
+		if errors.As(err, &perr) && !filepath.IsAbs(filePath) && rootPath != "" {
+			// Try different cfg root path.
+			filePath = filepath.Join(rootPath, filePath)
+			return ioutil.ReadFile(filePath)
+		}
+	}
+
+	return bytes, err
+}
+
 // MergeValues merges values from files specified via -f/--values and directly
 // via --set marshaling them to YAML.
-func (opts *Options) MergeValues(ctx context.Context, p getter.Providers) (map[string]interface{}, error) {
+func (opts *Options) MergeValues(ctx context.Context, root string, p getter.Providers) (map[string]interface{}, error) {
 	base := map[string]interface{}{}
 
 	// User specified a values files via -f/--values
 	for _, filePath := range opts.ValueFiles {
 		currentMap := map[string]interface{}{}
 
-		bytes, err := readFile(ctx, filePath, p)
+		bytes, err := opts.readFile(ctx, root, filePath, p)
 		if err != nil {
 			return nil, err
 		}
diff --git a/pkg/config/project.go b/pkg/config/project.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io/ioutil"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -61,34 +60,28 @@ type ProjectOptions struct {
 	Env string
 }
 
-func LoadProjectConfig(vars map[string]interface{}, opts *ProjectOptions) (*Project, error) {
-	pwd, err := os.Getwd()
-	if err != nil {
-		return nil, fmt.Errorf("cannot find current directory: %w", err)
-	}
-
-	f := fileutil.FindYAMLGoingUp(pwd, ProjectYAMLName)
-	if f == "" {
+func LoadProjectConfig(cfgPath string, vars map[string]interface{}, opts *ProjectOptions) (*Project, error) {
+	if cfgPath == "" {
 		return nil, ErrProjectConfigNotFound
 	}
 
-	data, err := ioutil.ReadFile(f)
+	data, err := ioutil.ReadFile(cfgPath)
 	if err != nil {
 		return nil, fmt.Errorf("cannot read project yaml: %w", err)
 	}
 
 	// Process lockfile.
 	var lock *lockfile.Lockfile
 
-	lockPath := filepath.Join(filepath.Dir(f), LockfileName)
+	lockPath := filepath.Join(filepath.Dir(cfgPath), LockfileName)
 	if fileutil.FileExists(lockPath) {
 		lock, err = lockfile.LoadLockfile(lockPath)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	p, err := LoadProjectConfigData(f, data, vars, opts, lock)
+	p, err := LoadProjectConfigData(cfgPath, data, vars, opts, lock)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
@@ -135,16 +135,6 @@ func (l *Log) Errorf(format string, a ...interface{}) {
 
 	if l.logLevel == LogLevelDebug {
 		_, fileName, line, _ := runtime.Caller(1)
-		fmt.Println(fileName, line)
-		_, fileName, line, _ = runtime.Caller(2)
-		fmt.Println(fileName, line)
-		_, fileName, line, _ = runtime.Caller(3)
-		fmt.Println(fileName, line)
-		_, fileName, line, _ = runtime.Caller(0)
-		fmt.Println(fileName, line)
-		_, fileName, line, _ = runtime.Caller(4)
-		fmt.Println(fileName, line)
-
 		pterm.Println(pterm.FgGray.Sprint("└ " + fmt.Sprintf("(%s:%d)", fileName, line)))
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"github.com/AlecAivazis/survey/v2/terminal"`
`16`	`16`	`"github.com/Masterminds/sprig"`
`17`	`17`	`"github.com/goccy/go-yaml"`
	`18`	`+ "github.com/outblocks/outblocks-cli/internal/fileutil"`
`18`	`19`	`"github.com/outblocks/outblocks-cli/pkg/config"`
`19`	`20`	`"github.com/outblocks/outblocks-cli/pkg/logger"`
`20`	`21`	`"github.com/outblocks/outblocks-cli/pkg/plugins"`
`@@ -29,7 +30,6 @@ var (`
`29`	`30`
`30`	`31`	`type Init struct {`
`31`	`32`	`log logger.Logger`
`32`		`- loader *plugins.Loader`
`33`	`33`	`pluginCacheDir string`
`34`	`34`	`opts *InitOptions`
`35`	`35`	`}`
`@@ -48,10 +48,9 @@ type InitOptions struct {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`		`-func NewInit(log logger.Logger, loader plugins.Loader, pluginCacheDir string, opts InitOptions) *Init {`
	`51`	`+func NewInit(log logger.Logger, pluginCacheDir string, opts InitOptions) Init {`
`52`	`52`	`return &Init{`
`53`	`53`	`log: log,`
`54`		`- loader: loader,`
`55`	`54`	`pluginCacheDir: pluginCacheDir,`
`56`	`55`	`opts: opts,`
`57`	`56`	`}`
`@@ -63,17 +62,16 @@ func funcMap() template.FuncMap {`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`
`66`		`-func (d Init) Run(ctx context.Context, cfg config.Project) error {`
	`65`	`+func (d *Init) Run(ctx context.Context) error {`
`67`	`66`	`curDir, err := os.Getwd()`
`68`	`67`	`if err != nil {`
`69`	`68`	`return fmt.Errorf("getting current working dir error: %w", err)`
`70`	`69`	`}`
`71`	`70`
`72`		`- if cfg == nil {`
`73`		`- cfg = &config.Project{}`
	`71`	`+ cfg := &config.Project{}`
	`72`	`+ loader := plugins.NewLoader(curDir, d.pluginCacheDir)`
`74`	`73`
`75`		`- d.loader = plugins.NewLoader(curDir, d.pluginCacheDir)`
`76`		`- } else if !d.opts.Overwrite {`
	`74`	`+ if !d.opts.Overwrite && fileutil.FindYAML(filepath.Join(curDir, config.ProjectYAMLName)) != "" {`
`77`	`75`	`proceed := false`
`78`	`76`	`prompt := &survey.Confirm{`
`79`	`77`	`Message: "Project config already exists! Do you want to overwrite it?",`
`@@ -87,7 +85,7 @@ func (d Init) Run(ctx context.Context, cfg config.Project) error {`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`
`90`		`- cfg, err = d.prompt(ctx, cfg, curDir)`
	`88`	`+ cfg, err = d.prompt(ctx, cfg, loader, curDir)`
`91`	`89`	`if errors.Is(err, errInitCanceled) {`
`92`	`90`	`d.log.Println("Init canceled.")`
`93`	`91`	`return nil`
`@@ -97,7 +95,7 @@ func (d Init) Run(ctx context.Context, cfg config.Project) error {`
`97`	`95`	`return err`
`98`	`96`	`}`
`99`	`97`
`100`		`- err = cfg.LoadPlugins(ctx, d.log, d.loader)`
	`98`	`+ err = cfg.LoadPlugins(ctx, d.log, loader)`
`101`	`99`	`if err != nil {`
`102`	`100`	`return err`
`103`	`101`	`}`
`@@ -160,7 +158,7 @@ func (d Init) Run(ctx context.Context, cfg config.Project) error {`
`160`	`158`	`return err`
`161`	`159`	`}`
`162`	`160`
`163`		`-func (d Init) prompt(ctx context.Context, cfg config.Project, curDir string) (*config.Project, error) {`
	`161`	`+func (d Init) prompt(ctx context.Context, cfg config.Project, loader plugins.Loader, curDir string) (config.Project, error) {`
`164`	`162`	`var qs []*survey.Question`
`165`	`163`
`166`	`164`	`if d.opts.Name == "" {`
`@@ -228,12 +226,12 @@ func (d Init) prompt(ctx context.Context, cfg config.Project, curDir string) (`
`228`	`226`
`229`	`227`	`cfg.Name = answers.Name`
`230`	`228`
`231`		`- _, latestDeployVersion, err := d.loader.MatchingVersion(ctx, answers.DeployPlugin, "", nil)`
	`229`	`+ _, latestDeployVersion, err := loader.MatchingVersion(ctx, answers.DeployPlugin, "", nil)`
`232`	`230`	`if err != nil {`
`233`	`231`	`return nil, fmt.Errorf("error retrieving latest version of plugin '%s': %w", answers.RunPlugin, err)`
`234`	`232`	`}`
`235`	`233`
`236`		`- _, latestRunVersion, err := d.loader.MatchingVersion(ctx, answers.RunPlugin, "", nil)`
	`234`	`+ _, latestRunVersion, err := loader.MatchingVersion(ctx, answers.RunPlugin, "", nil)`
`237`	`235`	`if err != nil {`
`238`	`236`	`return nil, fmt.Errorf("error retrieving latest version of plugin '%s': %w", answers.RunPlugin, err)`
`239`	`237`	`}`