rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkg/environment: Migrate fs functions to fsx

Browse source
This commit is contained in:
Tom Wiesing 2023-03-02 11:38:30 +01:00
parent 45540ab253
commit 5a43ecfaeb
No known key found for this signature in database
21 changed files with 155 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pkg/unpack/resource.go
View file

@ -7,6 +7,7 @@ import (
"path/filepath"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/pkg/errors"
)
@ -83,8 +84,8 @@ func installDir(env environment.Environment, dst string, srcInfo fs.FileInfo, sr
// create the destination
dstStat, dstErr := os.Stat(dst)
switch {
case environment.IsNotExist(dstErr):
if err := env.MkdirAll(dst, srcInfo.Mode()); err != nil {
case os.IsNotExist(dstErr):
if err := fsx.MkdirAll(dst, srcInfo.Mode()); err != nil {
return errors.Wrapf(err, "Error creating destination directory %s", dst)
}
case dstErr != nil:
@ -121,7 +122,7 @@ func installDir(env environment.Environment, dst string, srcInfo fs.FileInfo, sr
func installFile(env environment.Environment, dst string, srcInfo fs.FileInfo, src fs.File) error {
// create the file using the right mode!
file, err := env.Create(dst, srcInfo.Mode())
file, err := fsx.Create(dst, srcInfo.Mode())
if err != nil {
return err
}

3
pkg/unpack/template.go
View file

@ -9,6 +9,7 @@ import (
"strings"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"golang.org/x/exp/maps"
"golang.org/x/exp/slices"
)
@ -222,7 +223,7 @@ func InstallTemplate(env environment.Environment, dst string, context map[string
}
// open the destination file
file, err := env.Create(dst, srcInfo.Mode())
file, err := fsx.Create(dst, srcInfo.Mode())
if err != nil {
return err
}