beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temporary updates to force project loading

Browse Source
This commit is contained in:
Chris Roberts 2021-07-29 14:54:15 -07:00 committed by Paul Hinze
parent 6b9e2561dc
commit 4e28d59806
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
internal/cli/base.go
View File

@ -141,7 +141,7 @@ func BaseCommand(ctx context.Context, log hclog.Logger, logOutput io.Writer, opt
} }
// Setup our basis path // Setup our basis path
homeConfigPath, err := paths.VagrantHome() homeConfigPath, err := paths.VagrantConfig()
if err != nil { if err != nil {
bc.ui.Output(clierrors.Humanize(err), terminal.WithErrorStyle()) bc.ui.Output(clierrors.Humanize(err), terminal.WithErrorStyle())
return nil, err return nil, err
@ -181,12 +181,12 @@ func BaseCommand(ctx context.Context, log hclog.Logger, logOutput io.Writer, opt
basisOpts := []clientpkg.Option{ basisOpts := []clientpkg.Option{
clientpkg.WithLogger(bc.Log.ResetNamed("vagrant.client")), clientpkg.WithLogger(bc.Log.ResetNamed("vagrant.client")),
clientpkg.WithClientConnect(connectOpts...), clientpkg.WithClientConnect(connectOpts...),
clientpkg.WithBasis( // clientpkg.WithBasis(
&vagrant_server.Basis{ // &vagrant_server.Basis{
Name: homeConfigPath.String(), // Name: homeConfigPath.String(),
Path: homeConfigPath.String(), // Path: homeConfigPath.String(),
}, // },
), // ),
} }
if !bc.flagRemote { if !bc.flagRemote {
basisOpts = append(basisOpts, clientpkg.WithLocal()) basisOpts = append(basisOpts, clientpkg.WithLocal())
@ -201,6 +201,24 @@ func BaseCommand(ctx context.Context, log hclog.Logger, logOutput io.Writer, opt
return nil, err return nil, err
} }
// Determine if we are in a project and setup if so
cwd, err := path.NewPath(".").Abs()
if err != nil {
panic("cannot setup local directory")
}
if true { //} _, err := config.FindPath("", ""); err == nil {
bc.project, err = basis.LoadProject(
&vagrant_server.Project{
Name: cwd.Base().String(),
Path: cwd.String(),
Basis: basis.Ref(),
},
)
if err != nil {
return nil, err
}
}
bc.basis = basis bc.basis = basis
return bc, err return bc, err
@ -253,24 +271,6 @@ func (c *baseCommand) Init(opts ...Option) error {
// c.basis.SetRef(&vagrant_server.Ref_Basis{Name: c.flagBasis}) // c.basis.SetRef(&vagrant_server.Ref_Basis{Name: c.flagBasis})
// } // }
// Determine if we are in a project and setup if so
cwd, err := path.NewPath(".").Abs()
if err != nil {
panic("cannot setup local directory")
}
if _, err := config.FindPath("", ""); err == nil {
c.project, err = c.basis.LoadProject(
&vagrant_server.Project{
Name: cwd.String(),
Path: cwd.String(),
Basis: c.basis.Ref(),
},
)
if err != nil {
return err
}
}
// Parse the configuration // Parse the configuration
c.cfg = &config.Config{} c.cfg = &config.Config{}