Adds build_auth_token to Habitat Provisioner

First successful run with private origin and HAB_AUTH_TOKEN set

Update struct, schema, and decodeConfig names to more sensible versions

Cleaned up formatting

Update habitat provisioner docs

Remove unused unitstring

builtin/provisioners/habitat/resource_provisioner.go

@@ -1,6 +1,7 @@
 package habitat
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -9,6 +10,7 @@ import (
 	"net/url"
 	"path"
 	"strings"
+	"text/template"
 	"time"
 
 	"github.com/hashicorp/terraform/communicator"
@@ -19,15 +21,20 @@ import (
 )
 
 const installURL = "https://raw.githubusercontent.com/habitat-sh/habitat/master/components/hab/install.sh"
-const systemdUnit = `[Unit]
+const systemdUnit = `
+[Unit]
 Description=Habitat Supervisor
 
 [Service]
-ExecStart=/bin/hab sup run %s
+ExecStart=/bin/hab sup run {{ .SupOptions }}
 Restart=on-failure
+{{ if .BuilderAuthToken -}}
+Environment="HAB_AUTH_TOKEN={{ .BuilderAuthToken }}"
+{{ end -}}
 
 [Install]
-WantedBy=default.target`
+WantedBy=default.target
+`
 
 var serviceTypes = map[string]bool{"unmanaged": true, "systemd": true}
 var updateStrategies = map[string]bool{"at-once": true, "rolling": true, "none": true}
@@ -52,6 +59,8 @@ type provisioner struct {
 	Events           string
 	OverrideName     string
 	Organization     string
+	BuilderAuthToken string
+	SupOptions       string
 }
 
 func Provisioner() terraform.ResourceProvisioner {
@@ -116,6 +125,10 @@ func Provisioner() terraform.ResourceProvisioner {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"builder_auth_token": &schema.Schema{
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"service": &schema.Schema{
 				Type: schema.TypeSet,
 				Elem: &schema.Resource{
@@ -341,6 +354,7 @@ func decodeConfig(d *schema.ResourceData) (*provisioner, error) {
 		Events:           d.Get("events").(string),
 		OverrideName:     d.Get("override_name").(string),
 		Organization:     d.Get("organization").(string),
+		BuilderAuthToken: d.Get("builder_auth_token").(string),
 	}
 
 	return p, nil
@@ -506,6 +520,8 @@ func (p *provisioner) startHab(o terraform.UIOutput, comm communicator.Communica
 		options += fmt.Sprintf(" --org %s", p.Organization)
 	}
 
+	p.SupOptions = options
+
 	switch p.ServiceType {
 	case "unmanaged":
 		return p.startHabUnmanaged(o, comm, options)
@@ -519,6 +535,7 @@ func (p *provisioner) startHab(o terraform.UIOutput, comm communicator.Communica
 func (p *provisioner) startHabUnmanaged(o terraform.UIOutput, comm communicator.Communicator, options string) error {
 	// Create the sup directory for the log file
 	var command string
+	var token string
 	if p.UseSudo {
 		command = "sudo mkdir -p /hab/sup/default && sudo chmod o+w /hab/sup/default"
 	} else {
@@ -528,22 +545,34 @@ func (p *provisioner) startHabUnmanaged(o terraform.UIOutput, comm communicator.
 		return err
 	}
 
+	if p.BuilderAuthToken != "" {
+		token = fmt.Sprintf("env HAB_AUTH_TOKEN=%s", p.BuilderAuthToken)
+	}
+
 	if p.UseSudo {
-		command = fmt.Sprintf("(setsid sudo hab sup run %s > /hab/sup/default/sup.log 2>&1 &) ; sleep 1", options)
+		command = fmt.Sprintf("(%s setsid sudo -E hab sup run %s > /hab/sup/default/sup.log 2>&1 &) ; sleep 1", token, options)
 	} else {
-		command = fmt.Sprintf("(setsid hab sup run %s > /hab/sup/default/sup.log 2>&1 <&1 &) ; sleep 1", options)
+		command = fmt.Sprintf("(%s setsid hab sup run %s > /hab/sup/default/sup.log 2>&1 <&1 &) ; sleep 1", token, options)
 	}
 	return p.runCommand(o, comm, command)
 }
 
 func (p *provisioner) startHabSystemd(o terraform.UIOutput, comm communicator.Communicator, options string) error {
 
-	unitString := fmt.Sprintf(systemdUnit, options)
+	// Create a new template and parse the client config into it
+	unitString := template.Must(template.New("hab-supervisor.service").Parse(systemdUnit))
+
+	var buf bytes.Buffer
+	err := unitString.Execute(&buf, p)
+	if err != nil {
+		return fmt.Errorf("Error executing %s template: %s", "hab-supervisor.service", err)
+	}
+
 	var command string
 	if p.UseSudo {
-		command = fmt.Sprintf("sudo echo '%s' | sudo tee /etc/systemd/system/hab-supervisor.service > /dev/null", unitString)
+		command = fmt.Sprintf("sudo echo '%s' | sudo tee /etc/systemd/system/hab-supervisor.service > /dev/null", &buf)
 	} else {
-		command = fmt.Sprintf("echo '%s' | tee /etc/systemd/system/hab-supervisor.service > /dev/null", unitString)
+		command = fmt.Sprintf("echo '%s' | tee /etc/systemd/system/hab-supervisor.service > /dev/null", &buf)
 	}
 
 	if err := p.runCommand(o, comm, command); err != nil {
@@ -582,6 +611,11 @@ func (p *provisioner) startHabService(o terraform.UIOutput, comm communicator.Co
 	} else {
 		command = fmt.Sprintf("env HAB_NONINTERACTIVE=true hab pkg install %s", service.Name)
 	}
+
+	if p.BuilderAuthToken != "" {
+		command = fmt.Sprintf("env HAB_AUTH_TOKEN=%s %s", p.BuilderAuthToken, command)
+	}
+
 	if err := p.runCommand(o, comm, command); err != nil {
 		return err
 	}
@@ -621,7 +655,10 @@ func (p *provisioner) startHabService(o terraform.UIOutput, comm communicator.Co
 	}
 	command = fmt.Sprintf("hab svc load %s %s", service.Name, options)
 	if p.UseSudo {
-		command = fmt.Sprintf("sudo %s", command)
+		command = fmt.Sprintf("sudo -E %s", command)
+	}
+	if p.BuilderAuthToken != "" {
+		command = fmt.Sprintf("env HAB_AUTH_TOKEN=%s %s", p.BuilderAuthToken, command)
 	}
 	return p.runCommand(o, comm, command)
 }

website/docs/provisioners/habitat.html.markdown

@@ -60,6 +60,7 @@ There are 2 configuration levels, `supervisor` and `service`.  Configuration pla
 * `events (string)` - (Optional) Name of the service group running a Habitat EventSrv to forward Supervisor and service event data to. (Defaults to none)
 * `override_name (string)` - (Optional) The name of the Supervisor (Defaults to `default`)
 * `organization (string)` - (Optional) The organization that the Supervisor and it's subsequent services are part of. (Defaults to `default`)
+* `builder_auth_token (string)` - (Optional) The builder authorization token when using a private origin. (Defaults to none)
 
 ### Service Arguments
 * `name (string)` - (Required) The Habitat package identifier of the service to run. (ie `core/haproxy` or `core/redis/3.2.4/20171002182640`)