Merge pull request #4861 from dokku/fix-clone

Add missing clone/rename code for plugins

plugins/app-json/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/report subcommands/set
-TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/install triggers/post-delete triggers/post-deploy triggers/pre-deploy triggers/report
+TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/post-deploy triggers/pre-deploy triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = app-json
 

plugins/app-json/src/triggers/triggers.go

@@ -24,6 +24,14 @@ func main() {
 		err = appjson.TriggerAppJSONProcessDeployParallelism(appName, processType)
 	case "install":
 		err = appjson.TriggerInstall()
+	case "post-app-clone-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = appjson.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = appjson.TriggerPostAppRenameSetup(oldAppName, newAppName)
 	case "post-delete":
 		appName := flag.Arg(0)
 		err = appjson.TriggerPostDelete(appName)

plugins/app-json/triggers.go

@@ -48,6 +48,29 @@ func TriggerInstall() error {
 	return common.SetPermissions(directory, 0755)
 }
 
+// TriggerPostAppCloneSetup creates new app-json files
+func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
+	err := common.PropertyClone("app-json", oldAppName, newAppName)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostAppRenameSetup renames app-json files
+func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
+	if err := common.PropertyClone("app-json", oldAppName, newAppName); err != nil {
+		return err
+	}
+
+	if err := common.PropertyDestroy("app-json", oldAppName); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // TriggerPostDelete destroys the app-json data for a given app container
 func TriggerPostDelete(appName string) error {
 	directory := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "app-json", appName)

plugins/builder-dockerfile/post-app-clone-setup

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-dockerfile-post-app-clone-setup() {
+  declare desc="sets up properties for new app"
+  declare trigger="post-app-clone-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  fn-plugin-property-clone "builder-dockerfile" "$OLD_APP" "$NEW_APP"
+}
+
+trigger-builder-dockerfile-post-app-clone-setup "$@"

plugins/builder-dockerfile/post-app-rename-setup

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-dockerfile-post-app-rename-setup() {
+  declare desc="updates settings for new app"
+  declare trigger="post-app-rename-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  fn-plugin-property-clone "builder-dockerfile" "$OLD_APP" "$NEW_APP"
+  fn-plugin-property-destroy "builder-dockerfile" "$OLD_APP"
+}
+
+trigger-builder-dockerfile-post-app-rename-setup "$@"

plugins/builder-pack/post-app-clone-setup

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-pack-post-app-clone-setup() {
+  declare desc="sets up properties for new app"
+  declare trigger="post-app-clone-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  fn-plugin-property-clone "builder-pack" "$OLD_APP" "$NEW_APP"
+}
+
+trigger-builder-pack-post-app-clone-setup "$@"

plugins/builder-pack/post-app-rename-setup

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
+set -eo pipefail
+[[ $DOKKU_TRACE ]] && set -x
+
+trigger-builder-pack-post-app-rename-setup() {
+  declare desc="updates settings for new app"
+  declare trigger="post-app-rename-setup"
+  declare OLD_APP="$1" NEW_APP="$2"
+
+  fn-plugin-property-clone "builder-pack" "$OLD_APP" "$NEW_APP"
+  fn-plugin-property-destroy "builder-pack" "$OLD_APP"
+}
+
+trigger-builder-pack-post-app-rename-setup "$@"

plugins/builder/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/report subcommands/set
-TRIGGERS = triggers/builder-detect triggers/core-post-extract triggers/install triggers/post-delete triggers/report
+TRIGGERS = triggers/builder-detect triggers/core-post-extract triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = builder
 

plugins/builder/src/triggers/triggers.go

@@ -21,18 +21,26 @@ func main() {
 	case "builder-detect":
 		appName := flag.Arg(0)
 		err = builder.TriggerBuilderDetect(appName)
+	case "core-post-extract":
+		appName := flag.Arg(0)
+		sourceWorkDir := flag.Arg(1)
+		err = builder.TriggerCorePostExtract(appName, sourceWorkDir)
 	case "install":
 		err = builder.TriggerInstall()
+	case "post-app-clone-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = builder.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = builder.TriggerPostAppRenameSetup(oldAppName, newAppName)
 	case "post-delete":
 		appName := flag.Arg(0)
 		err = builder.TriggerPostDelete(appName)
 	case "report":
 		appName := flag.Arg(0)
 		err = builder.ReportSingleApp(appName, "", "")
-	case "core-post-extract":
-		appName := flag.Arg(0)
-		sourceWorkDir := flag.Arg(1)
-		err = builder.TriggerCorePostExtract(appName, sourceWorkDir)
 	default:
 		err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
 	}

plugins/builder/triggers.go

@@ -71,6 +71,29 @@ func TriggerInstall() error {
 	return nil
 }
 
+// TriggerPostAppCloneSetup creates new builder files
+func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
+	err := common.PropertyClone("builder", oldAppName, newAppName)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostAppRenameSetup renames builder files
+func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
+	if err := common.PropertyClone("builder", oldAppName, newAppName); err != nil {
+		return err
+	}
+
+	if err := common.PropertyDestroy("builder", oldAppName); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // TriggerPostDelete destroys the builder property for a given app container
 func TriggerPostDelete(appName string) error {
 	return common.PropertyDestroy("builder", appName)

plugins/logs/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/failed subcommands/report subcommands/set subcommands/vector-logs subcommands/vector-start subcommands/vector-stop
-TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/logs-get-property triggers/post-delete triggers/report
+TRIGGERS = triggers/docker-args-process-deploy triggers/install triggers/logs-get-property triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = logs
 

plugins/logs/src/triggers/triggers.go

@@ -27,6 +27,14 @@ func main() {
 		appName := flag.Arg(0)
 		property := flag.Arg(1)
 		err = logs.TriggerLogsGetProperty(appName, property)
+	case "post-app-clone-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = logs.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = logs.TriggerPostAppRenameSetup(oldAppName, newAppName)
 	case "post-delete":
 		appName := flag.Arg(0)
 		err = logs.TriggerPostDelete(appName)

plugins/logs/triggers.go

@@ -111,7 +111,30 @@ func TriggerLogsGetProperty(appName string, key string) error {
 	return nil
 }
 
-// TriggerPostDelete destroys the network property for a given app container
+// TriggerPostAppCloneSetup creates new logs files
+func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
+	err := common.PropertyClone("logs", oldAppName, newAppName)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostAppRenameSetup renames logs files
+func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
+	if err := common.PropertyClone("logs", oldAppName, newAppName); err != nil {
+		return err
+	}
+
+	if err := common.PropertyDestroy("logs", oldAppName); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostDelete destroys the logs property for a given app container
 func TriggerPostDelete(appName string) error {
 	return common.PropertyDestroy("logs", appName)
 }

plugins/network/triggers.go

@@ -255,12 +255,7 @@ func TriggerPostCreate(appName string) error {
 
 // TriggerPostDelete destroys the network property for a given app container
 func TriggerPostDelete(appName string) error {
-	err := common.PropertyDestroy("network", appName)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return common.PropertyDestroy("network", appName)
 }
 
 // TriggerCorePostDeploy associates the container with a specified network

plugins/nginx-vhosts/post-app-rename-setup

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail
 [[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
 source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
 source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/internal-functions"
 

plugins/registry/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/login subcommands/report subcommands/set
-TRIGGERS = triggers/deployed-app-image-repo triggers/deployed-app-image-tag triggers/deployed-app-repository triggers/install triggers/post-delete triggers/post-release-builder triggers/report
+TRIGGERS = triggers/deployed-app-image-repo triggers/deployed-app-image-tag triggers/deployed-app-repository triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/post-release-builder triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = registry
 

plugins/registry/src/triggers/triggers.go

@@ -29,6 +29,14 @@ func main() {
 		err = registry.TriggerDeployedAppRepository(appName)
 	case "install":
 		err = registry.TriggerInstall()
+	case "post-app-clone-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = registry.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = registry.TriggerPostAppRenameSetup(oldAppName, newAppName)
 	case "post-delete":
 		appName := flag.Arg(0)
 		err = registry.TriggerPostDelete(appName)

plugins/registry/triggers.go

@@ -49,6 +49,29 @@ func TriggerInstall() error {
 	return nil
 }
 
+// TriggerPostAppCloneSetup creates new registry files
+func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
+	err := common.PropertyClone("registry", oldAppName, newAppName)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostAppRenameSetup renames registry files
+func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
+	if err := common.PropertyClone("registry", oldAppName, newAppName); err != nil {
+		return err
+	}
+
+	if err := common.PropertyDestroy("registry", oldAppName); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // TriggerPostDelete destroys the registry property for a given app container
 func TriggerPostDelete(appName string) error {
 	return common.PropertyDestroy("registry", appName)

plugins/scheduler/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/report subcommands/set
-TRIGGERS = triggers/scheduler-detect triggers/install triggers/post-delete triggers/report
+TRIGGERS = triggers/scheduler-detect triggers/install triggers/post-app-clone-setup triggers/post-app-rename-setup triggers/post-delete triggers/report
 BUILD = commands subcommands triggers
 PLUGIN_NAME = scheduler
 

plugins/scheduler/src/triggers/triggers.go

@@ -18,17 +18,25 @@ func main() {
 
 	var err error
 	switch trigger {
-	case "scheduler-detect":
-		appName := flag.Arg(0)
-		err = scheduler.TriggerSchedulerDetect(appName)
 	case "install":
 		err = scheduler.TriggerInstall()
+	case "post-app-clone-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = scheduler.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename-setup":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = scheduler.TriggerPostAppRenameSetup(oldAppName, newAppName)
 	case "post-delete":
 		appName := flag.Arg(0)
 		err = scheduler.TriggerPostDelete(appName)
 	case "report":
 		appName := flag.Arg(0)
 		err = scheduler.ReportSingleApp(appName, "", "")
+	case "scheduler-detect":
+		appName := flag.Arg(0)
+		err = scheduler.TriggerSchedulerDetect(appName)
 	default:
 		err = fmt.Errorf("Invalid plugin trigger call: %s", trigger)
 	}

plugins/scheduler/triggers.go

@@ -65,6 +65,29 @@ func TriggerInstall() error {
 	return nil
 }
 
+// TriggerPostAppCloneSetup creates new scheduler files
+func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
+	err := common.PropertyClone("scheduler", oldAppName, newAppName)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// TriggerPostAppRenameSetup renames scheduler files
+func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
+	if err := common.PropertyClone("scheduler", oldAppName, newAppName); err != nil {
+		return err
+	}
+
+	if err := common.PropertyDestroy("scheduler", oldAppName); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // TriggerPostDelete destroys the scheduler property for a given app container
 func TriggerPostDelete(appName string) error {
 	return common.PropertyDestroy("scheduler", appName)