refactor: set deploy-source and metadata at deploy time

This ensures the value is correct, where previously it was computed based on a file - and therefore did not distinguish between git:from-archive and git:from-image.

Closes #4464

plugins/apps/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/clone subcommands/create subcommands/destroy subcommands/exists subcommands/list subcommands/lock subcommands/locked subcommands/rename subcommands/report subcommands/unlock
-TRIGGERS = triggers/app-create triggers/app-destroy triggers/app-exists triggers/app-maybe-create triggers/post-delete triggers/report
+TRIGGERS = triggers/app-create triggers/app-destroy triggers/app-exists triggers/app-maybe-create triggers/deploy-source-set triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = apps
 

plugins/apps/apps.go

@@ -0,0 +1,15 @@
+package apps
+
+var (
+	// DefaultProperties is a map of all valid network properties with corresponding default property values
+	DefaultProperties = map[string]string{
+		"deploy-source":          "",
+		"deploy-source-metadata": "",
+	}
+
+	// GlobalProperties is a map of all valid global network properties
+	GlobalProperties = map[string]bool{
+		"deploy-source":          true,
+		"deploy-source-metadata": true,
+	}
+)

plugins/apps/report.go

@@ -1,8 +1,6 @@
 package apps
 
 import (
-	"strings"
-
 	"github.com/dokku/dokku/plugins/common"
 )
 
@@ -13,9 +11,10 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
 	}
 
 	flags := map[string]common.ReportFunc{
-		"--app-dir":           reportDir,
-		"--app-deploy-source": reportDeploySource,
-		"--app-locked":        reportLocked,
+		"--app-deploy-source":          reportDeploySource,
+		"--app-deploy-source-metadata": reportDeploySourceMetadata,
+		"--app-dir":                    reportDir,
+		"--app-locked":                 reportLocked,
 	}
 
 	flagKeys := []string{}
@@ -29,17 +28,16 @@ func ReportSingleApp(appName string, format string, infoFlag string) error {
 	return common.ReportSingleApp("app", appName, infoFlag, infoFlags, flagKeys, format, trimPrefix, uppercaseFirstCharacter)
 }
 
-func reportDir(appName string) string {
-	return common.AppRoot(appName)
+func reportDeploySource(appName string) string {
+	return common.PropertyGet("apps", appName, "deploy-source")
 }
 
-func reportDeploySource(appName string) string {
-	deploySource := ""
-	if b, err := common.PlugnTriggerSetup("deploy-source", []string{appName}...).SetInput("").Output(); err != nil {
-		deploySource = strings.TrimSpace(string(b[:]))
-	}
+func reportDeploySourceMetadata(appName string) string {
+	return common.PropertyGet("apps", appName, "deploy-source-metadata")
+}
 
-	return deploySource
+func reportDir(appName string) string {
+	return common.AppRoot(appName)
 }
 
 func reportLocked(appName string) string {

plugins/apps/src/triggers/triggers.go

@@ -30,6 +30,21 @@ func main() {
 	case "app-maybe-create":
 		appName := flag.Arg(0)
 		err = apps.TriggerAppMaybeCreate(appName)
+	case "deploy-source-set":
+		appName := flag.Arg(0)
+		sourceType := flag.Arg(0)
+		sourceMetadata := flag.Arg(0)
+		err = apps.TriggerDeploySourceSet(appName, sourceType, sourceMetadata)
+	case "install":
+		err = apps.TriggerInstall()
+	case "post-app-clone-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = apps.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = apps.TriggerPostAppRenameSetup(oldAppName, newAppName)
 	case "post-delete":
 		appName := flag.Arg(0)
 		err = apps.TriggerPostDelete(appName)

plugins/apps/triggers.go

@@ -1,6 +1,8 @@
 package apps
 
 import (
+	"fmt"
+
 	"github.com/dokku/dokku/plugins/common"
 )
 
@@ -24,15 +26,59 @@ func TriggerAppMaybeCreate(appName string) error {
 	return maybeCreateApp(appName)
 }
 
+// TriggerDeploySourceSet sets the current deploy source
+func TriggerDeploySourceSet(appName string, sourceType string, sourceMetadata string) error {
+	if err := common.PropertyWrite("apps", appName, "deploy-source", sourceType); err != nil {
+		return err
+	}
+
+	return common.PropertyWrite("apps", appName, "deploy-source-metadata", sourceMetadata)
+}
+
+// TriggerInstall runs the install step for the apps plugin
+func TriggerInstall() error {
+	if err := common.PropertySetup("apps"); err != nil {
+		return fmt.Errorf("Unable to install the apps plugin: %s", err.Error())
+	}
+
+	return nil
+}
+
+// TriggerPostAppCloneSetup creates new apps files
+func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
+	err := common.PropertyClone("apps", oldAppName, newAppName)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostAppRenameSetup renames apps files
+func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
+	if err := common.PropertyClone("apps", oldAppName, newAppName); err != nil {
+		return err
+	}
+
+	if err := common.PropertyDestroy("apps", oldAppName); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // TriggerPostDelete is the apps post-delete plugin trigger
 func TriggerPostDelete(appName string) error {
-	imageRepo := common.GetAppImageRepo(appName)
+	if err := common.PropertyDestroy("apps", appName); err != nil {
+		common.LogWarn(err.Error())
+	}
 
 	imagesByAppLabel, err := listImagesByAppLabel(appName)
 	if err != nil {
 		common.LogWarn(err.Error())
 	}
 
+	imageRepo := common.GetAppImageRepo(appName)
 	imagesByRepo, err := listImagesByImageRepo(imageRepo)
 	if err != nil {
 		common.LogWarn(err.Error())