Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Per-Route Options in the Apps and the App commands [v8] #3409

Merged
merged 4 commits into from
Feb 19, 2025
Merged

Remove Per-Route Options in the Apps and the App commands [v8] #3409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16a5c5f
cf apps output too versbose
Dariquest Feb 6, 2025
0c5141d
cf apps output app summary
Dariquest Feb 13, 2025
762fd1d
Merge branch 'v8' into appsCommandOutputV8
Dariquest Feb 14, 2025
540e4d9
One additional unit test
Dariquest Feb 14, 2025
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
2 changes: 1 addition & 1 deletion command/v7/apps_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (cmd AppsCommand) Execute(args []string) error {
func getURLs(routes []resources.Route) string {
var routeURLs []string
for _, route := range routes {
routeURLs = append(routeURLs, route.URL+route.FormattedOptions())
routeURLs = append(routeURLs, route.URL)
}

return strings.Join(routeURLs, ", ")
Expand Down
2 changes: 1 addition & 1 deletion command/v7/apps_command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ var _ = Describe("apps Command", func() {
Expect(testUI.Out).To(Say(`Getting apps in org some-org / space some-space as steve\.\.\.`))

Expect(testUI.Out).To(Say(`name\s+requested state\s+processes\s+routes`))
Expect(testUI.Out).To(Say(`some-app-1\s+started\s+web:2/2, console:0/0, worker:0/1\s+some-app-1.some-other-domain {loadbalancing=least-connection}, some-app-1.some-domain`))
Expect(testUI.Out).To(Say(`some-app-1\s+started\s+web:2/2, console:0/0, worker:0/1\s+some-app-1.some-other-domain, some-app-1.some-domain`))

Expect(testUI.Err).To(Say("warning-1"))
Expect(testUI.Err).To(Say("warning-2"))
Expand Down
2 changes: 1 addition & 1 deletion command/v7/shared/app_summary_displayer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (display AppSummaryDisplayer) AppDisplay(summary v7action.DetailedApplicati
func routeSummary(rs []resources.Route) string {
formattedRoutes := []string{}
for _, route := range rs {
formattedRoutes = append(formattedRoutes, route.URL+route.FormattedOptions())
formattedRoutes = append(formattedRoutes, route.URL)
}
return strings.Join(formattedRoutes, ", ")
}
Expand Down
4 changes: 2 additions & 2 deletions command/v7/shared/app_summary_displayer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@ var _ = Describe("app summary displayer", func() {
}
})

It("displays routes", func() {
Expect(testUI.Out).To(Say(`routes:\s+%s, %s`, "route1.example.com {loadbalancing=least-connection}", "route2.example.com"))
It("displays routes without their options", func() {
Expect(testUI.Out).To(Say(`routes:\s+%s, %s`, "route1.example.com", "route2.example.com"))
})
})

Expand Down
Loading