From dcb6f4a9be7ebfc3a1d0402ba14c0e87181ebdd2 Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 17 May 2021 16:39:40 -0700 Subject: [PATCH] Update config machines to targets. Get refs from plugin sdk --- internal/config/basis.go | 2 +- internal/config/project.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/config/basis.go b/internal/config/basis.go index 80e8b6828..4323d881a 100644 --- a/internal/config/basis.go +++ b/internal/config/basis.go @@ -14,7 +14,7 @@ type Basis struct { // These should _roughly_ map to existing Vagrantfile configurations Vagrant *Vagrant `hcl:"vagrant,block"` - Machines []*Machine `hcl:"machine,block"` + Targets []*Target `hcl:"target,block"` Communicators []*Communicator `hcl:"communicator,block"` Body hcl.Body `hcl:",body"` diff --git a/internal/config/project.go b/internal/config/project.go index 9c1218d12..5835e3efe 100644 --- a/internal/config/project.go +++ b/internal/config/project.go @@ -3,7 +3,7 @@ package config import ( "github.com/hashicorp/hcl/v2" - "github.com/hashicorp/vagrant/internal/server/proto/vagrant_server" + "github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk" ) type Project struct { @@ -21,11 +21,11 @@ type Project struct { Remain hcl.Body `hcl:",remain"` path string - ref *vagrant_server.Ref_Project + ref *vagrant_plugin_sdk.Ref_Project config *Config } -func (p *Project) Ref() *vagrant_server.Ref_Project { +func (p *Project) Ref() *vagrant_plugin_sdk.Ref_Project { return p.ref }