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

fix: correct stickler-ci errors and remove unused code

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2020-08-31 18:44:00 -04:00
parent 2b65def123
commit b8b6d64f75
3 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/common/common.go
View File

@@ -38,7 +38,7 @@ func NewShellCmd(command string) *ShellCmd {
return NewShellCmdWithArgs(cmd, args...)
}
// NewShellCmd returns a new ShellCmd struct
// NewShellCmdWithArgs returns a new ShellCmd struct
func NewShellCmdWithArgs(cmd string, args ...string) *ShellCmd {
commandString := strings.Join(append([]string{cmd}, args...), " ")
@@ -50,7 +50,7 @@ func NewShellCmdWithArgs(cmd string, args ...string) *ShellCmd {
}
}
func (sc *ShellCmd) Setup() {
func (sc *ShellCmd) setup() {
env := os.Environ()
for k, v := range sc.Env {
env = append(env, fmt.Sprintf("%s=%s", k, v))
@@ -64,7 +64,7 @@ func (sc *ShellCmd) Setup() {
// Execute is a lightweight wrapper around exec.Command
func (sc *ShellCmd) Execute() bool {
sc.Setup()
sc.setup()
if err := sc.Command.Run(); err != nil {
return false
@@ -74,13 +74,13 @@ func (sc *ShellCmd) Execute() bool {
// Output is a lightweight wrapper around exec.Command.Output()
func (sc *ShellCmd) Output() ([]byte, error) {
sc.Setup()
sc.setup()
return sc.Command.Output()
}
// CombinedOutput is a lightweight wrapper around exec.Command.CombinedOutput()
func (sc *ShellCmd) CombinedOutput() ([]byte, error) {
sc.Setup()
sc.setup()
return sc.Command.CombinedOutput()
}
@@ -90,7 +90,7 @@ func AppRoot(appName string) string {
return fmt.Sprintf("%v/%v", dokkuRoot, appName)
}
// AppRoot returns the app root path
// AppHostRoot returns the app root path
func AppHostRoot(appName string) string {
dokkuHostRoot := MustGetEnv("DOKKU_HOST_ROOT")
return fmt.Sprintf("%v/%v", dokkuHostRoot, appName)
@@ -920,31 +920,3 @@ func pruneUnusedImages(appName string) {
pruneCmd.Command.Stderr = &stderr
pruneCmd.Execute()
}
func ConfigGet(appName string, key string, defaultValue string) (string, error) {
b, err := PlugnTriggerOutput("config-get", []string{appName, key}...)
if err != nil {
return defaultValue, err
}
value := defaultValue
if string(b[:]) != "" {
value = string(b[:])
}
return value, nil
}
func ConfigGetGlobal(key string, defaultValue string) (string, error) {
b, err := PlugnTriggerOutput("config-get-global", []string{key}...)
if err != nil {
return defaultValue, err
}
value := defaultValue
if string(b[:]) != "" {
value = string(b[:])
}
return value, nil
}