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

mine
Jayson Wang 2024-08-16 08:10:03 +08:00 committed by GitHub
parent b3fbf32522
commit 92bd181ac0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
18 changed files with 34 additions and 18 deletions

View File

@ -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)

View File

@ -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()))
}

View File

@ -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
}

View File

@ -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)

View File

@ -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)

View File

@ -28,7 +28,9 @@ func NewDeploy(gvr client.GVR) ResourceViewer {
NewRestartExtender(
NewScaleExtender(
NewImageExtender(
NewLogsExtender(NewBrowser(gvr), d.logOptions),
NewOwnerExtender(
NewLogsExtender(NewBrowser(gvr), d.logOptions),
),
),
),
),

View File

@ -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()))
}

View File

@ -24,7 +24,9 @@ func NewDaemonSet(gvr client.GVR) ResourceViewer {
NewVulnerabilityExtender(
NewRestartExtender(
NewImageExtender(
NewLogsExtender(NewBrowser(gvr), d.logOptions),
NewOwnerExtender(
NewLogsExtender(NewBrowser(gvr), d.logOptions),
),
),
),
),

View File

@ -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()))
}

View File

@ -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)

View File

@ -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()))
}

View File

@ -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)

View File

@ -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)

View File

@ -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()))
}

View File

@ -25,7 +25,9 @@ func NewStatefulSet(gvr client.GVR) ResourceViewer {
NewRestartExtender(
NewScaleExtender(
NewImageExtender(
NewLogsExtender(NewBrowser(gvr), s.logOptions),
NewOwnerExtender(
NewLogsExtender(NewBrowser(gvr), s.logOptions),
),
),
),
),

View File

@ -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()))
}

View File

@ -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)

View File

@ -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()))
}