2 files changed, 27 insertions, 21 deletions

diff --git a/statuscake/resource_statuscaketest.go b/statuscake/resource_statuscaketest.go
index d7d3f36..b0dc84f 100644
--- a/statuscake/resource_statuscaketest.go
+++ b/statuscake/resource_statuscaketest.go
@@ -51,9 +51,11 @@ func resourceStatusCakeTest() *schema.Resource {
                                 Required: true,
                         },
 
-                        "contact_id": {
-                                Type:     schema.TypeInt,
+                        "contact_group": {
+                                Type:     schema.TypeSet,
+                                Elem:     &schema.Schema{Type: schema.TypeString},
                                 Optional: true,
+                                Set:      schema.HashString,
                         },
 
                         "check_rate": {
@@ -94,6 +96,7 @@ func resourceStatusCakeTest() *schema.Resource {
                                 Optional: true,
                                 Default:  5,
                         },
+
                         "custom_header": {
                                 Type:     schema.TypeString,
                                 Optional: true,
@@ -178,8 +181,10 @@ func resourceStatusCakeTest() *schema.Resource {
                         },
 
                         "test_tags": {
-                                Type:     schema.TypeString,
+                                Type:     schema.TypeSet,
+                                Elem:     &schema.Schema{Type: schema.TypeString},
                                 Optional: true,
+                                Set:      schema.HashString,
                         },
 
                         "status_codes": {
@@ -220,7 +225,7 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error {
                 TestType:       d.Get("test_type").(string),
                 Paused:         d.Get("paused").(bool),
                 Timeout:        d.Get("timeout").(int),
-                ContactID:      d.Get("contact_id").(int),
+                ContactGroup:   castSetToSliceStrings(d.Get("contact_group").(*schema.Set).List()),
                 Confirmation:   d.Get("confirmations").(int),
                 Port:           d.Get("port").(int),
                 TriggerRate:    d.Get("trigger_rate").(int),
@@ -240,7 +245,7 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error {
                 FindString:     d.Get("find_string").(string),
                 DoNotFind:      d.Get("do_not_find").(bool),
                 RealBrowser:    d.Get("real_browser").(int),
-                TestTags:       d.Get("test_tags").(string),
+                TestTags:       castSetToSliceStrings(d.Get("test_tags").(*schema.Set).List()),
                 StatusCodes:    d.Get("status_codes").(string),
                 UseJar:         d.Get("use_jar").(int),
                 PostRaw:        d.Get("post_raw").(string),
@@ -309,7 +314,7 @@ func ReadTest(d *schema.ResourceData, meta interface{}) error {
         d.Set("test_type", testResp.TestType)
         d.Set("paused", testResp.Paused)
         d.Set("timeout", testResp.Timeout)
-        d.Set("contact_id", testResp.ContactID)
+        d.Set("contact_group", testResp.ContactGroup)
         d.Set("confirmations", testResp.Confirmation)
         d.Set("port", testResp.Port)
         d.Set("trigger_rate", testResp.TriggerRate)
@@ -353,8 +358,8 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test {
         if v, ok := d.GetOk("check_rate"); ok {
                 test.CheckRate = v.(int)
         }
-        if v, ok := d.GetOk("contact_id"); ok {
-                test.ContactID = v.(int)
+        if v, ok := d.GetOk("contact_group"); ok {
+                test.ContactGroup = castSetToSliceStrings(v.(*schema.Set).List())
         }
         if v, ok := d.GetOk("test_type"); ok {
                 test.TestType = v.(string)
@@ -417,7 +422,7 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test {
                 test.RealBrowser = v.(int)
         }
         if v, ok := d.GetOk("test_tags"); ok {
-                test.TestTags = v.(string)
+                test.TestTags = castSetToSliceStrings(v.(*schema.Set).List())
         }
         if v, ok := d.GetOk("status_codes"); ok {
                 test.StatusCodes = v.(string)
diff --git a/statuscake/resource_statuscaketest_test.go b/statuscake/resource_statuscaketest_test.go
index 8bcbb36..0ea1e2b 100644
--- a/statuscake/resource_statuscaketest_test.go
+++ b/statuscake/resource_statuscaketest_test.go
@@ -72,7 +72,6 @@ func TestAccStatusCake_withUpdate(t *testing.T) {
                                         resource.TestCheckResourceAttr("statuscake_test.google", "check_rate", "500"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "paused", "true"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "timeout", "40"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "contact_id", "0"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "confirmations", "0"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "trigger_rate", "20"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "custom_header", "{ \"Content-Type\": \"application/x-www-form-urlencoded\" }"),
@@ -91,7 +90,7 @@ func TestAccStatusCake_withUpdate(t *testing.T) {
                                         resource.TestCheckResourceAttr("statuscake_test.google", "find_string", "string15212"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "do_not_find", "false"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "real_browser", "1"),
-                                        resource.TestCheckResourceAttr("statuscake_test.google", "test_tags", "string8191"),
+                                        resource.TestCheckResourceAttr("statuscake_test.google", "test_tags.#", "1"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "status_codes", "string23065"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "use_jar", "1"),
                                         resource.TestCheckResourceAttr("statuscake_test.google", "post_raw", "string32096"),
@@ -159,8 +158,13 @@ func testAccTestCheckAttributes(rn string, test *statuscake.Test) resource.TestC
                                 err = check(key, value, strconv.FormatBool(test.Paused))
                         case "timeout":
                                 err = check(key, value, strconv.Itoa(test.Timeout))
-                        case "contact_id":
-                                err = check(key, value, strconv.Itoa(test.ContactID))
+                        case "contact_group":
+                                for _, tv := range test.ContactGroup {
+                                        err = check(key, value, tv)
+                                        if err != nil {
+                                                return err
+                                        }
+                                }
                         case "confirmations":
                                 err = check(key, value, strconv.Itoa(test.Confirmation))
                         case "trigger_rate":
@@ -214,13 +218,10 @@ func testAccTestCheckDestroy(test *statuscake.Test) resource.TestCheckFunc {
 }
 
 func interpolateTerraformTemplate(template string) string {
-        testContactGroupId := 43402
+        testContactGroupId := "43402"
 
         if v := os.Getenv("STATUSCAKE_TEST_CONTACT_GROUP_ID"); v != "" {
-                id, err := strconv.Atoi(v)
-                if err == nil {
-                        testContactGroupId = id
-                }
+                testContactGroupId = v
         }
 
         return fmt.Sprintf(template, testContactGroupId)
@@ -233,7 +234,7 @@ resource "statuscake_test" "google" {
         test_type = "HTTP"
         check_rate = 300
         timeout = 10
-        contact_id = %d
+        contact_group = ["%s"]
         confirmations = 1
         trigger_rate = 10
 }
@@ -261,7 +262,7 @@ resource "statuscake_test" "google" {
         find_string = "string15212"
         do_not_find = false
         real_browser = 1
-        test_tags = "string8191"
+        test_tags = ["string8191"]
         status_codes = "string23065"
         use_jar = 1
         post_raw = "string32096"
@@ -277,7 +278,7 @@ resource "statuscake_test" "google" {
         test_type = "TCP"
         check_rate = 300
         timeout = 10
-        contact_id = %d
+        contact_group = ["%s"]
         confirmations = 1
         port = 80
 }