add environment variable support

Author: bmatcuk

README.md

@@ -13,6 +13,9 @@ extract the archive. Then copy the binary to [the terraform plugin directory].
 ```hcl
 resource "vagrant_vm" "my_vagrant_vm" {
   vagrantfile_dir = "path/to/dir"
+  env = {
+    "key": "value",
+  }
 }
 ```
 
@@ -21,6 +24,9 @@ Vagrantfile must exist when terraform runs or else it will throw an error. This
 option defaults to `.`, ie, the current directory and you may set this value to
 absolute or relative paths.
 
+**env** is a map of additional environment variables to pass to the Vagrantfile.
+The environment variables set by the calling process are always passed.
+
 ### Outputs
 * `ssh_config.#` - SSH connection info. Since a Vagrantfile may create multiple
   machines, this is a list with the following variables:
@@ -33,5 +39,11 @@ absolute or relative paths.
   * `ssh_config.*.agent` - whether or not to use the agent for authentication
     (always "false" for now).
 
+If there is only one machine built by the Vagrantfile, the connection info will
+be set in the `resource` block so you can include provisioners without any
+additional configuration. However, if there are more than one machines, the
+connection info will not be set; you'll need to create some `null_resources` to
+do your provisioning.
+
 [the latest release]: https://github.com/bmatcuk/terraform-provider-vagrant/releases/latest
 [the terraform plugin directory]: https://www.terraform.io/docs/configuration/providers.html#third-party-plugins

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/bmatcuk/go-vagrant v1.1.2
+	github.com/bmatcuk/go-vagrant v1.2.1
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357 // indirect
 	github.com/hashicorp/go-cleanhttp v0.0.0-20171218145408-d5fe4b57a186 // indirect

go.sum

@@ -18,6 +18,10 @@ github.com/bmatcuk/go-vagrant v1.1.1 h1:rZ+zCTv3xJM1LINJwVtVGkXs+L6HXstA2QnX8QLf
 github.com/bmatcuk/go-vagrant v1.1.1/go.mod h1:wybyCOf1R4TB2OXU8l6ghwqlCUJvBhWS5TeVpNj1doc=
 github.com/bmatcuk/go-vagrant v1.1.2 h1:ZZsbvNSg3DmhzNSoPbd0MvbPwWSnkSfVfJdPbtBmQiA=
 github.com/bmatcuk/go-vagrant v1.1.2/go.mod h1:wybyCOf1R4TB2OXU8l6ghwqlCUJvBhWS5TeVpNj1doc=
+github.com/bmatcuk/go-vagrant v1.2.0 h1:z8tZAwribzCSs9HEPv7snqqXYghH/3VXBTlD4zGFTeE=
+github.com/bmatcuk/go-vagrant v1.2.0/go.mod h1:wybyCOf1R4TB2OXU8l6ghwqlCUJvBhWS5TeVpNj1doc=
+github.com/bmatcuk/go-vagrant v1.2.1 h1:GQddoSzp8qtNzQAlob5wHvAUPQL7gy3VapBf7SgJ0Bk=
+github.com/bmatcuk/go-vagrant v1.2.1/go.mod h1:wybyCOf1R4TB2OXU8l6ghwqlCUJvBhWS5TeVpNj1doc=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/go-ini/ini v1.25.4 h1:Mujh4R/dH6YL8bxuISne3xX2+qcQ9p0IxKAP6ExWoUo=

resource_vagrant_vm.go

@@ -5,6 +5,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 
 	"context"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -32,6 +33,24 @@ func resourceVagrantVM() *schema.Resource {
 				ValidateFunc: resourceVagrantVMPathToVagrantfileValidate,
 			},
 
+			"env": {
+				Description: "Environment variables to pass to the Vagrantfile.",
+				Type:        schema.TypeMap,
+				Optional:    true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+
+			"machine_names": {
+				Description: "Names of the vagrant machines from the Vagrantfile. Names are in the same order as ssh_config.",
+				Type:        schema.TypeList,
+				Computed:    true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+
 			"ssh_config": {
 				Description: "SSH connection information.",
 				Type:        schema.TypeList,
@@ -91,6 +110,8 @@ func resourceVagrantVMCreate(d *schema.ResourceData, m interface{}) error {
 
 	cmd := client.Up()
 	cmd.Context = ctx
+	cmd.Env = buildEnvironment(d.Get("env").(map[string]string))
+	cmd.Parallel = true
 	if err := cmd.Run(); err != nil {
 		return err
 	}
@@ -123,6 +144,7 @@ func resourceVagrantVMUpdate(d *schema.ResourceData, m interface{}) error {
 
 	cmd := client.Reload()
 	cmd.Context = ctx
+	cmd.Env = buildEnvironment(d.Get("env").(map[string]string))
 	if err := cmd.Run(); err != nil {
 		return nil
 	}
@@ -141,6 +163,7 @@ func resourceVagrantVMDelete(d *schema.ResourceData, m interface{}) error {
 
 	cmd := client.Destroy()
 	cmd.Context = ctx
+	cmd.Env = buildEnvironment(d.Get("env").(map[string]string))
 	return cmd.Run()
 }
 
@@ -155,6 +178,7 @@ func resourceVagrantVMExists(d *schema.ResourceData, m interface{}) (bool, error
 
 	cmd := client.Status()
 	cmd.Context = ctx
+	cmd.Env = buildEnvironment(d.Get("env").(map[string]string))
 	if err := cmd.Run(); err != nil {
 		return false, err
 	}
@@ -207,13 +231,15 @@ func buildId(info map[string]*vagrant.VMInfo) string {
 func readVagrantInfo(ctx context.Context, client *vagrant.VagrantClient, d *schema.ResourceData) error {
 	cmd := client.SSHConfig()
 	cmd.Context = ctx
+	cmd.Env = buildEnvironment(d.Get("env").(map[string]string))
 	if err := cmd.Run(); err != nil {
 		return err
 	}
 
 	sshConfigs := make([]map[string]string, len(cmd.Configs))
+	keys := make([]string, len(cmd.Configs))
 	i := 0
-	for _, config := range cmd.Configs {
+	for key, config := range cmd.Configs {
 		sshConfig := make(map[string]string, 6)
 		sshConfig["type"] = "ssh"
 		sshConfig["user"] = config.User
@@ -224,13 +250,30 @@ func readVagrantInfo(ctx context.Context, client *vagrant.VagrantClient, d *sche
 		}
 		sshConfig["agent"] = "false"
 		sshConfigs[i] = sshConfig
+		keys[i] = key
 		i++
 	}
+
 	d.Set("ssh_config", sshConfigs)
+	d.Set("machine_names", keys)
 
 	if len(sshConfigs) == 1 {
 		d.SetConnInfo(sshConfigs[0])
 	}
 
 	return nil
 }
+
+func buildEnvironment(env map[string]string) []string {
+	if len(env) == 0 {
+		return nil
+	}
+
+	envArray := make([]string, len(env))
+	i := 0
+	for key, value := range env {
+		envArray[i] = fmt.Sprintf("%v=%v", key, value)
+		i++
+	}
+	return envArray
+}