enable "jump to owner" for more kinds (derailed#2763)

uozalp · Sep 2, 2024 · 7e42c09 · 7e42c09
1 parent 874efc2
commit 7e42c09
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 18 deletions.
diff --git a/internal/view/cm.go b/internal/view/cm.go
@@ -21,7 +21,9 @@ type ConfigMap struct {
 // NewConfigMap returns a new viewer.
 func NewConfigMap(gvr client.GVR) ResourceViewer {
 	s := ConfigMap{
-		ResourceViewer: NewBrowser(gvr),
+		ResourceViewer: NewOwnerExtender(
+			NewBrowser(gvr),
+		),
 	}
 	s.AddBindKeysFn(s.bindKeys)
 

diff --git a/internal/view/cm_test.go b/internal/view/cm_test.go
@@ -16,5 +16,5 @@ func TestConfigMapNew(t *testing.T) {
 
 	assert.Nil(t, s.Init(makeCtx()))
 	assert.Equal(t, "ConfigMaps", s.Name())
-	assert.Equal(t, 6, len(s.Hints()))
+	assert.Equal(t, 7, len(s.Hints()))
 }
diff --git a/internal/view/command.go b/internal/view/command.go
@@ -286,7 +286,11 @@ func (c *Command) viewMetaFor(p *cmd.Interpreter) (client.GVR, *MetaViewer, erro
 		p.Amend(ap)
 	}
 
-	v := MetaViewer{viewerFn: NewBrowser}
+	v := MetaViewer{
+		viewerFn: func(gvr client.GVR) ResourceViewer {
+			return NewOwnerExtender(NewBrowser(gvr))
+		},
+	}
 	if mv, ok := customViewers[gvr]; ok {
 		v = mv
 	}

diff --git a/internal/view/crd.go b/internal/view/crd.go
@@ -16,7 +16,7 @@ type CRD struct {
 // NewCRD returns a new viewer.
 func NewCRD(gvr client.GVR) ResourceViewer {
 	s := CRD{
-		ResourceViewer: NewBrowser(gvr),
+		ResourceViewer: NewOwnerExtender(NewBrowser(gvr)),
 	}
 	s.AddBindKeysFn(s.bindKeys)
 	s.GetTable().SetEnterFn(s.showCRD)

diff --git a/internal/view/cronjob.go b/internal/view/cronjob.go
@@ -35,7 +35,9 @@ type CronJob struct {
 
 // NewCronJob returns a new viewer.
 func NewCronJob(gvr client.GVR) ResourceViewer {
-	c := CronJob{ResourceViewer: NewVulnerabilityExtender(NewBrowser(gvr))}
+	c := CronJob{ResourceViewer: NewVulnerabilityExtender(
+		NewOwnerExtender(NewBrowser(gvr)),
+	)}
 	c.AddBindKeysFn(c.bindKeys)
 	c.GetTable().SetEnterFn(c.showJobs)
 

diff --git a/internal/view/dp.go b/internal/view/dp.go
@@ -28,7 +28,9 @@ func NewDeploy(gvr client.GVR) ResourceViewer {
 			NewRestartExtender(
 				NewScaleExtender(
 					NewImageExtender(
-						NewLogsExtender(NewBrowser(gvr), d.logOptions),
+						NewOwnerExtender(
+							NewLogsExtender(NewBrowser(gvr), d.logOptions),
+						),
 					),
 				),
 			),

diff --git a/internal/view/dp_test.go b/internal/view/dp_test.go
@@ -16,5 +16,5 @@ func TestDeploy(t *testing.T) {
 
 	assert.Nil(t, v.Init(makeCtx()))
 	assert.Equal(t, "Deployments", v.Name())
-	assert.Equal(t, 15, len(v.Hints()))
+	assert.Equal(t, 16, len(v.Hints()))
 }
diff --git a/internal/view/ds.go b/internal/view/ds.go
@@ -24,7 +24,9 @@ func NewDaemonSet(gvr client.GVR) ResourceViewer {
 		NewVulnerabilityExtender(
 			NewRestartExtender(
 				NewImageExtender(
-					NewLogsExtender(NewBrowser(gvr), d.logOptions),
+					NewOwnerExtender(
+						NewLogsExtender(NewBrowser(gvr), d.logOptions),
+					),
 				),
 			),
 		),

diff --git a/internal/view/ds_test.go b/internal/view/ds_test.go
@@ -16,5 +16,5 @@ func TestDaemonSet(t *testing.T) {
 
 	assert.Nil(t, v.Init(makeCtx()))
 	assert.Equal(t, "DaemonSets", v.Name())
-	assert.Equal(t, 16, len(v.Hints()))
+	assert.Equal(t, 17, len(v.Hints()))
 }
diff --git a/internal/view/pvc.go b/internal/view/pvc.go
@@ -18,7 +18,7 @@ type PersistentVolumeClaim struct {
 // NewPersistentVolumeClaim returns a new viewer.
 func NewPersistentVolumeClaim(gvr client.GVR) ResourceViewer {
 	v := PersistentVolumeClaim{
-		ResourceViewer: NewBrowser(gvr),
+		ResourceViewer: NewOwnerExtender(NewBrowser(gvr)),
 	}
 	v.AddBindKeysFn(v.bindKeys)
 

diff --git a/internal/view/pvc_test.go b/internal/view/pvc_test.go
@@ -16,5 +16,5 @@ func TestPVCNew(t *testing.T) {
 
 	assert.Nil(t, v.Init(makeCtx()))
 	assert.Equal(t, "PersistentVolumeClaims", v.Name())
-	assert.Equal(t, 10, len(v.Hints()))
+	assert.Equal(t, 11, len(v.Hints()))
 }
diff --git a/internal/view/sa.go b/internal/view/sa.go
@@ -21,7 +21,7 @@ type ServiceAccount struct {
 // NewServiceAccount returns a new viewer.
 func NewServiceAccount(gvr client.GVR) ResourceViewer {
 	s := ServiceAccount{
-		ResourceViewer: NewBrowser(gvr),
+		ResourceViewer: NewOwnerExtender(NewBrowser(gvr)),
 	}
 	s.AddBindKeysFn(s.bindKeys)
 	s.SetContextFn(s.subjectCtx)

diff --git a/internal/view/secret.go b/internal/view/secret.go
@@ -21,7 +21,7 @@ type Secret struct {
 // NewSecret returns a new viewer.
 func NewSecret(gvr client.GVR) ResourceViewer {
 	s := Secret{
-		ResourceViewer: NewBrowser(gvr),
+		ResourceViewer: NewOwnerExtender(NewBrowser(gvr)),
 	}
 	s.AddBindKeysFn(s.bindKeys)
 

diff --git a/internal/view/secret_test.go b/internal/view/secret_test.go
@@ -16,5 +16,5 @@ func TestSecretNew(t *testing.T) {
 
 	assert.Nil(t, s.Init(makeCtx()))
 	assert.Equal(t, "Secrets", s.Name())
-	assert.Equal(t, 7, len(s.Hints()))
+	assert.Equal(t, 8, len(s.Hints()))
 }
diff --git a/internal/view/sts.go b/internal/view/sts.go
@@ -25,7 +25,9 @@ func NewStatefulSet(gvr client.GVR) ResourceViewer {
 			NewRestartExtender(
 				NewScaleExtender(
 					NewImageExtender(
-						NewLogsExtender(NewBrowser(gvr), s.logOptions),
+						NewOwnerExtender(
+							NewLogsExtender(NewBrowser(gvr), s.logOptions),
+						),
 					),
 				),
 			),

diff --git a/internal/view/sts_test.go b/internal/view/sts_test.go
@@ -16,5 +16,5 @@ func TestStatefulSetNew(t *testing.T) {
 
 	assert.Nil(t, s.Init(makeCtx()))
 	assert.Equal(t, "StatefulSets", s.Name())
-	assert.Equal(t, 13, len(s.Hints()))
+	assert.Equal(t, 14, len(s.Hints()))
 }
diff --git a/internal/view/svc.go b/internal/view/svc.go
@@ -35,7 +35,9 @@ type Service struct {
 func NewService(gvr client.GVR) ResourceViewer {
 	s := Service{
 		ResourceViewer: NewPortForwardExtender(
-			NewLogsExtender(NewBrowser(gvr), nil),
+			NewOwnerExtender(
+				NewLogsExtender(NewBrowser(gvr), nil),
+			),
 		),
 	}
 	s.AddBindKeysFn(s.bindKeys)

diff --git a/internal/view/svc_test.go b/internal/view/svc_test.go
@@ -173,5 +173,5 @@ func TestServiceNew(t *testing.T) {
 
 	assert.Nil(t, s.Init(makeCtx()))
 	assert.Equal(t, "Services", s.Name())
-	assert.Equal(t, 11, len(s.Hints()))
+	assert.Equal(t, 12, len(s.Hints()))
 }