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

pkg/environment: Remove some file-based functions

Browse source 
This commit removes certain file-based functions from 'pkg/environment',
continuing the migration to entirely remove the package.
This commit is contained in:
Tom Wiesing 2023-03-02 11:15:15 +01:00
parent 39207a1cb5
commit 45540ab253
No known key found for this signature in database
20 changed files with 52 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/dis/component/exporter/iface.go
View file

@ -3,6 +3,7 @@ package exporter
import (
"context"
"io"
"os"
"path/filepath"
"github.com/FAU-CDI/wisski-distillery/internal/models"
@ -83,7 +84,7 @@ func (exporter *Exporter) MakeExport(ctx context.Context, progress io.Writer, ta
if !task.StagingOnly {
defer func() {
logging.LogMessage(progress, ctx, "Removing staging directory")
exporter.Environment.RemoveAll(stagingDir)
os.RemoveAll(stagingDir)
}()
}

3
internal/dis/component/exporter/logger/logger.go
View file

@ -2,6 +2,7 @@ package logger
import (
"context"
"os"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql"
@ -62,7 +63,7 @@ func (log *Logger) Log(ctx context.Context) ([]models.Export, error) {
// partition out the exports that have been deleted!
parts := collection.Partition(exports, func(s models.Export) bool {
_, err := log.Still.Environment.Stat(s.Path)
_, err := os.Stat(s.Path)
return !environment.IsNotExist(err)
})

5
internal/dis/component/exporter/prune.go
View file

@ -3,6 +3,7 @@ package exporter
import (
"context"
"io"
"os"
"path/filepath"
"time"
@ -20,7 +21,7 @@ func (exporter *Exporter) PruneExports(ctx context.Context, progress io.Writer)
sPath := exporter.ArchivePath()
// list all the files
entries, err := exporter.Still.Environment.ReadDir(sPath)
entries, err := os.ReadDir(sPath)
if err != nil {
return err
}
@ -46,7 +47,7 @@ func (exporter *Exporter) PruneExports(ctx context.Context, progress io.Writer)
path := filepath.Join(sPath, entry.Name())
logging.ProgressF(progress, ctx, "Removing %s cause it is older than %d days\n", path, exporter.Config.MaxBackupAge)
if err := exporter.Still.Environment.Remove(path); err != nil {
if err := os.Remove(path); err != nil {
return err
}
}

3
internal/dis/component/instances/purger/purger.go
View file

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"io"
"os"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances"
@ -50,7 +51,7 @@ func (purger *Purger) Purge(ctx context.Context, out io.Writer, slug string) err
// remove the filesystem
logging.LogMessage(out, ctx, "Removing from filesystem %s", instance.FilesystemBase)
if err := purger.Environment.RemoveAll(instance.FilesystemBase); err != nil {
if err := os.RemoveAll(instance.FilesystemBase); err != nil {
fmt.Fprintln(out, err)
}

3
internal/dis/component/server/home/redirect.go
View file

@ -4,6 +4,7 @@ import (
"context"
"encoding/json"
"net/http"
"os"
"strings"
)
@ -18,7 +19,7 @@ func (home *Home) loadRedirect(ctx context.Context) (redirect Redirect, err erro
redirect.Permanent = false
// load the overrides file
overrides, err := home.Environment.Open(home.Config.Paths.OverridesJSON)
overrides, err := os.Open(home.Config.Paths.OverridesJSON)
if err != nil {
return redirect, err
}

3
internal/dis/component/ssh2/server_hostkeys.go
View file

@ -8,6 +8,7 @@ import (
"crypto/x509"
"encoding/pem"
"io"
"os"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/logging"
@ -64,7 +65,7 @@ func (ssh2 *SSH2) UseOrMakeHostKey(progress io.Writer, ctx context.Context, serv
func (ssh2 *SSH2) ReadOrMakeHostKey(progress io.Writer, ctx context.Context, privateKeyPath string, algorithm HostKeyAlgorithm) (key gossh.Signer, err error) {
hostKey := NewHostKey(algorithm)
if _, e := ssh2.Environment.Lstat(privateKeyPath); environment.IsNotExist(e) { // path doesn't exist => generate a new key there!
if _, e := os.Lstat(privateKeyPath); environment.IsNotExist(e) { // path doesn't exist => generate a new key there!
err = ssh2.makeHostKey(progress, ctx, hostKey, privateKeyPath)
if err != nil {
err = errors.Wrap(err, "Unable to generate new host key")

2
internal/dis/component/stack.go
View file

@ -173,7 +173,7 @@ func (ds Stack) compose(ctx context.Context, io stream.IOStream, args ...string)
var err error
ds.DockerExecutable, err = execx.LookPathAbs("docker")
if err != nil {
return environment.ExecCommandErrorFunc
return execx.CommandErrorFunc
}
}
return execx.Exec(ctx, io, ds.Dir, ds.DockerExecutable, append([]string{"compose"}, args...)...)

6
internal/dis/init.go
View file

@ -1,6 +1,8 @@
package dis
import (
"os"
"github.com/FAU-CDI/wisski-distillery/internal/cli"
"github.com/FAU-CDI/wisski-distillery/internal/config"
"github.com/FAU-CDI/wisski-distillery/internal/dis/component"
@ -39,7 +41,7 @@ func NewDistillery(params cli.Params, flags cli.Flags, req cli.Requirements) (di
dis.Upstream.SQL = "sql:3306"
dis.Upstream.Triplestore = "triplestore:7200"
dis.Upstream.Solr = "solr:8983"
params.ConfigPath = dis.Still.Environment.GetEnv("CONFIG_PATH")
params.ConfigPath = os.Getenv("CONFIG_PATH")
}
// if we don't need to load the config, there is nothing to do
@ -57,7 +59,7 @@ func NewDistillery(params cli.Params, flags cli.Flags, req cli.Requirements) (di
}
// open the config file!
f, err := dis.Still.Environment.Open(params.ConfigPath)
f, err := os.Open(params.ConfigPath)
if err != nil {
return nil, errOpenConfig.WithMessageF(err)
}

5
internal/wisski/ingredient/php/extras/prefixes.go
View file

@ -3,6 +3,7 @@ package extras
import (
"bufio"
"context"
"os"
"path/filepath"
"strings"
@ -82,7 +83,7 @@ func (wisski *Prefixes) database(ctx context.Context, server *phpx.Server) (pref
func (prefixes *Prefixes) blocked() ([]string, error) {
// open the resolver block file
// TODO: move this to the distillery
file, err := prefixes.Malt.Environment.Open(prefixes.Malt.Config.Paths.ResolverBlocks)
file, err := os.Open(prefixes.Malt.Config.Paths.ResolverBlocks)
if err != nil {
return nil, err
}
@ -123,7 +124,7 @@ func (wisski *Prefixes) filePrefixes() (prefixes []string, err error) {
return nil, nil
}
file, err := wisski.Malt.Environment.Open(path)
file, err := os.Open(path)
if err != nil {
return nil, err
}