From a590ed02df8819d3bcd430affea46b5d47c27c88 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 16 Sep 2014 17:21:49 -0700 Subject: [PATCH] providers/mailgun: tests passing, compiling --- .../mailgun/resource_mailgun_domain_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/providers/mailgun/resource_mailgun_domain_test.go b/builtin/providers/mailgun/resource_mailgun_domain_test.go index 2da07240f0..6f6042f405 100644 --- a/builtin/providers/mailgun/resource_mailgun_domain_test.go +++ b/builtin/providers/mailgun/resource_mailgun_domain_test.go @@ -43,12 +43,12 @@ func TestAccMailgunDomain_Basic(t *testing.T) { func testAccCheckMailgunDomainDestroy(s *terraform.State) error { client := testAccProvider.Meta().(*mailgun.Client) - for _, rs := range s.Resources { + for _, rs := range s.RootModule().Resources { if rs.Type != "mailgun_domain" { continue } - _, err := client.RetrieveDomain(rs.ID) + _, err := client.RetrieveDomain(rs.Primary.ID) if err == nil { return fmt.Errorf("Domain still exists") @@ -91,25 +91,25 @@ func testAccCheckMailgunDomainAttributes(DomainResp *mailgun.DomainResponse) res func testAccCheckMailgunDomainExists(n string, DomainResp *mailgun.DomainResponse) resource.TestCheckFunc { return func(s *terraform.State) error { - rs, ok := s.Resources[n] + rs, ok := s.RootModule().Resources[n] if !ok { return fmt.Errorf("Not found: %s", n) } - if rs.ID == "" { + if rs.Primary.ID == "" { return fmt.Errorf("No Domain ID is set") } client := testAccProvider.Meta().(*mailgun.Client) - resp, err := client.RetrieveDomain(rs.ID) + resp, err := client.RetrieveDomain(rs.Primary.ID) if err != nil { return err } - if resp.Domain.Name != rs.ID { + if resp.Domain.Name != rs.Primary.ID { return fmt.Errorf("Domain not found") }