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

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

View File

@@ -4,12 +4,15 @@ 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/docker-options v0.0.0-20210208020425-f7beb3d95ddd
github.com/dokku/dokku/plugins/docker-options v0.0.0-00010101000000-000000000000
github.com/joncalhoun/qson v0.0.0-20200422171543-84433dcd3da0
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/docker-options => ../docker-options

View File

@@ -7,6 +7,7 @@ import (
"strconv"
"time"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
@@ -52,7 +53,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 := common.DokkuApps()
apps, err := apps.DokkuApps()
if err != nil {
return err
}