From b5c85ad5be482924f98bb8f3b5681bb390bd71b4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 23 Jan 2021 17:36:56 -0500 Subject: [PATCH] chore: rename stacks-set to stack-set You can only set one stack... --- docs/deployment/methods/herokuish-buildpacks.md | 2 +- plugins/buildpacks/Makefile | 2 +- plugins/buildpacks/report.go | 2 +- plugins/buildpacks/src/commands/commands.go | 2 +- plugins/buildpacks/src/subcommands/subcommands.go | 6 +++--- plugins/buildpacks/subcommands.go | 4 ++-- plugins/buildpacks/triggers.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/deployment/methods/herokuish-buildpacks.md b/docs/deployment/methods/herokuish-buildpacks.md index f9fc632a7..e9ece3787 100644 --- a/docs/deployment/methods/herokuish-buildpacks.md +++ b/docs/deployment/methods/herokuish-buildpacks.md @@ -9,7 +9,7 @@ buildpacks:list # List all buildpacks for an app buildpacks:remove # Remove a buildpack set on the app buildpacks:report [] [] # Displays a buildpack report for one or more apps buildpacks:set [--index 1] # Set new app buildpack at a given position defaulting to the first buildpack if no index is specified -buildpacks:stacks-set # Sets the stack of an app +buildpacks:stack-set # Sets the stack of an app ``` > Warning: If using the `buildpacks` plugin, be sure to unset any `BUILDPACK_URL` and remove any such entries from a committed `.env` file. A specified `BUILDPACK_URL` will always override a `.buildpacks` file or the buildpacks plugin. diff --git a/plugins/buildpacks/Makefile b/plugins/buildpacks/Makefile index 5abb38ed3..3eb867ce7 100644 --- a/plugins/buildpacks/Makefile +++ b/plugins/buildpacks/Makefile @@ -1,4 +1,4 @@ -SUBCOMMANDS = subcommands/add subcommands/clear subcommands/list subcommands/remove subcommands/report subcommands/set subcommands/stacks-set +SUBCOMMANDS = subcommands/add subcommands/clear subcommands/list subcommands/remove subcommands/report subcommands/set subcommands/stack-set TRIGGERS = triggers/buildpack-stack-name triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/post-extract triggers/report BUILD = commands subcommands triggers PLUGIN_NAME = buildpacks diff --git a/plugins/buildpacks/report.go b/plugins/buildpacks/report.go index 084884b62..072124848 100644 --- a/plugins/buildpacks/report.go +++ b/plugins/buildpacks/report.go @@ -42,7 +42,7 @@ func reportComputedStack(appName string) string { b, _ := common.PlugnTriggerOutput("config-get", []string{appName, "DOKKU_IMAGE"}...) if dokkuImage := strings.TrimSpace(string(b[:])); dokkuImage != "" { - common.LogWarn("Deprecated: use buildpacks:stacks-set instead of specifying DOKKU_IMAGE environment variable") + common.LogWarn("Deprecated: use buildpacks:stack-set instead of specifying DOKKU_IMAGE environment variable") return dokkuImage } diff --git a/plugins/buildpacks/src/commands/commands.go b/plugins/buildpacks/src/commands/commands.go index baf3144a0..569121c9a 100644 --- a/plugins/buildpacks/src/commands/commands.go +++ b/plugins/buildpacks/src/commands/commands.go @@ -24,7 +24,7 @@ Additional commands:` buildpacks:remove , Remove a buildpack set on the app buildpacks:report [] [], Displays a buildpack report for one or more apps buildpacks:set [--index 1] , Set new app buildpack at a given position defaulting to the first buildpack if no index is specified - buildpacks:stacks-set , Sets the stack of an app + buildpacks:stack-set , Sets the stack of an app ` ) diff --git a/plugins/buildpacks/src/subcommands/subcommands.go b/plugins/buildpacks/src/subcommands/subcommands.go index b17a3c5b3..9f0d37f83 100644 --- a/plugins/buildpacks/src/subcommands/subcommands.go +++ b/plugins/buildpacks/src/subcommands/subcommands.go @@ -57,8 +57,8 @@ func main() { appName := args.Arg(0) buildpack := args.Arg(1) err = buildpacks.CommandSet(appName, buildpack, *index) - case "stacks-set": - args := flag.NewFlagSet("buildpacks:stacks-set", flag.ExitOnError) + case "stack-set": + args := flag.NewFlagSet("buildpacks:stack-set", flag.ExitOnError) global := args.Bool("global", false, "--global: set a global property") args.Parse(os.Args[2:]) appName := args.Arg(0) @@ -67,7 +67,7 @@ func main() { appName = "--global" stack = args.Arg(0) } - err = buildpacks.CommandStacksSet(appName, stack) + err = buildpacks.CommandStackSet(appName, stack) default: common.LogFail(fmt.Sprintf("Invalid plugin subcommand call: %s", subcommand)) } diff --git a/plugins/buildpacks/subcommands.go b/plugins/buildpacks/subcommands.go index 3d1b81c39..0befb4625 100644 --- a/plugins/buildpacks/subcommands.go +++ b/plugins/buildpacks/subcommands.go @@ -139,8 +139,8 @@ func CommandSet(appName string, buildpack string, index int) error { return common.PropertyListSet("buildpacks", appName, "buildpacks", buildpack, index) } -// CommandStacksSet implements buildpacks:stacks-set -func CommandStacksSet(appName string, stack string) error { +// CommandStackSet implements buildpacks:stack-set +func CommandStackSet(appName string, stack string) error { common.CommandPropertySet("buildpacks", appName, "stack", stack, DefaultProperties, GlobalProperties) return common.PlugnTrigger("post-stack-set", []string{appName, stack}...) } diff --git a/plugins/buildpacks/triggers.go b/plugins/buildpacks/triggers.go index 195c41dec..e5e20d6e5 100644 --- a/plugins/buildpacks/triggers.go +++ b/plugins/buildpacks/triggers.go @@ -25,7 +25,7 @@ func TriggerBuildpackStackName(appName string) error { b, _ := common.PlugnTriggerOutput("config-get", []string{appName, "DOKKU_IMAGE"}...) dokkuImage := strings.TrimSpace(string(b[:])) if dokkuImage != "" { - common.LogWarn("Deprecated: use buildpacks:stacks-set instead of specifying DOKKU_IMAGE environment variable") + common.LogWarn("Deprecated: use buildpacks:stack-set instead of specifying DOKKU_IMAGE environment variable") fmt.Println(dokkuImage) return nil }