refactor: collect docker-options file helpers in functions.go
Moves `copyPhaseFile` and `removePhaseFile` next to the other phase-file helpers so the package keeps a single home for filesystem plumbing.
This commit is contained in:
3 files changed
+34
-42
No files matched your search
@@ -2,6 +2,7 @@ package dockeroptions
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -13,6 +14,39 @@ func getPhaseFilePath(appName string, phase string) string {
|
|||||||
return filepath.Join(common.AppRoot(appName), "DOCKER_OPTIONS_"+strings.ToUpper(phase))
|
return filepath.Join(common.AppRoot(appName), "DOCKER_OPTIONS_"+strings.ToUpper(phase))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func copyPhaseFile(srcApp string, dstApp string, phase string) error {
|
||||||
|
srcPath := getPhaseFilePath(srcApp, phase)
|
||||||
|
if !common.FileExists(srcPath) {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
src, err := os.Open(srcPath)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Unable to open docker options phase file %s.%s: %s", srcApp, phase, err.Error())
|
||||||
|
}
|
||||||
|
defer src.Close()
|
||||||
|
|
||||||
|
dstPath := getPhaseFilePath(dstApp, phase)
|
||||||
|
dst, err := os.OpenFile(dstPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("Unable to create docker options phase file %s.%s: %s", dstApp, phase, err.Error())
|
||||||
|
}
|
||||||
|
defer dst.Close()
|
||||||
|
|
||||||
|
if _, err := io.Copy(dst, src); err != nil {
|
||||||
|
return fmt.Errorf("Unable to copy docker options phase file %s.%s to %s.%s: %s", srcApp, phase, dstApp, phase, err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func removePhaseFile(appName string, phase string) error {
|
||||||
|
if err := os.Remove(getPhaseFilePath(appName, phase)); err != nil && !os.IsNotExist(err) {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func touchPhaseFile(appName string, phase string) error {
|
func touchPhaseFile(appName string, phase string) error {
|
||||||
phaseFilePath := getPhaseFilePath(appName, phase)
|
phaseFilePath := getPhaseFilePath(appName, phase)
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package dockeroptions
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/dokku/dokku/plugins/common"
|
"github.com/dokku/dokku/plugins/common"
|
||||||
)
|
)
|
||||||
@@ -96,10 +95,3 @@ func CommandReport(appName string, format string, infoFlag string) error {
|
|||||||
|
|
||||||
return ReportSingleApp(appName, format, infoFlag)
|
return ReportSingleApp(appName, format, infoFlag)
|
||||||
}
|
}
|
||||||
|
|
||||||
func removePhaseFile(appName string, phase string) error {
|
|
||||||
if err := os.Remove(getPhaseFilePath(appName, phase)); err != nil && !os.IsNotExist(err) {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,13 +1,5 @@
|
|||||||
package dockeroptions
|
package dockeroptions
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/dokku/dokku/plugins/common"
|
|
||||||
)
|
|
||||||
|
|
||||||
// TriggerPostAppCloneSetup copies docker option files from the source app to the cloned app
|
// TriggerPostAppCloneSetup copies docker option files from the source app to the cloned app
|
||||||
func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
|
func TriggerPostAppCloneSetup(oldAppName string, newAppName string) error {
|
||||||
for _, phase := range availablePhases {
|
for _, phase := range availablePhases {
|
||||||
@@ -37,29 +29,3 @@ func TriggerPostDelete(appName string) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func copyPhaseFile(srcApp string, dstApp string, phase string) error {
|
|
||||||
srcPath := getPhaseFilePath(srcApp, phase)
|
|
||||||
if !common.FileExists(srcPath) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
src, err := os.Open(srcPath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Unable to open docker options phase file %s.%s: %s", srcApp, phase, err.Error())
|
|
||||||
}
|
|
||||||
defer src.Close()
|
|
||||||
|
|
||||||
dstPath := getPhaseFilePath(dstApp, phase)
|
|
||||||
dst, err := os.OpenFile(dstPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("Unable to create docker options phase file %s.%s: %s", dstApp, phase, err.Error())
|
|
||||||
}
|
|
||||||
defer dst.Close()
|
|
||||||
|
|
||||||
if _, err := io.Copy(dst, src); err != nil {
|
|
||||||
return fmt.Errorf("Unable to copy docker options phase file %s.%s to %s.%s: %s", srcApp, phase, dstApp, phase, err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
Reference in new issue
Block a user