github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: move apps listing from common plugin to apps plugin

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/app-json/go.mod
View File

@@ -3,10 +3,13 @@ module github.com/dokku/dokku/plugins/app-json
go 1.16
require (
github.com/dokku/dokku/plugins/apps v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
github.com/spf13/pflag v1.0.5
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
)
replace github.com/dokku/dokku/plugins/apps => ../apps
replace github.com/dokku/dokku/plugins/common => ../common

3
plugins/app-json/subcommands.go
View File

@@ -1,13 +1,14 @@
package appjson
import (
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
// 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
}

2
plugins/apps/Makefile
View File

@@ -1,5 +1,5 @@
SUBCOMMANDS = subcommands/clone subcommands/create subcommands/destroy subcommands/exists subcommands/list subcommands/lock subcommands/locked subcommands/rename subcommands/report subcommands/unlock
TRIGGERS = triggers/app-create triggers/app-destroy triggers/app-exists triggers/app-maybe-create triggers/deploy-source-set triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report
TRIGGERS = triggers/app-create triggers/app-destroy triggers/app-exists triggers/app-list triggers/app-maybe-create triggers/deploy-source-set triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report
BUILD = commands subcommands triggers
PLUGIN_NAME = apps

35
plugins/apps/apps.go
View File

@@ -1,5 +1,13 @@
package apps
import (
"fmt"
"io/ioutil"
"strings"
"github.com/dokku/dokku/plugins/common"
)
var (
// DefaultProperties is a map of all valid network properties with corresponding default property values
DefaultProperties = map[string]string{
@@ -13,3 +21,30 @@ var (
"deploy-source-metadata": true,
}
)
// DokkuApps returns a list of all local apps
func DokkuApps() ([]string, error) {
apps := []string{}
dokkuRoot := common.MustGetEnv("DOKKU_ROOT")
files, err := ioutil.ReadDir(dokkuRoot)
if err != nil {
return apps, fmt.Errorf("You haven't deployed any applications yet")
}
for _, f := range files {
appRoot := common.AppRoot(f.Name())
if !common.DirectoryExists(appRoot) {
continue
}
if strings.HasPrefix(f.Name(), ".") {
continue
}
apps = append(apps, f.Name())
}
if len(apps) == 0 {
return apps, fmt.Errorf("You haven't deployed any applications yet")
}
return apps, nil
}

2
plugins/apps/src/triggers/triggers.go
View File

@@ -27,6 +27,8 @@ func main() {
case "app-exists":
appName := flag.Arg(0)
err = apps.TriggerAppExists(appName)
case "app-list":
err = apps.TriggerAppList()
case "app-maybe-create":
appName := flag.Arg(0)
err = apps.TriggerAppMaybeCreate(appName)

4
plugins/apps/subcommands.go
View File

@@ -85,7 +85,7 @@ func CommandExists(appName string) error {
// CommandList lists all apps
func CommandList() error {
common.LogInfo2Quiet("My Apps")
apps, err := common.DokkuApps()
apps, err := DokkuApps()
if err != nil {
common.LogWarn(err.Error())
return nil
@@ -177,7 +177,7 @@ func CommandRename(oldAppName string, newAppName string, skipDeploy bool) error
// CommandReport displays an app 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 := DokkuApps()
if err != nil {
return err
}

10
plugins/apps/triggers.go
View File

@@ -21,6 +21,16 @@ func TriggerAppExists(appName string) error {
return appExists(appName)
}
// TriggerAppList outputs each app name to stdout on a newline
func TriggerAppList() error {
apps, _ := DokkuApps()
for _, app := range apps {
common.Log(app)
}
return nil
}
// TriggerAppMaybeCreate is a trigger to allow gated app creation
func TriggerAppMaybeCreate(appName string) error {
return maybeCreateApp(appName)

3
plugins/builder-dockerfile/internal-functions
View File

@@ -9,7 +9,6 @@ cmd-builder-dockerfile-report() {
declare cmd="builder-dockerfile:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -21,7 +20,7 @@ cmd-builder-dockerfile-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-builder-dockerfile-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/builder-pack/internal-functions
View File

@@ -9,7 +9,6 @@ cmd-builder-pack-report() {
declare cmd="builder-pack:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -21,7 +20,7 @@ cmd-builder-pack-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-builder-pack-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/builder/go.mod
View File

@@ -3,9 +3,12 @@ module github.com/dokku/dokku/plugins/builder
go 1.16
require (
github.com/dokku/dokku/plugins/apps v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
github.com/otiai10/copy v1.6.0
github.com/spf13/pflag v1.0.5
)
replace github.com/dokku/dokku/plugins/apps => ../apps
replace github.com/dokku/dokku/plugins/common => ../common

3
plugins/builder/subcommands.go
View File

@@ -1,13 +1,14 @@
package builder
import (
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
// CommandReport displays a builder 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
}

3
plugins/buildpacks/go.mod
View File

@@ -3,8 +3,11 @@ module github.com/dokku/dokku/plugins/buildpacks
go 1.16
require (
github.com/dokku/dokku/plugins/apps v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/common 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

3
plugins/buildpacks/subcommands.go
View File

@@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
@@ -106,7 +107,7 @@ func CommandRemove(appName string, buildpack string, index int) (err error) {
// CommandReport displays a buildpacks 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
}

3
plugins/certs/internal-functions
View File

@@ -9,7 +9,6 @@ cmd-certs-report() {
declare cmd="certs:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -21,7 +20,7 @@ cmd-certs-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-certs-report-single "$app" "$INFO_FLAG" | tee || true
done
else

10
plugins/checks/install
View File

@@ -6,13 +6,10 @@ source "$PLUGIN_AVAILABLE_PATH/config/functions"
migrate_checks_vars_0_5_0() {
declare desc="migrates deprecated CHECKS config variables to simplified counter part introduced in 0.5.x"
local APPS="$(dokku_apps)"
local GLOBAL_SKIP_ALL_CHECKS=$(config_get --global DOKKU_SKIP_ALL_CHECKS || true)
local GLOBAL_SKIP_DEFAULT_CHECKS=$(config_get --global DOKKU_SKIP_DEFAULT_CHECKS || true)
local app
for app in $APPS; do
for app in $(dokku_apps); do
local APP_SKIP_ALL_CHECKS=$(config_get "$app" DOKKU_SKIP_ALL_CHECKS || true)
local APP_SKIP_DEFAULT_CHECKS=$(config_get "$app" DOKKU_SKIP_DEFAULT_CHECKS || true)
@@ -37,11 +34,8 @@ migrate_checks_vars_0_5_0() {
migrate_checks_vars_0_6_0() {
declare desc="migrates CHECKS config variables from 0.5.x to support fully-disabled zero-downtime checks"
local APPS="$(dokku_apps)"
local app
for app in $APPS; do
for app in $(dokku_apps); do
local APP_DOKKU_CHECKS_ENABLED=$(config_get "$app" DOKKU_CHECKS_ENABLED || true)
if [[ $APP_DOKKU_CHECKS_ENABLED ]]; then
dokku_log_info1 "Migrating zero downtime env variables to 0.6.x. The following variables will be migrated"

3
plugins/checks/internal-functions
View File

@@ -9,7 +9,6 @@ cmd-checks-report() {
declare cmd="checks:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -21,7 +20,7 @@ cmd-checks-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-checks-report-single "$app" "$INFO_FLAG" | tee || true
done
else

7
plugins/common/functions
View File

@@ -17,8 +17,11 @@ has_tty() {
dokku_apps() {
declare desc="prints list of all local apps"
local INSTALLED_APPS=$(find "$DOKKU_ROOT" -follow -maxdepth 1 -mindepth 1 -type d ! -name '.*' -printf "%f\n" 2>/dev/null | sort) || (dokku_log_fail "You haven't deployed any applications yet")
[[ $INSTALLED_APPS ]] && echo "$INSTALLED_APPS"
local INSTALLED_APPS="$(plugn trigger app-list)"
if [[ -z "$INSTALLED_APPS" ]]; then
dokku_log_fail "You haven't deployed any applications yet"
fi
echo "$INSTALLED_APPS"
}
dokku_version() {

3
plugins/cron/functions.go
View File

@@ -11,6 +11,7 @@ import (
"text/template"
appjson "github.com/dokku/dokku/plugins/app-json"
apps "github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
cronparser "github.com/robfig/cron/v3"
@@ -99,7 +100,7 @@ func deleteCrontab() error {
}
func writeCronEntries() error {
apps, _ := common.DokkuApps()
apps, _ := apps.DokkuApps()
commands := []templateCommand{}
for _, appName := range apps {
scheduler := common.GetAppScheduler(appName)

3
plugins/cron/go.mod
View File

@@ -4,12 +4,15 @@ go 1.16
require (
github.com/dokku/dokku/plugins/app-json v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/apps v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000
github.com/robfig/cron/v3 v3.0.1
github.com/ryanuber/columnize v1.1.2-0.20190319233515-9e6335e58db3
github.com/spf13/pflag v1.0.5
)
replace github.com/dokku/dokku/plugins/apps => ../apps
replace github.com/dokku/dokku/plugins/app-json => ../app-json
replace github.com/dokku/dokku/plugins/common => ../common

3
plugins/cron/subcommands.go
View File

@@ -3,6 +3,7 @@ package cron
import (
"fmt"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
"github.com/ryanuber/columnize"
)
@@ -31,7 +32,7 @@ func CommandList(appName string) error {
// CommandReport displays a cron 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
}

3
plugins/docker-options/internal-functions
View File

@@ -9,7 +9,6 @@ cmd-docker-options-report() {
declare cmd="docker-options:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -21,7 +20,7 @@ cmd-docker-options-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-docker-options-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/domains/internal-functions
View File

@@ -9,7 +9,6 @@ cmd-domains-report() {
declare cmd="domains:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ "$APP" == "--global" ]]; then
cmd-domains-report-single "$APP" "$INFO_FLAG"
@@ -26,7 +25,7 @@ cmd-domains-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-domains-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/git/install
View File

@@ -18,7 +18,6 @@ trigger-git-install() {
migrate_git_vars_0_12_0() {
declare desc="migrates git config variables from 0.11.x"
local APPS="$(dokku_apps)"
local DOKKU_DEPLOY_BRANCH app
DOKKU_DEPLOY_BRANCH=$(config_get --global DOKKU_DEPLOY_BRANCH || true)
@@ -27,7 +26,7 @@ migrate_git_vars_0_12_0() {
DOKKU_QUIET_OUTPUT=1 config_unset --global DOKKU_DEPLOY_BRANCH || true
fi
for app in $APPS; do
for app in $(dokku_apps); do
DOKKU_DEPLOY_BRANCH=$(config_get "$app" DOKKU_DEPLOY_BRANCH || true)
if [[ -n "$DOKKU_DEPLOY_BRANCH" ]]; then
fn-plugin-property-write "git" "$app" "deploy-branch" "$DOKKU_DEPLOY_BRANCH"

3
plugins/git/internal-functions
View File

@@ -222,7 +222,6 @@ cmd-git-report() {
declare cmd="git:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -234,7 +233,7 @@ cmd-git-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-git-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/logs/functions.go
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{},

5
plugins/logs/go.mod
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

3
plugins/logs/subcommands.go
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
}

3
plugins/network/go.mod
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

5
plugins/network/subcommands.go
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
}

3
plugins/network/triggers.go
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
}

3
plugins/nginx-vhosts/command-functions
View File

@@ -11,7 +11,6 @@ cmd-nginx-report() {
declare cmd="nginx:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -23,7 +22,7 @@ cmd-nginx-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-nginx-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/proxy/go.mod
View File

@@ -3,12 +3,15 @@ module github.com/dokku/dokku/plugins/proxy
go 1.16
require (
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/ryanuber/columnize v1.1.2-0.20190319233515-9e6335e58db3
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

3
plugins/proxy/subcommands.go
View File

@@ -4,6 +4,7 @@ import (
"errors"
"strings"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
)
@@ -152,7 +153,7 @@ func CommandPortsSet(appName string, portMaps []string) error {
// CommandReport displays a proxy 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
}

3
plugins/ps/go.mod
View File

@@ -4,6 +4,7 @@ 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/dokku/dokku/plugins/docker-options v0.0.0-00010101000000-000000000000
@@ -13,6 +14,8 @@ require (
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

6
plugins/ps/subcommands.go
View File

@@ -6,9 +6,9 @@ import (
"path/filepath"
"strings"
dockeroptions "github.com/dokku/dokku/plugins/docker-options"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
dockeroptions "github.com/dokku/dokku/plugins/docker-options"
"github.com/gofrs/flock"
)
@@ -38,7 +38,7 @@ func CommandRebuild(appName string, allApps bool, parallelCount int) error {
// CommandReport displays a ps 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
}

3
plugins/ps/triggers.go
View File

@@ -10,6 +10,7 @@ import (
"strings"
sh "github.com/codeskyblue/go-sh"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
dockeroptions "github.com/dokku/dokku/plugins/docker-options"
@@ -74,7 +75,7 @@ func TriggerInstall() error {
return err
}
apps, err := common.DokkuApps()
apps, err := apps.DokkuApps()
if err != nil {
return nil
}

3
plugins/registry/go.mod
View File

@@ -4,8 +4,11 @@ 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/spf13/pflag v1.0.5
)
replace github.com/dokku/dokku/plugins/apps => ../apps
replace github.com/dokku/dokku/plugins/common => ../common

3
plugins/registry/subcommands.go
View File

@@ -7,6 +7,7 @@ import (
"os"
"strings"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
@@ -55,7 +56,7 @@ func CommandLogin(server string, username string, password string, passwordStdin
// CommandReport displays a registry 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
}

3
plugins/resource/go.mod
View File

@@ -3,8 +3,11 @@ module github.com/dokku/dokku/plugins/resource
go 1.16
require (
github.com/dokku/dokku/plugins/apps v0.0.0-00010101000000-000000000000
github.com/dokku/dokku/plugins/common 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

3
plugins/resource/subcommands.go
View File

@@ -1,6 +1,7 @@
package resource
import (
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
@@ -26,7 +27,7 @@ func CommandLimitClear(appName string, processType string) error {
// CommandReport displays a resource 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
}

3
plugins/scheduler-docker-local/internal-functions
View File

@@ -10,7 +10,6 @@ cmd-scheduler-docker-local-report() {
declare cmd="scheduler-docker-local:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -22,7 +21,7 @@ cmd-scheduler-docker-local-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-scheduler-docker-local-report-single "$app" "$INFO_FLAG" | tee || true
done
else

3
plugins/scheduler/go.mod
View File

@@ -3,11 +3,14 @@ module github.com/dokku/dokku/plugins/scheduler
go 1.16
require (
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

3
plugins/scheduler/subcommands.go
View File

@@ -1,13 +1,14 @@
package scheduler
import (
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)
// CommandReport displays a scheduler 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
}

3
plugins/scheduler/triggers.go
View File

@@ -3,6 +3,7 @@ package scheduler
import (
"fmt"
"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
"github.com/dokku/dokku/plugins/config"
)
@@ -31,7 +32,7 @@ func TriggerInstall() error {
return fmt.Errorf("Unable to install the scheduler plugin: %s", err.Error())
}
apps, err := common.DokkuApps()
apps, err := apps.DokkuApps()
if err != nil {
return nil
}

3
plugins/storage/internal-functions
View File

@@ -66,7 +66,6 @@ cmd-storage-report() {
declare cmd="storage:report"
[[ "$1" == "$cmd" ]] && shift 1
declare APP="$1" INFO_FLAG="$2"
local INSTALLED_APPS=$(dokku_apps)
if [[ -n "$APP" ]] && [[ "$APP" == --* ]]; then
INFO_FLAG="$APP"
@@ -78,7 +77,7 @@ cmd-storage-report() {
fi
if [[ -z "$APP" ]]; then
for app in $INSTALLED_APPS; do
for app in $(dokku_apps); do
cmd-storage-report-single "$app" "$INFO_FLAG" | tee || true
done
else