refactor: move apps listing from common plugin to apps plugin

This helps centralize app-related listing fetching.
This commit is contained in:
Jose Diaz-Gonzalez
2021-11-12 15:54:08 -05:00
parent 9d8de8a9db
commit 62a3eff5bb
45 changed files with 136 additions and 55 deletions

View File

@@ -4,11 +4,14 @@ go 1.16
require (
github.com/codeskyblue/go-sh v0.0.0-20190412065543-76bd3d59ff27
github.com/dokku/dokku/plugins/apps v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/config v0.0.0-00010101000000-000000000000
github.com/spf13/pflag v1.0.5
)
replace github.com/dokku/dokku/plugins/apps => ../apps
replace github.com/dokku/dokku/plugins/common => ../common
replace github.com/dokku/dokku/plugins/config => ../config

View File

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

View File

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