refactor: move app listing back to common

Without this, we'd need to duplicate some logic or make it more complex via a plugin trigger.
This commit is contained in:
Jose Diaz-Gonzalez
2022-02-26 02:55:34 -05:00
parent 90eb5462f7
commit ac58b502c5
27 changed files with 83 additions and 128 deletions

View File

@@ -10,7 +10,6 @@ import (
"strings"
"time"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
"github.com/joncalhoun/qson"
)
@@ -157,7 +156,7 @@ func sinkValueToConfig(appName string, sinkValue string) (vectorSink, error) {
}
func writeVectorConfig() error {
apps, _ := apps.DokkuApps()
apps, _ := common.DokkuApps()
data := vectorConfig{
Sources: map[string]vectorSource{},
Sinks: map[string]vectorSink{},

View File

@@ -7,7 +7,6 @@ import (
"strconv"
"time"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
@@ -53,7 +52,7 @@ func CommandFailed(appName string, allApps bool) error {
// CommandReport displays a logs report for one or more apps
func CommandReport(appName string, format string, infoFlag string) error {
if len(appName) == 0 {
apps, err := apps.DokkuApps()
apps, err := common.DokkuApps()
if err != nil {
return err
}