merge changes from https://github.com/DreamItGetIT/statuscake/pull/24 to vendor directory

diff --git a/statuscake/resource_statuscaketest.go b/statuscake/resource_statuscaketest.go
index 187f7112eb8bb64523ec2aebc9ac75d3184e1dbf..459c71a03742b6b933117ffd888b5869c74281c1 100644 (file)
--- a/statuscake/resource_statuscaketest.go
+++ b/statuscake/resource_statuscaketest.go
@@ -44,7 +44,7 @@ func resourceStatusCakeTest() *schema.Resource {
                        },
 
                        "contact_id": {
                        },
 
                        "contact_id": {

-                               Type:     schema.TypeString,
+                               Type:     schema.TypeInt,

                                Optional: true,
                        },
 
                                Optional: true,
                        },
 


@@ -214,7 +214,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),
                TestType:       d.Get("test_type").(string),
                Paused:         d.Get("paused").(bool),
                Timeout:        d.Get("timeout").(int),

-               ContactID:      d.Get("contact_id").(string),
+               ContactID:      d.Get("contact_id").(int),

                Confirmation:   d.Get("confirmations").(int),
                Port:           d.Get("port").(int),
                TriggerRate:    d.Get("trigger_rate").(int),
                Confirmation:   d.Get("confirmations").(int),
                Port:           d.Get("port").(int),
                TriggerRate:    d.Get("trigger_rate").(int),


@@ -353,7 +353,7 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test {
                test.CheckRate = v.(int)
        }
        if v, ok := d.GetOk("contact_id"); ok {
                test.CheckRate = v.(int)
        }
        if v, ok := d.GetOk("contact_id"); ok {

-               test.ContactID = v.(string)
+               test.ContactID = v.(int)

        }
        if v, ok := d.GetOk("test_type"); ok {
                test.TestType = v.(string)
        }
        if v, ok := d.GetOk("test_type"); ok {
                test.TestType = v.(string)

diff --git a/statuscake/resource_statuscaketest_test.go b/statuscake/resource_statuscaketest_test.go
index 99acd0409281413e889e8270ca74730ab585456a..b727e9267572e06a767a5908a4817c1359ccd8f9 100644 (file)
--- a/statuscake/resource_statuscaketest_test.go
+++ b/statuscake/resource_statuscaketest_test.go
@@ -162,7 +162,7 @@ func testAccTestCheckAttributes(rn string, test *statuscake.Test) resource.TestC
                        case "timeout":
                                err = check(key, value, strconv.Itoa(test.Timeout))
                        case "contact_id":
                        case "timeout":
                                err = check(key, value, strconv.Itoa(test.Timeout))
                        case "contact_id":

-                               err = check(key, value, test.ContactID)
+                               err = check(key, value, strconv.Itoa(test.ContactID))

                        case "confirmations":
                                err = check(key, value, strconv.Itoa(test.Confirmation))
                        case "trigger_rate":
                        case "confirmations":
                                err = check(key, value, strconv.Itoa(test.Confirmation))
                        case "trigger_rate":


@@ -240,7 +240,7 @@ resource "statuscake_test" "google" {
        test_type = "HTTP"
        check_rate = 300
        timeout = 10
        test_type = "HTTP"
        check_rate = 300
        timeout = 10

-       contact_id = "43402"
+       contact_id = 43402

        confirmations = 1
        trigger_rate = 10
 }
        confirmations = 1
        trigger_rate = 10
 }


@@ -284,7 +284,7 @@ resource "statuscake_test" "google" {
        test_type = "TCP"
        check_rate = 300
        timeout = 10
        test_type = "TCP"
        check_rate = 300
        timeout = 10

-       contact_id = "43402"
+       contact_id = 43402

        confirmations = 1
        port = 80
 }
        confirmations = 1
        port = 80
 }

diff --git a/vendor/github.com/DreamItGetIT/statuscake/responses.go b/vendor/github.com/DreamItGetIT/statuscake/responses.go
index 9cdcb118b47db9b9597ea6eaf843637278cc5e19..3cbf36daa5c45754b1e8091eff3f1e76e78d6f44 100644 (file)
--- a/vendor/github.com/DreamItGetIT/statuscake/responses.go
+++ b/vendor/github.com/DreamItGetIT/statuscake/responses.go
@@ -28,7 +28,7 @@ type detailResponse struct {
        Paused          bool     `json:"Paused"`
        WebsiteName     string   `json:"WebsiteName"`
        URI             string   `json:"URI"`
        Paused          bool     `json:"Paused"`
        WebsiteName     string   `json:"WebsiteName"`
        URI             string   `json:"URI"`

-       ContactID       string   `json:"ContactID"`
+       ContactID       int      `json:"ContactID"`

        Status          string   `json:"Status"`
        Uptime          float64  `json:"Uptime"`
        CustomHeader    string   `json:"CustomHeader"`
        Status          string   `json:"Status"`
        Uptime          float64  `json:"Uptime"`
        CustomHeader    string   `json:"CustomHeader"`

diff --git a/vendor/github.com/DreamItGetIT/statuscake/tests.go b/vendor/github.com/DreamItGetIT/statuscake/tests.go
index 1b37fa13516925835312bf916e355e0b1525213f..a41b0bd78576b326983d1fdda3e1d0c13eccfa96 100644 (file)
--- a/vendor/github.com/DreamItGetIT/statuscake/tests.go
+++ b/vendor/github.com/DreamItGetIT/statuscake/tests.go
@@ -34,7 +34,7 @@ type Test struct {
        Port int `json:"Port" querystring:"Port"`
 
        // Contact group ID - will return int of contact group used else 0
        Port int `json:"Port" querystring:"Port"`
 
        // Contact group ID - will return int of contact group used else 0

-       ContactID string `json:"ContactID" querystring:"ContactGroup"`
+       ContactID int `json:"ContactID" querystring:"ContactGroup"`

 
        // Current status at last test
        Status string `json:"Status"`
 
        // Current status at last test
        Status string `json:"Status"`

diff --git a/vendor/vendor.json b/vendor/vendor.json
index 921131f8c16bf63361a42eb82222b77251be35fe..d2bc87c4114369112442f07db9807e4ccacbfdba 100644 (file)
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -3,10 +3,11 @@
        "ignore": "appengine test github.com/hashicorp/nomad/ github.com/hashicorp/terraform/backend",
        "package": [
                {
        "ignore": "appengine test github.com/hashicorp/nomad/ github.com/hashicorp/terraform/backend",
        "package": [
                {

-                       "checksumSHA1": "xjfJ6T+mQFmC9oMR+UKdGtbs/p4=",
+                       "checksumSHA1": "6Fo7YzTT+MDviHOsqg6dNw8WrV4=",
+                       "origin": "github.com/matschaffer/statuscake",

                        "path": "github.com/DreamItGetIT/statuscake",
                        "path": "github.com/DreamItGetIT/statuscake",

-                       "revision": "2081e16dbe691bccf20b1901897d8f8245beefcd",
-                       "revisionTime": "2018-01-09T18:02:45Z"
+                       "revision": "24c596002b80d84cf3bfb0f714e880c1b2e9af16",
+                       "revisionTime": "2018-01-16T08:09:52Z"

                },
                {
                        "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=",
                },
                {
                        "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=",