jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move var init to where they're used

mine
Raphaël Pinson 2020-12-10 20:34:48 +01:00
parent eb35fffd22
commit ce8a30dc88
No known key found for this signature in database
GPG Key ID: A1AAC49E10CB2A8D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/xray/application.go
View File

@ -39,9 +39,6 @@ func (a *Application) Render(ctx context.Context, ns string, o interface{}) erro
root := NewTreeNode("argoproj.io/v1alpha1/applications", client.FQN(app.Namespace, app.Name)) root := NewTreeNode("argoproj.io/v1alpha1/applications", client.FQN(app.Namespace, app.Name))
ctx = context.WithValue(ctx, KeyParent, root) ctx = context.WithValue(ctx, KeyParent, root)
var ar ApplicationResource
var dp Deployment
var svc Service
f, ok := ctx.Value(internal.KeyFactory).(dao.Factory) f, ok := ctx.Value(internal.KeyFactory).(dao.Factory)
if !ok { if !ok {
return fmt.Errorf("Expecting a factory but got %T", ctx.Value(internal.KeyFactory)) return fmt.Errorf("Expecting a factory but got %T", ctx.Value(internal.KeyFactory))
@ -50,6 +47,7 @@ func (a *Application) Render(ctx context.Context, ns string, o interface{}) erro
gvr := gvkToGvr(res.GroupVersionKind()) gvr := gvkToGvr(res.GroupVersionKind())
switch gvr.String() { switch gvr.String() {
case "apps/v1/deployments": case "apps/v1/deployments":
var dp Deployment
d, err := f.Get("apps/v1/deployments", fmt.Sprintf("%s/%s", res.Namespace, res.Name), true, labels.Everything()) d, err := f.Get("apps/v1/deployments", fmt.Sprintf("%s/%s", res.Namespace, res.Name), true, labels.Everything())
if err != nil { if err != nil {
return err return err
@ -60,6 +58,7 @@ func (a *Application) Render(ctx context.Context, ns string, o interface{}) erro
} }
case "v1/services": case "v1/services":
var svc Service
d, err := f.Get("v1/services", fmt.Sprintf("%s/%s", res.Namespace, res.Name), true, labels.Everything()) d, err := f.Get("v1/services", fmt.Sprintf("%s/%s", res.Namespace, res.Name), true, labels.Everything())
if err != nil { if err != nil {
return err return err
@ -70,6 +69,7 @@ func (a *Application) Render(ctx context.Context, ns string, o interface{}) erro
} }
default: default:
var ar ApplicationResource
if err := ar.Render(ctx, app.Namespace, res); err != nil { if err := ar.Render(ctx, app.Namespace, res); err != nil {
return err return err
} }