github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove APITopologyDesc.filter

Browse Source 
It's always set to render.FilterUnconnectedPseudo, so we can simply
use that constant in the one function (RendererForTopology) that
looked at that value.
This commit is contained in:
Matthias Radestock
2018-01-02 10:33:57 +00:00
parent dd41956d60
commit d1bb4aa45e
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/api_topologies.go
View File

@@ -200,7 +200,6 @@ func MakeRegistry() *Registry {
APITopologyDesc{
id: processesID,
renderer: render.ProcessWithContainerNameRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "Processes",
Rank: 1,
Options: unconnectedFilter,
@@ -210,7 +209,6 @@ func MakeRegistry() *Registry {
id: processesByNameID,
parent: processesID,
renderer: render.ProcessNameRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "by name",
Options: unconnectedFilter,
HideIfEmpty: true,
@@ -218,7 +216,6 @@ func MakeRegistry() *Registry {
APITopologyDesc{
id: containersID,
renderer: render.ContainerWithImageNameRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "Containers",
Rank: 2,
Options: containerFilters,
@@ -227,7 +224,6 @@ func MakeRegistry() *Registry {
id: containersByHostnameID,
parent: containersID,
renderer: render.ContainerHostnameRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "by DNS name",
Options: containerFilters,
},
@@ -235,14 +231,12 @@ func MakeRegistry() *Registry {
id: containersByImageID,
parent: containersID,
renderer: render.ContainerImageRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "by image",
Options: containerFilters,
},
APITopologyDesc{
id: podsID,
renderer: render.PodRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "Pods",
Rank: 3,
Options: []APITopologyOptionGroup{unmanagedFilter},
@@ -252,7 +246,6 @@ func MakeRegistry() *Registry {
id: kubeControllersID,
parent: podsID,
renderer: render.KubeControllerRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "controllers",
Options: []APITopologyOptionGroup{unmanagedFilter},
HideIfEmpty: true,
@@ -261,7 +254,6 @@ func MakeRegistry() *Registry {
id: servicesID,
parent: podsID,
renderer: render.PodServiceRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "services",
Options: []APITopologyOptionGroup{unmanagedFilter},
HideIfEmpty: true,
@@ -269,7 +261,6 @@ func MakeRegistry() *Registry {
APITopologyDesc{
id: ecsTasksID,
renderer: render.ECSTaskRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "Tasks",
Rank: 3,
Options: []APITopologyOptionGroup{unmanagedFilter},
@@ -279,7 +270,6 @@ func MakeRegistry() *Registry {
id: ecsServicesID,
parent: ecsTasksID,
renderer: render.ECSServiceRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "services",
Options: []APITopologyOptionGroup{unmanagedFilter},
HideIfEmpty: true,
@@ -287,7 +277,6 @@ func MakeRegistry() *Registry {
APITopologyDesc{
id: swarmServicesID,
renderer: render.SwarmServiceRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "services",
Rank: 3,
Options: []APITopologyOptionGroup{unmanagedFilter},
@@ -296,7 +285,6 @@ func MakeRegistry() *Registry {
APITopologyDesc{
id: hostsID,
renderer: render.HostRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "Hosts",
Rank: 4,
},
@@ -304,7 +292,6 @@ func MakeRegistry() *Registry {
id: weaveID,
parent: hostsID,
renderer: render.WeaveRenderer,
filter: render.FilterUnconnectedPseudo,
Name: "Weave Net",
},
)
@@ -317,7 +304,6 @@ type APITopologyDesc struct {
id string
parent string
renderer render.Renderer
filter render.Transformer
Name string `json:"name"`
Rank int `json:"rank"`
@@ -541,7 +527,7 @@ func (r *Registry) RendererForTopology(topologyID string, values url.Values, rpt
if len(values) == 0 {
// if no options where provided, only apply base filter
return topology.renderer, topology.filter, nil
return topology.renderer, render.FilterUnconnectedPseudo, nil
}
var filters []render.FilterFunc
@@ -552,9 +538,9 @@ func (r *Registry) RendererForTopology(topologyID string, values url.Values, rpt
}
}
if len(filters) > 0 {
return topology.renderer, render.Transformers([]render.Transformer{render.ComposeFilterFuncs(filters...), topology.filter}), nil
return topology.renderer, render.Transformers([]render.Transformer{render.ComposeFilterFuncs(filters...), render.FilterUnconnectedPseudo}), nil
}
return topology.renderer, topology.filter, nil
return topology.renderer, render.FilterUnconnectedPseudo, nil
}
type reporterHandler func(context.Context, Reporter, http.ResponseWriter, *http.Request)