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

Remove environment.Environment struct

Browse source 
This commit completely removes the environment struct as it is no longer
used.
This commit is contained in:
Tom Wiesing 2023-03-02 12:52:51 +01:00
parent 3263920d6b
commit 473040a69f
No known key found for this signature in database
40 changed files with 91 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/bootstrap.go
View file

@ -10,7 +10,6 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/cli"
"github.com/FAU-CDI/wisski-distillery/internal/config"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
"github.com/FAU-CDI/wisski-distillery/pkg/fsx"
"github.com/FAU-CDI/wisski-distillery/pkg/logging"
"github.com/tkw1536/goprogram/exit"
@ -70,15 +69,11 @@ var errBootstrapCreateFile = exit.Error{
}
func (bs cBootstrap) Run(context wisski_distillery.Context) error {
// installation environment is the native environment!
// TODO: Should this be configurable?
var env environment.Environment
root := bs.Directory
// check that we didn't get a different base directory
{
got, err := cli.ReadBaseDirectory(env)
got, err := cli.ReadBaseDirectory()
if err == nil && got != "" && got != root {
return errBootstrapDifferent.WithMessageF(got)
}
@ -89,7 +84,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
if err := fsx.MkdirAll(root, fsx.DefaultDirPerm); err != nil {
return errBootstrapFailedToCreateDirectory.WithMessageF(root)
}
if err := cli.WriteBaseDirectory(env, root); err != nil {
if err := cli.WriteBaseDirectory(root); err != nil {
return errBootstrapFailedToSaveDirectory.WithMessageF(root)
}
context.Println(root)
@ -105,7 +100,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
tpl.DefaultDomain = bs.Hostname
// and use thge defaults
if err := tpl.SetDefaults(env); err != nil {
if err := tpl.SetDefaults(); err != nil {
return errBootstrapWriteConfig.WithMessageF(err)
}
@ -154,7 +149,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
}
// Validate configuration file!
if err := cfg.Validate(env); err != nil {
if err := cfg.Validate(); err != nil {
return err
}
@ -191,7 +186,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
defer f.Close()
var cfg config.Config
if err := cfg.Unmarshal(env, f); err != nil {
if err := cfg.Unmarshal(f); err != nil {
return errBootstrapOpenConfig.WithMessageF(err)
}
context.Println(cfg)

8
cmd/config_migrate.go
View file

@ -8,7 +8,6 @@ import (
"github.com/FAU-CDI/wisski-distillery/internal/cli"
"github.com/FAU-CDI/wisski-distillery/internal/config"
"github.com/FAU-CDI/wisski-distillery/internal/config/legacy"
"github.com/FAU-CDI/wisski-distillery/pkg/environment"
)
// ConfigMigrate is the config-migrate command
@ -31,9 +30,6 @@ func (cfgMigrate) Description() wisski_distillery.Description {
}
func (c cfgMigrate) Run(context wisski_distillery.Context) error {
// migration environment is the native environment!
var env environment.Environment
// open the legacy file
file, err := os.Open(c.Positionals.Input)
if err != nil {
@ -46,12 +42,12 @@ func (c cfgMigrate) Run(context wisski_distillery.Context) error {
var cfg config.Config
// migrate the legacy config
if err := legacy.Migrate(&cfg, env, file); err != nil {
if err := legacy.Migrate(&cfg, file); err != nil {
return err
}
// validate it!
if err := cfg.Validate(env); err != nil {
if err := cfg.Validate(); err != nil {
return err
}

2
cmd/server.go
View file

@ -39,7 +39,7 @@ func (s server) Run(context wisski_distillery.Context) error {
// if the caller requested a trigger, just trigger the cron tasks
if s.Trigger {
return dis.Control().Trigger(context.Context, context.Environment.Environment)
return dis.Control().Trigger(context.Context)
}
{

4
cmd/system_pause.go
View file

@ -63,7 +63,7 @@ func (sp systempause) start(context wisski_distillery.Context, dis *dis.Distille
PrefixAlign: true,
Handler: func(item component.Installable, index int, writer io.Writer) error {
return item.Stack(context.Environment.Environment).Up(context.Context, writer)
return item.Stack().Up(context.Context, writer)
},
}, dis.Installable()); err != nil {
return err
@ -127,7 +127,7 @@ func (sp systempause) stop(context wisski_distillery.Context, dis *dis.Distiller
PrefixAlign: true,
Handler: func(item component.Installable, index int, writer io.Writer) error {
return item.Stack(context.Environment.Environment).Down(context.Context, writer)
return item.Stack().Down(context.Context, writer)
},
}, dis.Installable()); err != nil {
return err

2
cmd/system_update.go
View file

@ -132,7 +132,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) error {
PrefixAlign: true,
Handler: func(item component.Installable, index int, writer io.Writer) error {
stack := item.Stack(context.Environment.Environment)
stack := item.Stack()
if err := stack.Install(context.Context, writer, item.Context(ctx)); err != nil {
return err