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

Update types used

Browse Source
This commit is contained in:
Chris Roberts 2021-08-05 11:33:46 -07:00 committed by Paul Hinze
parent cd222f4622
commit dd9f7f19b4
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/cli/base_init.go
View File

@ -37,12 +37,12 @@ func (c *baseCommand) initConfig(optional bool) (*configpkg.Config, error) {
// initConfigPath returns the configuration path to load.
func (c *baseCommand) initConfigPath() (string, error) {
// This configuarion is for the Vagrant process, not the same as a Vagrantfile
path, err := configpkg.FindPath("", "vagrant-config.hcl")
path, err := configpkg.FindPath(nil, "vagrant-config.hcl")
if err != nil {
return "", fmt.Errorf("Error looking for a Vagrant configuration: %s", err)
}
return path, nil
return path.String(), nil
}
// initConfigLoad loads the configuration at the given path.
@ -61,11 +61,9 @@ func (c *baseCommand) initConfigLoad(path string) (*configpkg.Config, error) {
}
// initClient initializes the client.
func (c *baseCommand) initClient() (*clientpkg.Basis, error) {
func (c *baseCommand) initClient() (*clientpkg.Client, error) {
// Start building our client options
opts := []clientpkg.Option{
clientpkg.WithLabels(c.flagLabels),
clientpkg.WithSourceOverrides(c.flagRemoteSource),
clientpkg.WithConfig(c.cfg),
}