refactor: move all golang code for managing data directories to common plugin

Additionally, ensure the golang plugins handle setup/teardown of plugin and app-specific data directories during install, rename, and clone phases.

plugins/app-json/Makefile

@@ -1,5 +1,5 @@
 SUBCOMMANDS = subcommands/report subcommands/set
-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
+TRIGGERS = triggers/app-json-process-deploy-parallelism 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
 BUILD = commands subcommands triggers
 PLUGIN_NAME = app-json
 

plugins/app-json/appjson.go

@@ -45,7 +45,7 @@ type Formation struct {
 
 // GetAppjsonDirectory returns the directory containing a given app's extracted app.json file
 func GetAppjsonDirectory(appName string) string {
-	return filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "app-json", appName)
+	return common.GetAppDataDirectory("app-json", appName)
 }
 
 // GetAppjsonPath returns the path to a given app's extracted app.json file

plugins/app-json/functions.go

@@ -455,12 +455,12 @@ func createdContainerID(appName string, dockerArgs []string, image string, comma
 }
 
 func refreshAppJSON(appName string, image string) error {
-	baseDirectory := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "app-json")
+	baseDirectory := common.GetDataDirectory("app-json")
 	if !common.DirectoryExists(baseDirectory) {
 		return errors.New("Run 'dokku plugin:install' to ensure the correct directories exist")
 	}
 
-	directory := GetAppjsonDirectory(appName)
+	directory := common.GetAppDataDirectory("app-json", appName)
 	if !common.DirectoryExists(directory) {
 		if err := os.MkdirAll(directory, 0755); err != nil {
 			return err
@@ -514,7 +514,7 @@ func injectDokkuScale(appName string, image string) error {
 		return err
 	}
 
-	baseDirectory := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "app-json")
+	baseDirectory := common.GetDataDirectory("app-json")
 	if !common.DirectoryExists(baseDirectory) {
 		return errors.New("Run 'dokku plugin:install' to ensure the correct directories exist")
 	}

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

@@ -28,6 +28,10 @@ func main() {
 		oldAppName := flag.Arg(0)
 		newAppName := flag.Arg(1)
 		err = appjson.TriggerPostAppCloneSetup(oldAppName, newAppName)
+	case "post-app-rename":
+		oldAppName := flag.Arg(0)
+		newAppName := flag.Arg(1)
+		err = appjson.TriggerPostAppRename(oldAppName, newAppName)
 	case "post-app-rename-setup":
 		oldAppName := flag.Arg(0)
 		newAppName := flag.Arg(1)

plugins/app-json/triggers.go

@@ -3,7 +3,6 @@ package appjson
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 
 	"github.com/dokku/dokku/plugins/common"
 )
@@ -34,18 +33,17 @@ func TriggerAppJSONProcessDeployParallelism(appName string, processType string)
 	return nil
 }
 
-// TriggerInstall initializes app restart policies
+// TriggerInstall initializes app-json directory structures
 func TriggerInstall() error {
 	if err := common.PropertySetup("app-json"); err != nil {
 		return fmt.Errorf("Unable to install the app-json plugin: %s", err.Error())
 	}
 
-	directory := filepath.Join(common.MustGetEnv("DOKKU_LIB_ROOT"), "data", "app-json")
-	if err := os.MkdirAll(directory, 0755); err != nil {
+	if err := common.SetupAppData("app-json"); err != nil {
 		return err
 	}
 
-	return common.SetPermissions(directory, 0755)
+	return nil
 }
 
 // TriggerPostAppCloneSetup creates new app-json files
@@ -55,7 +53,12 @@ func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
 		return err
 	}
 
-	return nil
+	return common.CloneAppData("app-json", oldAppName, newAppName)
+}
+
+// TriggerPostAppRename removes the old app data
+func TriggerPostAppRename(oldAppName string, newAppName string) error {
+	return common.RemoveAppDataDirectory("app-json", oldAppName)
 }
 
 // TriggerPostAppRenameSetup renames app-json files
@@ -68,13 +71,17 @@ func TriggerPostAppRenameSetup(oldAppName string, newAppName string) error {
 		return err
 	}
 
-	return nil
+	return common.CloneAppData("app-json", oldAppName, newAppName)
+}
+
+// TriggerPostCreate ensures apps the correct data directory structure
+func TriggerPostCreate(appName string) error {
+	return common.CreateAppDataDirectory("app-json", appName)
 }
 
 // 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)
-	dataErr := os.RemoveAll(directory)
+	dataErr := os.RemoveAll(common.GetAppDataDirectory("app-json", appName))
 	propertyErr := common.PropertyDestroy("app-json", appName)
 
 	if dataErr != nil {