github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: add missing clone/rename setup code for golang plugins

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2021-10-09 23:49:46 -04:00
parent f949fe2a49
commit fddf130abd
16 changed files with 169 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/app-json/Makefile
View File

@@ -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

8
plugins/app-json/src/triggers/triggers.go
View File

@@ -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)

23
plugins/app-json/triggers.go
View File

@@ -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)

2
plugins/builder/Makefile
View File

@@ -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

16
plugins/builder/src/triggers/triggers.go
View File

@@ -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)
}

23
plugins/builder/triggers.go
View File

@@ -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)

2
plugins/logs/Makefile
View File

@@ -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

8
plugins/logs/src/triggers/triggers.go
View File

@@ -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)

25
plugins/logs/triggers.go
View File

@@ -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)
}

7
plugins/network/triggers.go
View File

@@ -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

2
plugins/registry/Makefile
View File

@@ -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

8
plugins/registry/src/triggers/triggers.go
View File

@@ -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)

23
plugins/registry/triggers.go
View File

@@ -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)

2
plugins/scheduler/Makefile
View File

@@ -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

14
plugins/scheduler/src/triggers/triggers.go
View File

@@ -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)
}

23
plugins/scheduler/triggers.go
View File

@@ -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)