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

@@ -7,7 +7,6 @@ import (
"os"
"strings"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
@@ -108,7 +107,7 @@ func CommandList() error {
// CommandRebuildall rebuilds network settings for all apps
func CommandRebuildall() error {
apps, err := apps.DokkuApps()
apps, err := common.DokkuApps()
if err != nil {
return err
}
@@ -126,7 +125,7 @@ func CommandRebuildall() error {
// CommandReport displays a network 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
}

View File

@@ -7,7 +7,6 @@ import (
"strings"
"unicode/utf8"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
)
@@ -34,7 +33,7 @@ func TriggerInstall() error {
return fmt.Errorf("Unable to install the network plugin: %s", err.Error())
}
apps, err := apps.DokkuApps()
apps, err := common.DokkuApps()
if err != nil {
return nil
}