From 929e3cdbe25ea453d00451f5f7d68de898573640 Mon Sep 17 00:00:00 2001
From: Max Englander <max.englander@gmail.com>
Date: Mon, 28 Sep 2015 01:12:20 -0400
Subject: [PATCH] #2087: add consul_agent_service acceptance test

---
 .../consul/resource_consul_agent_service.go   |  2 +-
 .../resource_consul_agent_service_test.go     | 85 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 builtin/providers/consul/resource_consul_agent_service_test.go

diff --git a/builtin/providers/consul/resource_consul_agent_service.go b/builtin/providers/consul/resource_consul_agent_service.go
index bbd83aab87b2..c4cf0f272b60 100644
--- a/builtin/providers/consul/resource_consul_agent_service.go
+++ b/builtin/providers/consul/resource_consul_agent_service.go
@@ -103,7 +103,7 @@ func resourceConsulAgentServiceRead(d *schema.ResourceData, meta interface{}) er
 	if services, err := agent.Services(); err != nil {
 		return fmt.Errorf("Failed to get services from Consul agent: %v", err)
 	} else if service, ok := services[name]; !ok {
-		return fmt.Errorf("Failed to get service '%s' from Consul agent: %v", name, err)
+		return fmt.Errorf("Failed to get service '%s' from Consul agent", name)
 	} else {
 		d.Set("address", service.Address)
 		d.Set("name", service.Service)
diff --git a/builtin/providers/consul/resource_consul_agent_service_test.go b/builtin/providers/consul/resource_consul_agent_service_test.go
new file mode 100644
index 000000000000..5d5b022d833f
--- /dev/null
+++ b/builtin/providers/consul/resource_consul_agent_service_test.go
@@ -0,0 +1,85 @@
+package consul
+
+import (
+	"fmt"
+	"testing"
+
+	consulapi "github.com/hashicorp/consul/api"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccConsulAgentService_basic(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() {},
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckConsulAgentServiceDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccConsulAgentServiceConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckConsulAgentServiceExists(),
+					testAccCheckConsulAgentServiceValue("consul_agent_service.app", "address", "www.google.com"),
+					testAccCheckConsulAgentServiceValue("consul_agent_service.app", "id", "google"),
+					testAccCheckConsulAgentServiceValue("consul_agent_service.app", "name", "google"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckConsulAgentServiceDestroy(s *terraform.State) error {
+	agent := testAccProvider.Meta().(*consulapi.Client).Agent()
+	services, err := agent.Services()
+	if err != nil {
+		return fmt.Errorf("Could not retrieve services: %#v", err)
+	}
+	_, ok := services["google"]
+	if ok {
+		return fmt.Errorf("Service still exists: %#v", "google")
+	}
+	return nil
+}
+
+func testAccCheckConsulAgentServiceExists() resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		agent := testAccProvider.Meta().(*consulapi.Client).Agent()
+		services, err := agent.Services()
+		if err != nil {
+			return err
+		}
+		_, ok := services["google"]
+		if !ok {
+			return fmt.Errorf("Service does not exist: %#v", "google")
+		}
+		return nil
+	}
+}
+
+func testAccCheckConsulAgentServiceValue(n, attr, val string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rn, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Resource not found")
+		}
+		out, ok := rn.Primary.Attributes[attr]
+		if !ok {
+			return fmt.Errorf("Attribute '%s' not found: %#v", attr, rn.Primary.Attributes)
+		}
+		if val != "<any>" && out != val {
+			return fmt.Errorf("Attribute '%s' value '%s' != '%s'", attr, out, val)
+		}
+		if val == "<any>" && out == "" {
+			return fmt.Errorf("Attribute '%s' value '%s'", attr, out)
+		}
+		return nil
+	}
+}
+
+const testAccConsulAgentServiceConfig = `
+resource "consul_agent_service" "app" {
+	name = "google"
+	address = "www.google.com"
+	port = 80
+}
+`