From 43bd58f3d39d0b86a38919aa37462edebab3f0b0 Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Mon, 17 May 2021 16:37:30 -0700
Subject: [PATCH] Update builtins for project changes

---
 builtin/myplugin/command/info.go | 18 +++++++++---------
 builtin/otherplugin/command.go   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/builtin/myplugin/command/info.go b/builtin/myplugin/command/info.go
index 0e4491ac7..3d4a0fb97 100644
--- a/builtin/myplugin/command/info.go
+++ b/builtin/myplugin/command/info.go
@@ -67,21 +67,21 @@ func (c *Info) Flags() []*option.Option {
 	return []*option.Option{}
 }
 
-func (c *Info) Execute(trm terminal.UI, env plugincore.Project) int64 {
-	mn, _ := env.MachineNames()
+func (c *Info) Execute(trm terminal.UI, p plugincore.Project) int64 {
+	mn, _ := p.MachineNames()
 	trm.Output("\nMachines in this project")
 	trm.Output(strings.Join(mn[:], "\n"))
 
-	cwd, _ := env.CWD()
-	datadir, _ := env.DataDir()
-	vagrantfileName, _ := env.VagrantfileName()
-	home, _ := env.Home()
-	localDataPath, _ := env.LocalData()
-	defaultPrivateKeyPath, _ := env.DefaultPrivateKey()
+	cwd, _ := p.CWD()
+	datadir, _ := p.DataDir()
+	vagrantfileName, _ := p.VagrantfileName()
+	home, _ := p.Home()
+	localDataPath, _ := p.LocalData()
+	defaultPrivateKeyPath, _ := p.DefaultPrivateKey()
 
 	trm.Output("\nEnvironment information")
 	trm.Output("Working directory: " + cwd)
-	trm.Output("Data directory: " + datadir)
+	trm.Output("Data directory: " + datadir.DataDir().String())
 	trm.Output("Vagrantfile name: " + vagrantfileName)
 	trm.Output("Home directory: " + home)
 	trm.Output("Local data directory: " + localDataPath)
diff --git a/builtin/otherplugin/command.go b/builtin/otherplugin/command.go
index 1fbedaac9..9168d2cce 100644
--- a/builtin/otherplugin/command.go
+++ b/builtin/otherplugin/command.go
@@ -93,21 +93,21 @@ func (c *Command) ExecuteThing(trm terminal.UI, flags map[string]interface{}) in
 	return 0
 }
 
-func (c *Command) ExecuteInfo(trm terminal.UI, env plugincore.Project) int64 {
-	mn, _ := env.MachineNames()
+func (c *Command) ExecuteInfo(trm terminal.UI, p plugincore.Project) int64 {
+	mn, _ := p.MachineNames()
 	trm.Output("\nMachines in this project")
 	trm.Output(strings.Join(mn[:], "\n"))
 
-	cwd, _ := env.CWD()
-	datadir, _ := env.DataDir()
-	vagrantfileName, _ := env.VagrantfileName()
-	home, _ := env.Home()
-	localDataPath, _ := env.LocalData()
-	defaultPrivateKeyPath, _ := env.DefaultPrivateKey()
+	cwd, _ := p.CWD()
+	datadir, _ := p.DataDir()
+	vagrantfileName, _ := p.VagrantfileName()
+	home, _ := p.Home()
+	localDataPath, _ := p.LocalData()
+	defaultPrivateKeyPath, _ := p.DefaultPrivateKey()
 
 	trm.Output("\nEnvironment information")
 	trm.Output("Working directory: " + cwd)
-	trm.Output("Data directory: " + datadir)
+	trm.Output("Data directory: " + datadir.DataDir().String())
 	trm.Output("Vagrantfile name: " + vagrantfileName)
 	trm.Output("Home directory: " + home)
 	trm.Output("Local data directory: " + localDataPath)