这是indexloc提供的服务，不要输入任何密码
Skip to content

Un-deprecate apps and config cli aliases #5993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2023
Merged

Un-deprecate apps and config cli aliases #5993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion plugins/apps/src/commands/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"strconv"
"strings"

"github.com/dokku/dokku/plugins/apps"
"github.com/dokku/dokku/plugins/common"
)

Expand Down Expand Up @@ -37,7 +38,15 @@ func main() {

cmd := flag.Arg(0)
switch cmd {
case "apps", "apps:help":
case "apps":
args := flag.NewFlagSet("apps", flag.ExitOnError)
args.Usage = usage
args.Parse(os.Args[2:])

if err := apps.CommandList(); err != nil {
common.LogFailWithError(err)
}
case "apps:help":
usage()
case "help":
command := common.NewShellCmd(fmt.Sprintf("ps -o command= %d", os.Getppid()))
Expand Down
8 changes: 4 additions & 4 deletions plugins/config/src/commands/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ func main() {
cmd := flag.Arg(0)
switch cmd {
case "config":
common.LogWarn("Deprecated: Use the 'config:show' command instead")
args := flag.NewFlagSet("config:show", flag.ExitOnError)
args := flag.NewFlagSet("config", flag.ExitOnError)
args.Usage = usage
global := args.Bool("global", false, "--global: use the global environment")
shell := args.Bool("shell", false, "--shell: in a single-line for usage in command-line utilities [deprecated]")
export := args.Bool("export", false, "--export: print the env as eval-compatible exports [deprecated]")
merged := args.Bool("merged", false, "--merged: display the app's environment merged with the global environment")
args.Parse(os.Args[2:])
appName := args.Arg(0)
err := config.CommandShow(appName, *global, *merged, *shell, *export)
if err != nil {

if err := config.CommandShow(appName, *global, *merged, *shell, *export); err != nil {
common.LogFailWithError(err)
}
case "config:help":
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/apps_1.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ teardown() {
}

@test "(apps) apps:help" {
run /bin/bash -c "dokku apps"
run /bin/bash -c "dokku apps --help"
echo "output: $output"
echo "status: $status"
assert_output_contains "Manage apps"
Expand Down
7 changes: 7 additions & 0 deletions tests/unit/config.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@ teardown() {
}

@test "(config) config:help" {
run /bin/bash -c "dokku config --help"
echo "output: $output"
echo "status: $status"
assert_output_contains "Manage global and app-specific config vars"
help_output="$output"

run /bin/bash -c "dokku config:help"
echo "output: $output"
echo "status: $status"
assert_output_contains "Manage global and app-specific config vars"
assert_output "$help_output"
}

@test "(config) config:set --global" {
Expand Down