refactor: directly trigger pre-deploy hook from post-release-builder script

This removes the extra indirection in the deploy process for triggering the hooks.
This commit is contained in:
Jose Diaz-Gonzalez committed 2024-04-04 02:27:43 -04:00
1 parent 08a136f73f
commit ad5537c086
7 files changed
+26 -23

No files matched your search

+1 -1
View File
@@ -1,5 +1,5 @@
SUBCOMMANDS = subcommands/report subcommands/set SUBCOMMANDS = subcommands/report subcommands/set
TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/app-json-get-content triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-deploy triggers/pre-deploy triggers/report TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/app-json-get-content triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-deploy triggers/post-release-builder triggers/report
BUILD = commands subcommands triggers BUILD = commands subcommands triggers
PLUGIN_NAME = app-json PLUGIN_NAME = app-json
+5 -4
View File
@@ -56,10 +56,11 @@ func main() {
appName := flag.Arg(0) appName := flag.Arg(0)
imageTag := flag.Arg(3) imageTag := flag.Arg(3)
err = appjson.TriggerPostDeploy(appName, imageTag) err = appjson.TriggerPostDeploy(appName, imageTag)
case "pre-deploy": case "post-release-builder":
appName := flag.Arg(0) builderType := flag.Arg(0)
imageTag := flag.Arg(1) appName := flag.Arg(1)
err = appjson.TriggerPreDeploy(appName, imageTag) image := flag.Arg(2)
err = appjson.TriggerPostReleaseBuilder(builderType, appName, image)
case "report": case "report":
appName := flag.Arg(0) appName := flag.Arg(0)
err = appjson.ReportSingleApp(appName, "", "") err = appjson.ReportSingleApp(appName, "", "")
+4 -3
View File
@@ -212,9 +212,10 @@ func TriggerPostDeploy(appName string, imageTag string) error {
return executeScript(appName, image, imageTag, "postdeploy") return executeScript(appName, image, imageTag, "postdeploy")
} }
// TriggerPreDeploy is a trigger to execute predeploy and release deployment tasks // TriggerPostReleaseBuilder is a trigger to execute predeploy and release deployment tasks
func TriggerPreDeploy(appName string, imageTag string) error { func TriggerPostReleaseBuilder(builderType string, appName string, image string) error {
image := common.GetAppImageName(appName, imageTag, "") parts := strings.Split(image, ":")
imageTag := parts[len(parts)-1]
if err := executeScript(appName, image, imageTag, "predeploy"); err != nil { if err := executeScript(appName, image, imageTag, "predeploy"); err != nil {
return err return err
} }
+1 -1
View File
@@ -1,5 +1,5 @@
SUBCOMMANDS = subcommands/inspect subcommands/rebuild subcommands/report subcommands/restart subcommands/restore subcommands/retire subcommands/scale subcommands/set subcommands/start subcommands/stop SUBCOMMANDS = subcommands/inspect subcommands/rebuild subcommands/report subcommands/restart subcommands/restore subcommands/retire subcommands/scale subcommands/set subcommands/start subcommands/stop
TRIGGERS = triggers/app-restart triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-stop triggers/pre-deploy triggers/procfile-get-command triggers/procfile-exists triggers/ps-can-scale triggers/ps-current-scale triggers/ps-set-scale triggers/report TRIGGERS = triggers/app-restart triggers/core-post-deploy triggers/core-post-extract triggers/install triggers/post-app-clone triggers/post-app-clone-setup triggers/post-app-rename triggers/post-app-rename-setup triggers/post-create triggers/post-delete triggers/post-release-builder triggers/post-stop triggers/procfile-get-command triggers/procfile-exists triggers/ps-can-scale triggers/ps-current-scale triggers/ps-set-scale triggers/report
BUILD = commands subcommands triggers BUILD = commands subcommands triggers
PLUGIN_NAME = ps PLUGIN_NAME = ps
+5 -4
View File
@@ -55,10 +55,11 @@ func main() {
case "post-stop": case "post-stop":
appName := flag.Arg(0) appName := flag.Arg(0)
err = ps.TriggerPostStop(appName) err = ps.TriggerPostStop(appName)
case "pre-deploy": case "post-release-builder":
appName := flag.Arg(0) builderType := flag.Arg(0)
imageTag := flag.Arg(1) appName := flag.Arg(1)
err = ps.TriggerPreDeploy(appName, imageTag) image := flag.Arg(2)
err = ps.TriggerPostReleaseBuilder(builderType, appName, image)
case "procfile-get-command": case "procfile-get-command":
appName := flag.Arg(0) appName := flag.Arg(0)
processType := flag.Arg(1) processType := flag.Arg(1)
+2 -2
View File
@@ -257,8 +257,8 @@ func TriggerPostStop(appName string) error {
}) })
} }
// TriggerPreDeploy ensures an app has an up to date scale parameters // TriggerPostReleaseBuilder ensures an app has an up to date scale parameters
func TriggerPreDeploy(appName string, imageTag string) error { func TriggerPostReleaseBuilder(builderType string, appName string, image string) error {
if err := updateScale(appName, false, FormationSlice{}); err != nil { if err := updateScale(appName, false, FormationSlice{}); err != nil {
common.LogDebug(fmt.Sprintf("Error generating scale file: %s", err.Error())) common.LogDebug(fmt.Sprintf("Error generating scale file: %s", err.Error()))
return err return err
@@ -6,20 +6,20 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
source "$PLUGIN_AVAILABLE_PATH/config/functions" source "$PLUGIN_AVAILABLE_PATH/config/functions"
source "$PLUGIN_AVAILABLE_PATH/scheduler-docker-local/internal-functions" source "$PLUGIN_AVAILABLE_PATH/scheduler-docker-local/internal-functions"
trigger-scheduler-docker-local-pre-deploy() { trigger-scheduler-docker-local-post-release-builder() {
declare desc="scheduler-docker-local pre-deploy plugin trigger" declare desc="scheduler-docker-local post-release-builder plugin trigger"
declare trigger="pre-deploy" declare trigger="post-release-builder"
declare APP="$1" IMAGE_TAG="$2" declare BUILDER_TYPE="$1" APP="$2" IMAGE="$3"
local DOKKU_SCHEDULER=$(get_app_scheduler "$APP") local DOKKU_SCHEDULER="$(get_app_scheduler "$APP")"
if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then if [[ "$DOKKU_SCHEDULER" != "docker-local" ]]; then
return return
fi fi
scheduler-docker-local-pre-deploy-precheck "$APP" scheduler-docker-local-post-release-builder-precheck "$APP"
} }
scheduler-docker-local-pre-deploy-precheck() { scheduler-docker-local-post-release-builder-precheck() {
declare desc="Outputs the checks messages if necessary" declare desc="Outputs the checks messages if necessary"
declare APP="$1" declare APP="$1"
@@ -36,4 +36,4 @@ scheduler-docker-local-pre-deploy-precheck() {
fi fi
} }
trigger-scheduler-docker-local-pre-deploy "$@" trigger-scheduler-docker-local-post-release-builder "$@"