3 files changed, 47 insertions, 52 deletions

diff --git a/statuscake/provider_test.go b/statuscake/provider_test.go
index 83045d0..81d5888 100644
--- a/statuscake/provider_test.go
+++ b/statuscake/provider_test.go
@@ -1,7 +1,9 @@
 package statuscake
 
 import (
+        "fmt"
         "os"
+        "strconv"
         "testing"
 
         "github.com/hashicorp/terraform/helper/schema"
@@ -10,12 +12,25 @@ import (
 
 var testAccProviders map[string]terraform.ResourceProvider
 var testAccProvider *schema.Provider
+var testContactGroupId int
 
 func init() {
         testAccProvider = Provider().(*schema.Provider)
         testAccProviders = map[string]terraform.ResourceProvider{
                 "statuscake": testAccProvider,
         }
+
+        if v := os.Getenv("STATUSCAKE_TEST_CONTACT_GROUP_ID"); v == "" {
+                fmt.Println("STATUSCAKE_TEST_CONTACT_GROUP_ID must be set for acceptance tests")
+                os.Exit(1)
+        } else {
+                id, err := strconv.Atoi(v)
+                if err != nil {
+                        fmt.Println("STATUSCAKE_TEST_CONTACT_GROUP_ID must be a valid int")
+                        os.Exit(1)
+                }
+                testContactGroupId = id
+        }
 }
 
 func TestProvider(t *testing.T) {
diff --git a/statuscake/resource_statuscaketest.go b/statuscake/resource_statuscaketest.go
index 459c71a..d7d3f36 100644
--- a/statuscake/resource_statuscaketest.go
+++ b/statuscake/resource_statuscaketest.go
@@ -10,16 +10,24 @@ import (
         "github.com/hashicorp/terraform/helper/schema"
 )
 
-func castInterfaceToSliceStrings(in interface{}) []string {
-        input := in.([]interface{})
-        res := make([]string, len(input))
+func castSetToSliceStrings(configured []interface{}) []string {
+        res := make([]string, len(configured))
 
-        for i, element := range input {
+        for i, element := range configured {
                 res[i] = element.(string)
         }
         return res
 }
 
+// Special handling for node_locations since statuscake will return `[""]` for the empty case
+func considerEmptyStringAsEmptyArray(in []string) []string {
+        if len(in) == 1 && in[0] == "" {
+                return []string{}
+        } else {
+                return in
+        }
+}
+
 func resourceStatusCakeTest() *schema.Resource {
         return &schema.Resource{
                 Create: CreateTest,
@@ -107,9 +115,10 @@ func resourceStatusCakeTest() *schema.Resource {
                         },
 
                         "node_locations": {
-                                Type:     schema.TypeList,
+                                Type:     schema.TypeSet,
                                 Elem:     &schema.Schema{Type: schema.TypeString},
                                 Optional: true,
+                                Set:      schema.HashString,
                         },
 
                         "ping_url": {
@@ -123,8 +132,9 @@ func resourceStatusCakeTest() *schema.Resource {
                         },
 
                         "basic_pass": {
-                                Type:     schema.TypeString,
-                                Optional: true,
+                                Type:      schema.TypeString,
+                                Optional:  true,
+                                Sensitive: true,
                         },
 
                         "public": {
@@ -175,10 +185,6 @@ func resourceStatusCakeTest() *schema.Resource {
                         "status_codes": {
                                 Type:     schema.TypeString,
                                 Optional: true,
-                                Default: "204, 205, 206, 303, 400, 401, 403, 404, 405, 406, " +
-                                        "408, 410, 413, 444, 429, 494, 495, 496, 499, 500, 501, 502, 503, " +
-                                        "504, 505, 506, 507, 508, 509, 510, 511, 521, 522, 523, 524, 520, " +
-                                        "598, 599",
                         },
 
                         "use_jar": {
@@ -222,7 +228,7 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error {
                 UserAgent:      d.Get("user_agent").(string),
                 Status:         d.Get("status").(string),
                 Uptime:         d.Get("uptime").(float64),
-                NodeLocations:  castInterfaceToSliceStrings(d.Get("node_locations")),
+                NodeLocations:  castSetToSliceStrings(d.Get("node_locations").(*schema.Set).List()),
                 PingURL:        d.Get("ping_url").(string),
                 BasicUser:      d.Get("basic_user").(string),
                 BasicPass:      d.Get("basic_pass").(string),
@@ -308,24 +314,19 @@ func ReadTest(d *schema.ResourceData, meta interface{}) error {
         d.Set("port", testResp.Port)
         d.Set("trigger_rate", testResp.TriggerRate)
         d.Set("custom_header", testResp.CustomHeader)
-        d.Set("user_agent", testResp.UserAgent)
         d.Set("status", testResp.Status)
         d.Set("uptime", testResp.Uptime)
-        if err := d.Set("node_locations", testResp.NodeLocations); err != nil {
+        if err := d.Set("node_locations", considerEmptyStringAsEmptyArray(testResp.NodeLocations)); err != nil {
                 return fmt.Errorf("[WARN] Error setting node locations: %s", err)
         }
-        d.Set("ping_url", testResp.PingURL)
-        d.Set("basic_user", testResp.BasicUser)
-        d.Set("basic_pass", testResp.BasicPass)
-        d.Set("public", testResp.Public)
         d.Set("logo_image", testResp.LogoImage)
-        d.Set("branding", testResp.Branding)
-        d.Set("website_host", testResp.WebsiteHost)
-        d.Set("virus", testResp.Virus)
+        // Even after WebsiteHost is set, the API returns ""
+        // API docs aren't clear on usage will only override state if we get a non-empty value back
+        if testResp.WebsiteHost != "" {
+                d.Set("website_host", testResp.WebsiteHost)
+        }
         d.Set("find_string", testResp.FindString)
         d.Set("do_not_find", testResp.DoNotFind)
-        d.Set("real_browser", testResp.RealBrowser)
-        d.Set("test_tags", testResp.TestTags)
         d.Set("status_codes", testResp.StatusCodes)
         d.Set("use_jar", testResp.UseJar)
         d.Set("post_raw", testResp.PostRaw)
@@ -380,7 +381,7 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test {
                 test.UserAgent = v.(string)
         }
         if v, ok := d.GetOk("node_locations"); ok {
-                test.NodeLocations = castInterfaceToSliceStrings(v)
+                test.NodeLocations = castSetToSliceStrings(v.(*schema.Set).List())
         }
         if v, ok := d.GetOk("ping_url"); ok {
                 test.PingURL = v.(string)
diff --git a/statuscake/resource_statuscaketest_test.go b/statuscake/resource_statuscaketest_test.go
index b727e92..da3a349 100644
--- a/statuscake/resource_statuscaketest_test.go
+++ b/statuscake/resource_statuscaketest_test.go
@@ -19,7 +19,7 @@ func TestAccStatusCake_basic(t *testing.T) {
                 CheckDestroy: testAccTestCheckDestroy(&test),
                 Steps: []resource.TestStep{
                         {
-                                Config: testAccTestConfig_basic,
+                                Config: fmt.Sprintf(testAccTestConfig_basic, testContactGroupId),
                                 Check: resource.ComposeTestCheckFunc(
                                         testAccTestCheckExists("statuscake_test.google", &test),
                                         testAccTestCheckAttributes("statuscake_test.google", &test),
@@ -38,7 +38,7 @@ func TestAccStatusCake_tcp(t *testing.T) {
                 CheckDestroy: testAccTestCheckDestroy(&test),
                 Steps: []resource.TestStep{
                         {
-                                Config: testAccTestConfig_tcp,
+                                Config: fmt.Sprintf(testAccTestConfig_tcp, testContactGroupId),
                                 Check: resource.ComposeTestCheckFunc(
                                         testAccTestCheckExists("statuscake_test.google", &test),
                                         testAccTestCheckAttributes("statuscake_test.google", &test),
@@ -57,7 +57,7 @@ func TestAccStatusCake_withUpdate(t *testing.T) {
                 CheckDestroy: testAccTestCheckDestroy(&test),
                 Steps: []resource.TestStep{
                         {
-                                Config: testAccTestConfig_basic,
+                                Config: fmt.Sprintf(testAccTestConfig_basic, testContactGroupId),
                                 Check: resource.ComposeTestCheckFunc(
                                         testAccTestCheckExists("statuscake_test.google", &test),
                                 ),
@@ -76,12 +76,9 @@ func TestAccStatusCake_withUpdate(t *testing.T) {
                                         resource.TestCheckResourceAttr("statuscake_test.google", "trigger_rate", "20"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "custom_header", "{ \"Content-Type\": \"application/x-www-form-urlencoded\" }"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "user_agent", "string9988"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "status", "string22117"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "uptime", "3498.27"),
+                                        resource.TestCheckResourceAttr("statuscake_test.google", "status", "Up"),
+                                        resource.TestCheckResourceAttr("statuscake_test.google", "uptime", "0"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "node_locations.#", "3"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "node_locations.0", "string16045"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "node_locations.1", "string19741"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "node_locations.2", "string12122"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "ping_url", "string8410"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "basic_user", "string27052"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "basic_pass", "string5659"),
@@ -169,8 +166,6 @@ func testAccTestCheckAttributes(rn string, test *statuscake.Test) resource.TestC
                                 err = check(key, value, strconv.Itoa(test.TriggerRate))
                         case "custom_header":
                                 err = check(key, value, test.CustomHeader)
-                        case "user_agent":
-                                err = check(key, value, test.UserAgent)
                         case "node_locations":
                                 for _, tv := range test.NodeLocations {
                                         err = check(key, value, tv)
@@ -178,30 +173,14 @@ func testAccTestCheckAttributes(rn string, test *statuscake.Test) resource.TestC
                                                 return err
                                         }
                                 }
-                        case "ping_url":
-                                err = check(key, value, test.PingURL)
-                        case "basic_user":
-                                err = check(key, value, test.BasicUser)
-                        case "basic_pass":
-                                err = check(key, value, test.BasicPass)
                         case "public":
                                 err = check(key, value, strconv.Itoa(test.Public))
                         case "logo_image":
                                 err = check(key, value, test.LogoImage)
-                        case "branding":
-                                err = check(key, value, strconv.Itoa(test.Branding))
-                        case "website_host":
-                                err = check(key, value, test.WebsiteHost)
-                        case "virus":
-                                err = check(key, value, strconv.Itoa(test.Virus))
                         case "find_string":
                                 err = check(key, value, test.FindString)
                         case "do_not_find":
                                 err = check(key, value, strconv.FormatBool(test.DoNotFind))
-                        case "real_browser":
-                                err = check(key, value, strconv.Itoa(test.RealBrowser))
-                        case "test_tags":
-                                err = check(key, value, test.TestTags)
                         case "status_codes":
                                 err = check(key, value, test.StatusCodes)
                         case "use_jar":
@@ -240,7 +219,7 @@ resource "statuscake_test" "google" {
         test_type = "HTTP"
         check_rate = 300
         timeout = 10
-        contact_id = 43402
+        contact_id = %d
         confirmations = 1
         trigger_rate = 10
 }
@@ -284,7 +263,7 @@ resource "statuscake_test" "google" {
         test_type = "TCP"
         check_rate = 300
         timeout = 10
-        contact_id = 43402
+        contact_id = %d
         confirmations = 1
         port = 80
 }