From e2aa067996aa20f2b4b674c5b891e2770cbc2576 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 17 Sep 2014 16:47:26 -0700 Subject: [PATCH] terraform: fixing Refresh tests --- terraform/context.go | 2 +- terraform/context_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/context.go b/terraform/context.go index 55b390fa4..6635f8287 100644 --- a/terraform/context.go +++ b/terraform/context.go @@ -892,7 +892,7 @@ func (c *Context) refreshWalkFn() depgraph.WalkFunc { // TODO: Handle other moduels mod := c.state.RootModule() - if len(r.State.Tainted) == 0 && (r.State.Primary == nil || r.State.Primary.ID == "") { + if len(r.State.Tainted) == 0 && (is == nil || is.ID == "") { delete(mod.Resources, r.Id) } else { mod.Resources[r.Id] = r.State diff --git a/terraform/context_test.go b/terraform/context_test.go index 44cb74532..8a64fda59 100644 --- a/terraform/context_test.go +++ b/terraform/context_test.go @@ -2003,7 +2003,7 @@ func TestContextRefresh(t *testing.T) { if p.RefreshState.ID != "foo" { t.Fatalf("bad: %#v", p.RefreshState) } - if !reflect.DeepEqual(mod.Resources["aws_instance.web"], p.RefreshReturn) { + if !reflect.DeepEqual(mod.Resources["aws_instance.web"].Primary, p.RefreshReturn) { t.Fatalf("bad: %#v", mod.Resources["aws_instance.web"]) }