Merge pull request #11 from callstats-io/master

Update statuscake library to latest version and use all the features from there.

3 files changed, 70 insertions, 21 deletions

diff --git a/vendor/github.com/DreamItGetIT/statuscake/responses.go b/vendor/github.com/DreamItGetIT/statuscake/responses.go
index b9216b7..3cbf36d 100644
--- a/vendor/github.com/DreamItGetIT/statuscake/responses.go
+++ b/vendor/github.com/DreamItGetIT/statuscake/responses.go
@@ -1,5 +1,9 @@
 package statuscake
 
+import (
+        "strings"
+)
+
 type autheticationErrorResponse struct {
         ErrNo int
         Error string
@@ -27,6 +31,8 @@ type detailResponse struct {
         ContactID       int      `json:"ContactID"`
         Status          string   `json:"Status"`
         Uptime          float64  `json:"Uptime"`
+        CustomHeader    string   `json:"CustomHeader"`
+        UserAgent       string   `json:"UserAgent"`
         CheckRate       int      `json:"CheckRate"`
         Timeout         int      `json:"Timeout"`
         LogoImage       string   `json:"LogoImage"`
@@ -44,27 +50,39 @@ type detailResponse struct {
         DownTimes       int      `json:"DownTimes,string"`
         Sensitive       bool     `json:"Sensitive"`
         TriggerRate     int      `json:"TriggerRate,string"`
+        UseJar          int      `json:"UseJar"`
+        PostRaw         string   `json:"PostRaw"`
+        FinalEndpoint   string   `json:"FinalEndpoint"`
+        FollowRedirect  bool     `json:"FollowRedirect"`
+        StatusCodes     []string `json:"StatusCodes"`
 }
 
 func (d *detailResponse) test() *Test {
         return &Test{
-                TestID:        d.TestID,
-                TestType:      d.TestType,
-                Paused:        d.Paused,
-                WebsiteName:   d.WebsiteName,
-                WebsiteURL:    d.URI,
-                ContactID:     d.ContactID,
-                Status:        d.Status,
-                Uptime:        d.Uptime,
-                CheckRate:     d.CheckRate,
-                Timeout:       d.Timeout,
-                LogoImage:     d.LogoImage,
-                Confirmation:  d.Confirmation,
-                WebsiteHost:   d.WebsiteHost,
-                NodeLocations: d.NodeLocations,
-                FindString:    d.FindString,
-                DoNotFind:     d.DoNotFind,
-                Port:          d.Port,
-                TriggerRate:   d.TriggerRate,
+                TestID:         d.TestID,
+                TestType:       d.TestType,
+                Paused:         d.Paused,
+                WebsiteName:    d.WebsiteName,
+                WebsiteURL:     d.URI,
+                CustomHeader:   d.CustomHeader,
+                UserAgent:      d.UserAgent,
+                ContactID:      d.ContactID,
+                Status:         d.Status,
+                Uptime:         d.Uptime,
+                CheckRate:      d.CheckRate,
+                Timeout:        d.Timeout,
+                LogoImage:      d.LogoImage,
+                Confirmation:   d.Confirmation,
+                WebsiteHost:    d.WebsiteHost,
+                NodeLocations:  d.NodeLocations,
+                FindString:     d.FindString,
+                DoNotFind:      d.DoNotFind,
+                Port:           d.Port,
+                TriggerRate:    d.TriggerRate,
+                UseJar:         d.UseJar,
+                PostRaw:        d.PostRaw,
+                FinalEndpoint:  d.FinalEndpoint,
+                FollowRedirect: d.FollowRedirect,
+                StatusCodes:    strings.Join(d.StatusCodes[:], ","),
         }
 }
diff --git a/vendor/github.com/DreamItGetIT/statuscake/tests.go b/vendor/github.com/DreamItGetIT/statuscake/tests.go
index 4053e53..a41b0bd 100644
--- a/vendor/github.com/DreamItGetIT/statuscake/tests.go
+++ b/vendor/github.com/DreamItGetIT/statuscake/tests.go
@@ -21,6 +21,12 @@ type Test struct {
         // Website name. Tags are stripped out
         WebsiteName string `json:"WebsiteName" querystring:"WebsiteName"`
 
+        // CustomHeader. A special header that will be sent along with the HTTP tests.
+        CustomHeader string `json:"CustomHeader" querystring:"CustomHeader"`
+
+        // Use to populate the test with a custom user agent
+        UserAgent string `json:"UserAgent" queryString:"UserAgent"`
+
         // Test location, either an IP (for TCP and Ping) or a fully qualified URL for other TestTypes
         WebsiteURL string `json:"WebsiteURL" querystring:"WebsiteURL"`
 
@@ -91,6 +97,18 @@ type Test struct {
 
         // Comma Seperated List of StatusCodes to Trigger Error on (on Update will replace, so send full list each time)
         StatusCodes string `json:"StatusCodes" querystring:"StatusCodes"`
+
+        // Set to 1 to enable the Cookie Jar. Required for some redirects.
+        UseJar int `json:"UseJar" querystring:"UseJar"`
+
+        // Raw POST data seperated by an ampersand
+        PostRaw string `json:"PostRaw" querystring:"PostRaw"`
+
+        // Use to specify the expected Final URL in the testing process
+        FinalEndpoint string `json:"FinalEndpoint" querystring:"FinalEndpoint"`
+
+        // Use to specify whether redirects should be followed
+        FollowRedirect bool `json:"FollowRedirect" querystring:"FollowRedirect"`
 }
 
 // Validate checks if the Test is valid. If it's invalid, it returns a ValidationError with all invalid fields. It returns nil otherwise.
@@ -137,6 +155,19 @@ func (t *Test) Validate() error {
                 e["TriggerRate"] = "must be between 0 and 59"
         }
 
+        if t.PostRaw != "" && t.TestType != "HTTP" {
+                e["PostRaw"] = "must be HTTP to submit a POST request"
+        }
+
+        if t.FinalEndpoint != "" && t.TestType != "HTTP" {
+                e["FinalEndpoint"] = "must be a Valid URL"
+        }
+
+        var jsonVerifiable map[string]interface{}
+        if json.Unmarshal([]byte(t.CustomHeader), &jsonVerifiable) != nil {
+                e["CustomHeader"] = "must be provided as json string"
+        }
+
         if len(e) > 0 {
                 return e
         }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 8b44fbd..61dd8f3 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -3,10 +3,10 @@
         "ignore": "appengine test github.com/hashicorp/nomad/ github.com/hashicorp/terraform/backend",
         "package": [
                 {
-                        "checksumSHA1": "MV5JueYPwNkLZ+KNqmDcNDhsKi4=",
+                        "checksumSHA1": "6Fo7YzTT+MDviHOsqg6dNw8WrV4=",
                         "path": "github.com/DreamItGetIT/statuscake",
-                        "revision": "acc13ec021cd1e8a6ebb1d9035f513217f5c4562",
-                        "revisionTime": "2017-04-10T11:34:45Z"
+                        "revision": "f69198f958d7326f3c110dd9be1c21abbd8a87a7",
+                        "revisionTime": "2018-01-30T22:14:43Z"
                 },
                 {
                         "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=",