From 7389bb3f034e672f2034a0b280c15954089240db Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 17 Feb 2020 20:42:29 -0500 Subject: [PATCH] fix: properly handle returned errors --- plugins/buildpacks/src/triggers/triggers.go | 9 +++++++-- plugins/network/src/triggers/triggers.go | 9 +++++++-- plugins/resource/src/triggers/triggers.go | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/plugins/buildpacks/src/triggers/triggers.go b/plugins/buildpacks/src/triggers/triggers.go index 98899a858..d8d3420cf 100644 --- a/plugins/buildpacks/src/triggers/triggers.go +++ b/plugins/buildpacks/src/triggers/triggers.go @@ -16,17 +16,18 @@ func main() { trigger := parts[len(parts)-1] flag.Parse() + var err error switch trigger { case "install": buildpacks.TriggerInstall() case "post-app-clone-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) - buildpacks.TriggerPostAppCloneSetup(oldAppName, newAppName) + err = buildpacks.TriggerPostAppCloneSetup(oldAppName, newAppName) case "post-app-rename-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) - buildpacks.TriggerPostAppRenameSetup(oldAppName, newAppName) + err = buildpacks.TriggerPostAppRenameSetup(oldAppName, newAppName) case "post-delete": appName := flag.Arg(0) buildpacks.TriggerPostDelete(appName) @@ -40,4 +41,8 @@ func main() { default: common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) } + + if err != nil { + common.LogFail(err.Error()) + } } diff --git a/plugins/network/src/triggers/triggers.go b/plugins/network/src/triggers/triggers.go index 76a5c2e19..ce4b26872 100644 --- a/plugins/network/src/triggers/triggers.go +++ b/plugins/network/src/triggers/triggers.go @@ -16,6 +16,7 @@ func main() { trigger := parts[len(parts)-1] flag.Parse() + var err error switch trigger { case "install": network.TriggerInstall() @@ -63,11 +64,11 @@ func main() { case "post-app-clone-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) - network.TriggerPostAppCloneSetup(oldAppName, newAppName) + err = network.TriggerPostAppCloneSetup(oldAppName, newAppName) case "post-app-rename-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) - network.TriggerPostAppRenameSetup(oldAppName, newAppName) + err = network.TriggerPostAppRenameSetup(oldAppName, newAppName) case "post-container-create": containerType := flag.Arg(0) containerID := flag.Arg(1) @@ -90,4 +91,8 @@ func main() { default: common.LogFail(fmt.Sprintf("Invalid plugin trigger call: %s", trigger)) } + + if err != nil { + common.LogFail(err.Error()) + } } diff --git a/plugins/resource/src/triggers/triggers.go b/plugins/resource/src/triggers/triggers.go index 82d7bf5a8..79d6e1e19 100644 --- a/plugins/resource/src/triggers/triggers.go +++ b/plugins/resource/src/triggers/triggers.go @@ -27,11 +27,11 @@ func main() { case "post-app-clone-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) - err := resource.TriggerPostAppCloneSetup(oldAppName, newAppName) + err = resource.TriggerPostAppCloneSetup(oldAppName, newAppName) case "post-app-rename-setup": oldAppName := flag.Arg(0) newAppName := flag.Arg(1) - err := resource.TriggerPostAppRenameSetup(oldAppName, newAppName) + err = resource.TriggerPostAppRenameSetup(oldAppName, newAppName) case "post-delete": appName := flag.Arg(0) err = resource.TriggerPostDelete(appName)