From 8365d39d26283cd159565f546467634273ef19fc Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 11 Feb 2015 22:51:48 -0800 Subject: [PATCH] terraform: fix more plan tests --- terraform/context_test.go | 6 +++--- terraform/graph_config_node.go | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/terraform/context_test.go b/terraform/context_test.go index dc7699ae9..e85ce30b6 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -550,12 +550,11 @@ func TestContext2Plan_count(t *testing.T) { } } -/* -func TestContextPlan_countComputed(t *testing.T) { +func TestContext2Plan_countComputed(t *testing.T) { m := testModule(t, "plan-count-computed") p := testProvider("aws") p.DiffFn = testDiffFn - ctx := testContext(t, &ContextOpts{ + ctx := testContext2(t, &ContextOpts{ Module: m, Providers: map[string]ResourceProviderFactory{ "aws": testProviderFuncFixed(p), @@ -568,6 +567,7 @@ func TestContextPlan_countComputed(t *testing.T) { } } +/* func TestContextPlan_countIndex(t *testing.T) { m := testModule(t, "plan-count-index") p := testProvider("aws") diff --git a/terraform/graph_config_node.go b/terraform/graph_config_node.go index b923ddbfa..e7fb29a55 100644 --- a/terraform/graph_config_node.go +++ b/terraform/graph_config_node.go @@ -217,8 +217,9 @@ func (n *GraphNodeConfigResource) DynamicExpand(ctx EvalContext) (*Graph, error) // GraphNodeEvalable impl. func (n *GraphNodeConfigResource) EvalTree() EvalNode { - return &EvalValidateCount{ - Resource: n.Resource, + return &EvalOpFilter{ + Ops: []walkOperation{walkValidate}, + Node: &EvalValidateCount{Resource: n.Resource}, } }