From 7a6bdc1d745615056e966aaf0244c93bf2cb5726 Mon Sep 17 00:00:00 2001 From: derailed Date: Sat, 4 Jan 2020 16:23:55 -0700 Subject: [PATCH] cleaning up --- go.sum | 4 ++++ internal/client/helpers.go | 2 +- internal/dao/alias.go | 3 ++- internal/dao/chart.go | 1 + internal/dao/node.go | 2 ++ internal/dao/non_resource.go | 1 + internal/dao/port_forward.go | 6 +++--- internal/dao/screen_dump.go | 2 +- internal/model/table.go | 2 +- internal/model/types.go | 8 +------- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/go.sum b/go.sum index ede18e0e..b37542d1 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-autorest/autorest v0.9.0 h1:MRvx8gncNaXJqOoLmhNjUAKh33JJF8LyxPhomEtOsjs= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -39,6 +40,7 @@ github.com/Masterminds/sprig/v3 v3.0.2 h1:wz22D0CiSctrliXiI9ZO3HoNApweeRGftyDN+B github.com/Masterminds/sprig/v3 v3.0.2/go.mod h1:oesJ8kPONMONaZgtiHNzUShJbksypC5kWczhZAf6+aU= github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= +github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc= github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/hcsshim v0.0.0-20190417211021-672e52e9209d/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= @@ -102,6 +104,7 @@ github.com/containerd/containerd v1.0.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX github.com/containerd/containerd v1.3.0-beta.2.0.20190823190603-4a2f61c4f2b4/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= github.com/containerd/containerd v1.3.0 h1:xjvXQWABwS2uiv3TWgQt5Uth60Gu86LTGZXMJkjc7rY= github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= +github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 h1:4BX8f882bXEDKfWIf0wa8HRvpnBoPszJJXL+TVbBw4M= github.com/containerd/continuity v0.0.0-20181203112020-004b46473808/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/typeurl v0.0.0-20190228175220-2a93cfde8c20/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= @@ -371,6 +374,7 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= diff --git a/internal/client/helpers.go b/internal/client/helpers.go index 89ff92cf..1da68c1a 100644 --- a/internal/client/helpers.go +++ b/internal/client/helpers.go @@ -11,7 +11,7 @@ import ( var toFileName = regexp.MustCompile(`[^(\w/\.)]`) -// ClusterWide returns true if ns designates cluster scope, false otherwise. +// IsClusterWide returns true if ns designates cluster scope, false otherwise. func IsClusterWide(ns string) bool { return ns == NamespaceAll || ns == AllNamespaces || ns == ClusterScope } diff --git a/internal/dao/alias.go b/internal/dao/alias.go index b3619feb..7f432d80 100644 --- a/internal/dao/alias.go +++ b/internal/dao/alias.go @@ -62,7 +62,7 @@ func (a *Alias) List(ctx context.Context, _ string) ([]runtime.Object, error) { return oo, nil } -// GVR returns a matching gvr if it exists. +// AsGVR returns a matching gvr if it exists. func (a *Alias) AsGVR(cmd string) (client.GVR, bool) { gvr, ok := a.Aliases.Get(cmd) if ok { @@ -71,6 +71,7 @@ func (a *Alias) AsGVR(cmd string) (client.GVR, bool) { return client.GVR{}, false } +// Get fetch a resource. func (a *Alias) Get(_ context.Context, _ string) (runtime.Object, error) { panic("NYI!") } diff --git a/internal/dao/chart.go b/internal/dao/chart.go index f6da343e..e69aa050 100644 --- a/internal/dao/chart.go +++ b/internal/dao/chart.go @@ -109,6 +109,7 @@ func (c *Chart) Delete(path string, cascade, force bool) error { return nil } +// EnsureHelmConfig return a new configuration. func (c *Chart) EnsureHelmConfig(ns string) (*action.Configuration, error) { cfg := new(action.Configuration) flags := c.Client().Config().Flags() diff --git a/internal/dao/node.go b/internal/dao/node.go index d7dc9a5a..fc9d6570 100644 --- a/internal/dao/node.go +++ b/internal/dao/node.go @@ -17,6 +17,7 @@ var ( _ Accessor = (*Node)(nil) ) +// NodeMetricsFunc retrieves node metrics. type NodeMetricsFunc func() (*mv1beta1.NodeMetricsList, error) // Node represents a node model. @@ -54,6 +55,7 @@ func (n *Node) List(ctx context.Context, ns string) ([]runtime.Object, error) { // ---------------------------------------------------------------------------- // Helpers... +// FetchNodes retrieves all nodes. func FetchNodes(f Factory) (*v1.NodeList, error) { auth, err := f.Client().CanI("", "v1/nodes", []string{"list"}) if !auth || err != nil { diff --git a/internal/dao/non_resource.go b/internal/dao/non_resource.go index 59e5d547..30ab4a5b 100644 --- a/internal/dao/non_resource.go +++ b/internal/dao/non_resource.go @@ -20,6 +20,7 @@ func (g *NonResource) Init(f Factory, gvr client.GVR) { g.Factory, g.gvr = f, gvr } +// GVR returns a gvr. func (g *NonResource) GVR() string { return g.gvr.String() } diff --git a/internal/dao/port_forward.go b/internal/dao/port_forward.go index efd8f125..815ee91a 100644 --- a/internal/dao/port_forward.go +++ b/internal/dao/port_forward.go @@ -35,15 +35,15 @@ func (p *PortForward) Delete(path string, cascade, force bool) error { } // List returns a collection of screen dumps. -func (c *PortForward) List(ctx context.Context, _ string) ([]runtime.Object, error) { +func (p *PortForward) List(ctx context.Context, _ string) ([]runtime.Object, error) { config, ok := ctx.Value(internal.KeyBenchCfg).(*config.Bench) if !ok { return nil, fmt.Errorf("no benchconfig found in context") } cc := config.Benchmarks.Containers - oo := make([]runtime.Object, 0, len(c.Factory.Forwarders())) - for _, f := range c.Factory.Forwarders() { + oo := make([]runtime.Object, 0, len(p.Factory.Forwarders())) + for _, f := range p.Factory.Forwarders() { cfg := render.BenchCfg{ C: config.Benchmarks.Defaults.C, N: config.Benchmarks.Defaults.N, diff --git a/internal/dao/screen_dump.go b/internal/dao/screen_dump.go index 51bdf11d..3ceed3ed 100644 --- a/internal/dao/screen_dump.go +++ b/internal/dao/screen_dump.go @@ -27,7 +27,7 @@ func (d *ScreenDump) Delete(path string, cascade, force bool) error { } // List returns a collection of screen dumps. -func (c *ScreenDump) List(ctx context.Context, _ string) ([]runtime.Object, error) { +func (d *ScreenDump) List(ctx context.Context, _ string) ([]runtime.Object, error) { dir, ok := ctx.Value(internal.KeyDir).(string) if !ok { return nil, errors.New("no screendump dir found in context") diff --git a/internal/model/table.go b/internal/model/table.go index b067dfd0..16e40018 100644 --- a/internal/model/table.go +++ b/internal/model/table.go @@ -78,8 +78,8 @@ func (t *Table) Get(ctx context.Context, path string) (runtime.Object, error) { return meta.DAO.Get(ctx, path) } +// Delete removes a resource. func (t *Table) Delete(ctx context.Context, path string, cascade, force bool) error { - log.Debug().Msgf("TABLE DELETE %q", path) meta, err := t.getMeta(ctx) if err != nil { return err diff --git a/internal/model/types.go b/internal/model/types.go index e78af135..3a6b3584 100644 --- a/internal/model/types.go +++ b/internal/model/types.go @@ -55,27 +55,21 @@ type Renderer interface { ColorerFunc() render.ColorerFunc } +// Cruder performs crud operations. type Cruder interface { // List returns a collection of resources. List(ctx context.Context, ns string) ([]runtime.Object, error) // Get returns a resource instance. Get(ctx context.Context, path string) (runtime.Object, error) - - // Delete removes a resource. - // Delete(ctx context.Context, path string) error } // Lister represents a resource lister. type Lister interface { Cruder - // Describer // Init initializes a resource. Init(ns, gvr string, f dao.Factory) - - // Hydrate converts resource rows into tabular data. - // Hydrate(oo []runtime.Object, rr render.Rows, r Renderer) error } // Describer represents a resource describer.