Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3869 from dokku/plugn-trigger-calls

Browse Source 
Standardize plugin trigger calls
This commit is contained in:
Jose Diaz-Gonzalez
2020-02-22 16:50:42 -05:00
committed by GitHub
parent 59316f4a21 09b656e37e
commit b5be68f9d0
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/common/common.go
View File

@@ -75,19 +75,19 @@ func GetDeployingAppImageName(appName, imageTag, imageRepo string) (imageName st
LogFail("(GetDeployingAppImageName) APP must not be empty")
}
b, err := sh.Command("plugn", "trigger", "deployed-app-repository", appName).Output()
b, err := PlugnTriggerOutput("deployed-app-repository", []string{appName}...)
if err != nil {
LogFail(err.Error())
}
imageRemoteRepository := string(b[:])
b, err = sh.Command("plugn", "trigger", "deployed-app-image-tag", appName).Output()
b, err = PlugnTriggerOutput("deployed-app-image-tag", []string{appName}...)
if err != nil {
LogFail(err.Error())
}
newImageTag := string(b[:])
b, err = sh.Command("plugn", "trigger", "deployed-app-image-repo", appName).Output()
b, err = PlugnTriggerOutput("deployed-app-image-repo", []string{appName}...)
if err != nil {
LogFail(err.Error())
}
@@ -456,7 +456,7 @@ func DockerBin() string {
return dockerBin
}
//PlugnTrigger fire the given plugn trigger with the given args
// PlugnTrigger fire the given plugn trigger with the given args
func PlugnTrigger(triggerName string, args ...string) error {
shellArgs := make([]interface{}, len(args)+2)
shellArgs[0] = "trigger"
@@ -467,6 +467,17 @@ func PlugnTrigger(triggerName string, args ...string) error {
return sh.Command("plugn", shellArgs...).Run()
}
// PlugnTriggerOutput fire the given plugn trigger with the given args
func PlugnTriggerOutput(triggerName string, args ...string) ([]byte, error) {
shellArgs := make([]interface{}, len(args)+2)
shellArgs[0] = "trigger"
shellArgs[1] = triggerName
for i, arg := range args {
shellArgs[i+2] = arg
}
return sh.Command("plugn", shellArgs...).Output()
}
func times(str string, n int) (out string) {
for i := 0; i < n; i++ {
out += str

6
plugins/network/network.go
View File

@@ -75,14 +75,16 @@ func BuildConfig(appName string) {
port := GetContainerPort(appName, processType, isHerokuishContainer, containerID)
if ipAddress != "" {
_, err := sh.Command("plugn", "trigger", "network-write-ipaddr", appName, processType, containerIndexString, ipAddress).Output()
args := []string{appName, processType, containerIndexString, ipAddress}
_, err := common.PlugnTriggerOutput("network-write-ipaddr", args...)
if err != nil {
common.LogWarn(err.Error())
}
}
if port != "" {
_, err := sh.Command("plugn", "trigger", "network-write-port", appName, processType, containerIndexString, port).Output()
args := []string{appName, processType, containerIndexString, port}
_, err := common.PlugnTriggerOutput("network-write-port", args...)
if err != nil {
common.LogWarn(err.Error())
}