From f7863c8391d5cf828a83c41c474f912b62646e9d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 28 Nov 2020 00:39:28 -0500 Subject: [PATCH] fix: handle clone and rename properly --- plugins/ps/src/triggers/triggers.go | 8 ++++++++ plugins/ps/triggers.go | 27 +++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/plugins/ps/src/triggers/triggers.go b/plugins/ps/src/triggers/triggers.go index 2bd5e1b7e..53d87bbb2 100644 --- a/plugins/ps/src/triggers/triggers.go +++ b/plugins/ps/src/triggers/triggers.go @@ -30,10 +30,18 @@ func main() { oldAppName := flag.Arg(0) newAppName := flag.Arg(1) err = ps.TriggerPostAppClone(oldAppName, newAppName) + case "post-app-clone-setup": + oldAppName := flag.Arg(0) + newAppName := flag.Arg(1) + err = ps.TriggerPostAppCloneSetup(oldAppName, newAppName) case "post-app-rename": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) err = ps.TriggerPostAppRename(oldAppName, newAppName) + case "post-app-rename-setup": + oldAppName := flag.Arg(0) + newAppName := flag.Arg(1) + err = ps.TriggerPostAppRenameSetup(oldAppName, newAppName) case "post-create": appName := flag.Arg(0) err = ps.TriggerPostCreate(appName) diff --git a/plugins/ps/triggers.go b/plugins/ps/triggers.go index e72246aca..452b417a7 100644 --- a/plugins/ps/triggers.go +++ b/plugins/ps/triggers.go @@ -31,8 +31,8 @@ func TriggerCorePostDeploy(appName string) error { // TriggerInstall initializes app restart policies func TriggerInstall() error { - if err := common.PropertySetup("buildpacks"); err != nil { - return fmt.Errorf("Unable to install the buildpacks plugin: %s", err.Error()) + if err := common.PropertySetup("ps"); err != nil { + return fmt.Errorf("Unable to install the ps plugin: %s", err.Error()) } directory := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "ps") @@ -76,6 +76,16 @@ func TriggerPostAppClone(oldAppName string, newAppName string) error { return Rebuild(newAppName) } +// TriggerPostAppCloneSetup creates new ps files +func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error { + err := common.PropertyClone("ps", oldAppName, newAppName) + if err != nil { + return err + } + + return nil +} + // TriggerPostAppRename rebuilds the renamed app func TriggerPostAppRename(oldAppName string, newAppName string) error { if os.Getenv("SKIP_REBUILD") == "true" { @@ -85,6 +95,19 @@ func TriggerPostAppRename(oldAppName string, newAppName string) error { return Rebuild(newAppName) } +// TriggerPostAppRenameSetup renames ps files +func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error { + if err := common.PropertyClone("ps", oldAppName, newAppName); err != nil { + return err + } + + if err := common.PropertyDestroy("ps", oldAppName); err != nil { + return err + } + + return nil +} + // TriggerPostCreate ensures apps have a default restart policy // and scale value for web func TriggerPostCreate(appName string) error {