Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

feature: support filtering by workspace provider when listing environ… #282

Merged
merged 6 commits into from
Mar 11, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix aggregator bugs
  • Loading branch information
Faris Huskovic committed Mar 11, 2021
commit d602614df8dfbda681209f766122b8445e1282b8
Binary file added coder
Binary file not shown.
23 changes: 18 additions & 5 deletions internal/cmd/resourcemanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,16 +161,16 @@ func aggregateByProvider(providers []coder.KubernetesProvider, orgs []coder.Orga
}
providerEnvs := make(map[string][]coder.Environment, len(orgs))
for _, e := range envs {
if options.user != "" && providerIDMap[e.ResourcePoolID].Name != options.provider {
if options.provider != "" && providerIDMap[e.ResourcePoolID].Name != options.provider {
continue
}
providerEnvs[e.OrganizationID] = append(providerEnvs[e.OrganizationID], e)
providerEnvs[e.ResourcePoolID] = append(providerEnvs[e.ResourcePoolID], e)
}
for _, o := range orgs {
if options.org != "" && o.Name != options.org {
for _, p := range providers {
if options.provider != "" && p.Name != options.provider {
continue
}
groups = append(groups, orgGrouping{org: o, envs: providerEnvs[o.ID]})
groups = append(groups, providerGrouping{provider: p, envs: providerEnvs[p.ID]})
}
return groups, providerLabeler{providerIDMap}
}
Expand Down Expand Up @@ -211,6 +211,19 @@ func (o orgGrouping) header() string {
return fmt.Sprintf("%s\t(%v member%s)", truncate(o.org.Name, 20, "..."), len(o.org.Members), plural)
}

type providerGrouping struct {
provider coder.KubernetesProvider
envs []coder.Environment
}

func (p providerGrouping) environments() []coder.Environment {
return p.envs
}

func (p providerGrouping) header() string {
return fmt.Sprintf("%s\t", truncate(p.provider.Name, 20, "..."))
}

func printResourceTop(writer io.Writer, groups []groupable, labeler envLabeler, showEmptyGroups bool, sortBy string) error {
tabwriter := tabwriter.NewWriter(writer, 0, 0, 4, ' ', 0)
defer func() { _ = tabwriter.Flush() }()
Expand Down