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

Merge internal/stack => component

Browse source
This commit is contained in:
Tom Wiesing 2022-09-11 16:03:13 +02:00
parent 7b2f79bea1
commit 91a088a56a
No known key found for this signature in database
16 changed files with 40 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

16
env/instances.go vendored
View file

@ -11,10 +11,10 @@ import (
"path/filepath"
"strings"
"github.com/FAU-CDI/wisski-distillery/component"
"github.com/FAU-CDI/wisski-distillery/embed"
"github.com/FAU-CDI/wisski-distillery/internal/bookkeeping"
"github.com/FAU-CDI/wisski-distillery/internal/fsx"
"github.com/FAU-CDI/wisski-distillery/internal/stack"
"github.com/alessio/shellescape"
"github.com/pkg/errors"
"github.com/tkw1536/goprogram/exit"
@ -229,9 +229,9 @@ func (instance Instance) URL() *url.URL {
}
// Stack represents a stack representing this instance
func (instance Instance) Stack() stack.Installable {
return stack.Installable{
Stack: stack.Stack{
func (instance Instance) Stack() component.Installable {
return component.Installable{
Stack: component.Stack{
Dir: instance.FilesystemBase,
},
Resources: embed.ResourceEmbed, // TODO: Move this over
@ -260,9 +260,9 @@ func (instance Instance) Stack() stack.Installable {
}
}
func (instance Instance) ReserveStack() stack.Installable {
return stack.Installable{
Stack: stack.Stack{
func (instance Instance) ReserveStack() component.Installable {
return component.Installable{
Stack: component.Stack{
Dir: instance.FilesystemBase,
},
ContextPath: filepath.Join("resources", "compose", "reserve"),
@ -282,7 +282,7 @@ func (instance Instance) Provision(io stream.IOStream) error {
// create the basic st!
st := instance.Stack()
if err := st.Install(io, stack.InstallationContext{}); err != nil {
if err := st.Install(io, component.InstallationContext{}); err != nil {
return err
}