alpha: errors with stack, private svc support

Author: 23doors

cmd/deploy.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"fmt"
 	"strings"
 
+	"github.com/ansel1/merry/v2"
 	"github.com/outblocks/outblocks-cli/pkg/actions"
 	"github.com/outblocks/outblocks-cli/pkg/config"
 	"github.com/spf13/cobra"
@@ -28,17 +28,17 @@ func (e *Executor) newDeployCmd() *cobra.Command {
 			}
 
 			if len(opts.TargetApps) > 0 && len(opts.SkipApps) > 0 {
-				return fmt.Errorf("target-apps and skip-apps arguments are mutually exclusive modes")
+				return merry.New("target-apps and skip-apps arguments are mutually exclusive modes")
 			}
 
 			if opts.SkipAllApps && opts.Destroy {
-				return fmt.Errorf("skip-all-apps and destroy areare mutually exclusive modes")
+				return merry.New("skip-all-apps and destroy areare mutually exclusive modes")
 			}
 
 			for _, t := range targetApps {
 				tsplit := strings.SplitN(t, ".", 2)
 				if len(tsplit) != 2 {
-					return fmt.Errorf("wrong format for target '%s': specify in a form of <app type>.<name>, e.g.: static.website", t)
+					return merry.Errorf("wrong format for target '%s': specify in a form of <app type>.<name>, e.g.: static.website", t)
 				}
 
 				opts.TargetApps = append(opts.TargetApps, config.ComputeAppID(tsplit[0], tsplit[1]))
@@ -48,7 +48,7 @@ func (e *Executor) newDeployCmd() *cobra.Command {
 				for _, t := range skipApps {
 					tsplit := strings.SplitN(t, ".", 2)
 					if len(tsplit) != 2 {
-						return fmt.Errorf("wrong format for skip '%s': specify in a form of <app type>.<name>, e.g.: static.website", t)
+						return merry.Errorf("wrong format for skip '%s': specify in a form of <app type>.<name>, e.g.: static.website", t)
 					}
 
 					opts.SkipApps = append(opts.SkipApps, config.ComputeAppID(tsplit[0], tsplit[1]))

cmd/executor.go

@@ -3,11 +3,11 @@ package cmd
 import (
 	"context"
 	"errors"
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/ansel1/merry/v2"
 	"github.com/goccy/go-yaml"
 	"github.com/outblocks/outblocks-cli/internal/fileutil"
 	"github.com/outblocks/outblocks-cli/pkg/cli"
@@ -96,12 +96,12 @@ func (e *Executor) commandPreRun(ctx context.Context) error {
 
 	pwd, err := os.Getwd()
 	if err != nil {
-		return fmt.Errorf("cannot find current directory: %w", err)
+		return merry.Errorf("cannot find current directory: %w", err)
 	}
 
 	pwd, err = filepath.EvalSymlinks(pwd)
 	if err != nil {
-		return fmt.Errorf("cannot evaluate current directory: %w", err)
+		return merry.Errorf("cannot evaluate current directory: %w", err)
 	}
 
 	cfgPath := fileutil.FindYAMLGoingUp(pwd, config.ProjectYAMLName)
@@ -112,10 +112,13 @@ func (e *Executor) commandPreRun(ctx context.Context) error {
 			return nil
 		}
 
-		return fmt.Errorf("cannot load values files: %w", err)
+		return merry.Errorf("cannot load values files: %w", err)
 	}
 
-	vals := map[string]interface{}{"var": v}
+	vals := map[string]interface{}{
+		"var": v,
+		"env": e.opts.env,
+	}
 
 	// Load config file.
 	if err := e.loadProjectConfig(ctx, cfgPath, e.srv.Addr().String(), vals, skipLoadApps, skipLoadPlugins, skipCheckConfig); err != nil && !errors.Is(err, config.ErrProjectConfigNotFound) {
@@ -148,7 +151,7 @@ func (e *Executor) addPluginsCommands(cmd *cobra.Command) error {
 				arg.Name = strings.ToLower(arg.Name)
 
 				if flags.Lookup(arg.Name) != nil {
-					return fmt.Errorf("plugin tried to add already existing argument '%s' to command '%s'", arg, cmdName)
+					return merry.Errorf("plugin tried to add already existing argument '%s' to command '%s'", arg, cmdName)
 				}
 
 				switch arg.Type {

cmd/executor_config.go

@@ -2,13 +2,13 @@ package cmd
 
 import (
 	"context"
-	"fmt"
 	"path/filepath"
 
+	"github.com/ansel1/merry/v2"
 	"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/plugins"
-	plugin_util "github.com/outblocks/outblocks-plugin-go/util"
 )
 
 func (e *Executor) loadProjectConfig(ctx context.Context, cfgPath, hostAddr string, vals map[string]interface{}, skipLoadApps, skipLoadPlugins, skipCheck bool) error {
@@ -53,7 +53,7 @@ func (e *Executor) cleanupProject() error {
 	if e.cfg != nil {
 		for _, plug := range e.cfg.LoadedPlugins() {
 			if err := plug.Stop(); err != nil {
-				return fmt.Errorf("error stopping plugin '%s': %w", plug.Name, err)
+				return merry.Errorf("error stopping plugin '%s': %w", plug.Name, err)
 			}
 		}
 	}
@@ -70,11 +70,11 @@ func (e *Executor) saveLockfile() error {
 
 	data, err := yaml.MarshalWithOptions(lock, yaml.UseJSONMarshaler())
 	if err != nil {
-		return fmt.Errorf("marshaling lockfile error: %w", err)
+		return merry.Errorf("marshaling lockfile error: %w", err)
 	}
 
-	if err := plugin_util.WriteFile(filepath.Join(e.cfg.Dir, config.LockfileName), data, 0755); err != nil {
-		return fmt.Errorf("writing lockfile error: %w", err)
+	if err := fileutil.WriteFile(filepath.Join(e.cfg.Dir, config.LockfileName), data, 0755); err != nil {
+		return merry.Errorf("writing lockfile error: %w", err)
 	}
 
 	return nil

go.mod

@@ -7,89 +7,105 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/Masterminds/vcs v1.13.1
-	github.com/docker/docker v20.10.10+incompatible
+	github.com/ansel1/merry/v2 v2.0.0-beta.12
+	github.com/docker/docker v20.10.12+incompatible
 	github.com/enescakir/emoji v1.0.0
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
-	github.com/goccy/go-yaml v1.8.9
+	github.com/goccy/go-yaml v1.9.4
 	github.com/google/go-github/v35 v35.3.0
-	github.com/gookit/color v1.4.2
+	github.com/gookit/color v1.5.0
 	github.com/mholt/archiver/v3 v3.5.1
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/otiai10/copy v1.6.0
-	github.com/outblocks/outblocks-plugin-go v0.0.0-20211216161637-f1d776328c52
+	github.com/otiai10/copy v1.7.0
+	github.com/outblocks/outblocks-plugin-go v0.0.0-20211231145933-5721bffaa273
 	github.com/pterm/pterm v0.12.33
-	github.com/spf13/cobra v1.2.1
+	github.com/spf13/cobra v1.3.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.9.0
+	github.com/spf13/viper v1.10.1
 	github.com/txn2/txeh v1.3.0
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
-	google.golang.org/grpc v1.42.0
+	google.golang.org/grpc v1.43.0
 	google.golang.org/protobuf v1.27.1
 )
 
 require (
+	cloud.google.com/go v0.99.0 // indirect
+	cloud.google.com/go/storage v1.18.2 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Microsoft/go-winio v0.4.17 // indirect
-	github.com/andybalholm/brotli v1.0.1 // indirect
+	github.com/Microsoft/go-winio v0.5.1 // indirect
+	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/atomicgo/cursor v0.0.1 // indirect
-	github.com/containerd/containerd v1.5.5 // indirect
+	github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
+	github.com/cncf/xds/go v0.0.0-20211216145620-d92e9ce0af51 // indirect
+	github.com/containerd/containerd v1.5.8 // indirect
 	github.com/creasty/defaults v1.5.2 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
-	github.com/fatih/color v1.10.0 // indirect
+	github.com/envoyproxy/go-control-plane v0.10.1 // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
+	github.com/fatih/color v1.13.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/go-playground/validator/v10 v10.6.1 // indirect
+	github.com/go-playground/validator/v10 v10.9.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.3 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
+	github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.11.13 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/nwaples/rardecode v1.1.0 // indirect
+	github.com/nwaples/rardecode v1.1.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
+	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/pierrec/lz4/v4 v4.1.2 // indirect
+	github.com/pierrec/lz4/v4 v4.1.12 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/afero v1.7.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/ulikunitz/xz v0.5.9 // indirect
+	github.com/ulikunitz/xz v0.5.10 // indirect
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect
-	golang.org/x/text v0.3.6 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/api v0.63.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71 // indirect
-	gopkg.in/ini.v1 v1.63.2 // indirect
+	google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )