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

feat: simplify flag parsing in apps plugin

Browse Source 
Commands should be written such that they take arguments as is.
This commit is contained in:
Jose Diaz-Gonzalez
2020-05-09 00:44:20 -04:00
parent 6a8783e357
commit ce154aff09
6 changed files with 110 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/apps/src/subcommands/subcommands.go
View File

@@ -22,44 +22,57 @@ func main() {
skipDeploy := args.Bool("skip-deploy", false, "--skip-deploy: skip deploy of the new app")
ignoreExisting := args.Bool("ignore-existing", false, "--ignore-existing: exit 0 if new app already exists")
args.Parse(os.Args[2:])
err = apps.CommandClone(args.Args(), *skipDeploy, *ignoreExisting)
oldAppName := args.Arg(0)
newAppName := args.Arg(1)
err = apps.CommandClone(oldAppName, newAppName, *skipDeploy, *ignoreExisting)
case "create":
args := flag.NewFlagSet("apps:create", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandCreate(args.Args())
appName := args.Arg(0)
err = apps.CommandCreate(appName)
case "destroy":
args := flag.NewFlagSet("apps:destroy", flag.ExitOnError)
force := args.Bool("force", false, "--force: force destroy without confirmation")
args.Parse(os.Args[2:])
err = apps.CommandDestroy(args.Args())
appName := args.Arg(0)
err = apps.CommandDestroy(appName, *force)
case "exists":
args := flag.NewFlagSet("apps:exists", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandExists(args.Args())
appName := args.Arg(0)
err = apps.CommandExists(appName)
case "list":
args := flag.NewFlagSet("apps:list", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandList(args.Args())
err = apps.CommandList()
case "lock":
args := flag.NewFlagSet("apps:lock", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandLock(args.Args())
appName := args.Arg(0)
err = apps.CommandLock(appName)
case "locked":
args := flag.NewFlagSet("apps:locked", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandLocked(args.Args())
appName := args.Arg(0)
err = apps.CommandLocked(appName)
case "rename":
args := flag.NewFlagSet("apps:rename", flag.ExitOnError)
skipDeploy := args.Bool("skip-deploy", false, "--skip-deploy: skip deploy of the new app")
args.Parse(os.Args[2:])
err = apps.CommandRename(args.Args(), *skipDeploy)
oldAppName := args.Arg(0)
newAppName := args.Arg(1)
err = apps.CommandRename(oldAppName, newAppName, *skipDeploy)
case "report":
args := flag.NewFlagSet("apps:report", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandReport(args.Args())
appName := args.Arg(0)
infoFlag := args.Arg(1)
err = apps.CommandReport(appName, infoFlag)
case "unlock":
args := flag.NewFlagSet("apps:unlock", flag.ExitOnError)
args.Parse(os.Args[2:])
err = apps.CommandUnlock(args.Args())
appName := args.Arg(0)
err = apps.CommandUnlock(appName)
default:
common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand))
}