diff --git a/dreadl0ck/zeus/command.go b/dreadl0ck/zeus/command.go index c997e70..19247b5 100644 --- a/dreadl0ck/zeus/command.go +++ b/dreadl0ck/zeus/command.go @@ -73,7 +73,7 @@ func (c *Command) Validate(ctx context.Context, r *readline.Readline) error { func (c *Command) Execute(ctx context.Context, r *readline.Readline) error { dir, args := r.Args().Shift() if _, err := os.Stat(dir); errors.Is(err, os.ErrNotExist) { - c.cache.Delete("") + c.cache.Delete() c.l.Info("bootstrapping a new zeus:", dir) return shell.New(ctx, c.l, "zeus", "bootstrap"). Args(args...). diff --git a/foomo/beam/database.go b/foomo/beam/database.go index 7e41db8..35c65c1 100644 --- a/foomo/beam/database.go +++ b/foomo/beam/database.go @@ -1,6 +1,6 @@ package beam type Database struct { - Port int `yaml:"port"` - Hostname string `yaml:"hostname"` + Port int `json:"port" yaml:"port"` + Hostname string `json:"hostname" yaml:"hostname"` } diff --git a/k3d-io/k3d/command.go b/k3d-io/k3d/command.go index 1782b3e..b016f1f 100644 --- a/k3d-io/k3d/command.go +++ b/k3d-io/k3d/command.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/foomo/posh-providers/kubernets/kubectl" + "github.com/foomo/posh/pkg/cache" "github.com/foomo/posh/pkg/command/tree" "github.com/foomo/posh/pkg/env" "github.com/foomo/posh/pkg/log" @@ -20,6 +21,7 @@ type ( l log.Logger k3d *K3d name string + cache cache.Cache kubectl *kubectl.Kubectl commandTree tree.Root } @@ -41,10 +43,11 @@ func CommandWithName(v string) CommandOption { // ~ Constructor // ------------------------------------------------------------------------------------------------ -func NewCommand(l log.Logger, k3d *K3d, kubectl *kubectl.Kubectl, opts ...CommandOption) (*Command, error) { +func NewCommand(l log.Logger, k3d *K3d, cache cache.Cache, kubectl *kubectl.Kubectl, opts ...CommandOption) (*Command, error) { inst := &Command{ l: l.Named("k3d"), k3d: k3d, + cache: cache, kubectl: kubectl, name: "k3d", } @@ -347,12 +350,18 @@ func (c *Command) kubeconfig(ctx context.Context, r *readline.Readline) error { } // delete cluster - return shell.New(ctx, c.l, "k3d", "kubeconfig", "get", clusterCfg.AliasName()). + if err := shell.New(ctx, c.l, "k3d", "kubeconfig", "get", clusterCfg.AliasName()). Args(">", c.kubectl.Cluster(name).Config("")). Args(r.Flags()...). Args(r.AdditionalArgs()...). Args(r.AdditionalFlags()...). - Run() + Run(); err != nil { + return err + } + + c.cache.Clear() + + return nil } /* diff --git a/oven-sh/bun/workspace.go b/oven-sh/bun/workspace.go index da2871c..87fdb1b 100644 --- a/oven-sh/bun/workspace.go +++ b/oven-sh/bun/workspace.go @@ -8,7 +8,7 @@ import ( ) type Workspace struct { - Packages []string `yaml:"packages"` + Packages []string `json:"packages" yaml:"packages"` } func LoadWorkspace(filename string) (*Workspace, error) { diff --git a/pnpm/pnpm/workspace.go b/pnpm/pnpm/workspace.go index 53469ab..04b4b9c 100644 --- a/pnpm/pnpm/workspace.go +++ b/pnpm/pnpm/workspace.go @@ -8,7 +8,7 @@ import ( ) type Workspace struct { - Packages []string `yaml:"packages"` + Packages []string `json:"packages" yaml:"packages"` } func LoadWorkspace(filename string) (*Workspace, error) {