From 3aab0cd21b72ca6b52e49a5718d082f05cfe58f9 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 20 Jun 2014 12:49:01 -0700
Subject: [PATCH] terraform: Apply takes a plan

---
 terraform/terraform.go      | 9 ++++-----
 terraform/terraform_test.go | 6 ++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/terraform/terraform.go b/terraform/terraform.go
index 6a31b5838..68c41d93b 100644
--- a/terraform/terraform.go
+++ b/terraform/terraform.go
@@ -103,9 +103,9 @@ func New(c *Config) (*Terraform, error) {
 	}, nil
 }
 
-func (t *Terraform) Apply(s *State, d *Diff) (*State, error) {
+func (t *Terraform) Apply(p *Plan) (*State, error) {
 	result := new(State)
-	err := t.graph.Walk(t.applyWalkFn(s, d, result))
+	err := t.graph.Walk(t.applyWalkFn(p, result))
 	if err != nil {
 		return nil, err
 	}
@@ -128,8 +128,7 @@ func (t *Terraform) Refresh(*State) (*State, error) {
 }
 
 func (t *Terraform) applyWalkFn(
-	state *State,
-	diff *Diff,
+	p *Plan,
 	result *State) depgraph.WalkFunc {
 	var l sync.Mutex
 
@@ -162,7 +161,7 @@ func (t *Terraform) applyWalkFn(
 		return vars, nil
 	}
 
-	return t.genericWalkFn(state, diff, cb)
+	return t.genericWalkFn(p.State, p.Diff, cb)
 }
 
 func (t *Terraform) planWalkFn(
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 106e27f00..8b6d5ae78 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -203,17 +203,16 @@ func TestNew_variables(t *testing.T) {
 	}
 }
 
-/*
 func TestTerraformApply(t *testing.T) {
 	tf := testTerraform(t, "apply-good")
 
 	s := &State{}
-	d, err := tf.Diff(s)
+	p, err := tf.Plan(s)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
 
-	state, err := tf.Apply(s, d)
+	state, err := tf.Apply(p)
 	if err != nil {
 		t.Fatalf("err: %s", err)
 	}
@@ -228,7 +227,6 @@ func TestTerraformApply(t *testing.T) {
 		t.Fatalf("bad: \n%s", actual)
 	}
 }
-*/
 
 func TestTerraformPlan(t *testing.T) {
 	tf := testTerraform(t, "plan-good")