aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrew N Golovkov <andrew@callstats.io>2018-01-17 16:55:18 +0200
committerAndrew N Golovkov <andrew@callstats.io>2018-01-17 16:55:18 +0200
commitc9458806c73b69e6af47eddd83391197b6d2a641 (patch)
treebc6751b5b5307b248cb7fb1f99b129136c230133
parentb01919994f2f0113f00c3afb931cb5a278d7ab0b (diff)
downloadterraform-provider-statuscake-c9458806c73b69e6af47eddd83391197b6d2a641.tar.gz
terraform-provider-statuscake-c9458806c73b69e6af47eddd83391197b6d2a641.tar.zst
terraform-provider-statuscake-c9458806c73b69e6af47eddd83391197b6d2a641.zip
merge changes from https://github.com/DreamItGetIT/statuscake/pull/24 to vendor directory
-rw-r--r--statuscake/resource_statuscaketest.go6
-rw-r--r--statuscake/resource_statuscaketest_test.go6
-rw-r--r--vendor/github.com/DreamItGetIT/statuscake/responses.go2
-rw-r--r--vendor/github.com/DreamItGetIT/statuscake/tests.go2
-rw-r--r--vendor/vendor.json7
5 files changed, 12 insertions, 11 deletions
diff --git a/statuscake/resource_statuscaketest.go b/statuscake/resource_statuscaketest.go
index 187f711..459c71a 100644
--- a/statuscake/resource_statuscaketest.go
+++ b/statuscake/resource_statuscaketest.go
@@ -44,7 +44,7 @@ func resourceStatusCakeTest() *schema.Resource {
44 }, 44 },
45 45
46 "contact_id": { 46 "contact_id": {
47 Type: schema.TypeString, 47 Type: schema.TypeInt,
48 Optional: true, 48 Optional: true,
49 }, 49 },
50 50
@@ -214,7 +214,7 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error {
214 TestType: d.Get("test_type").(string), 214 TestType: d.Get("test_type").(string),
215 Paused: d.Get("paused").(bool), 215 Paused: d.Get("paused").(bool),
216 Timeout: d.Get("timeout").(int), 216 Timeout: d.Get("timeout").(int),
217 ContactID: d.Get("contact_id").(string), 217 ContactID: d.Get("contact_id").(int),
218 Confirmation: d.Get("confirmations").(int), 218 Confirmation: d.Get("confirmations").(int),
219 Port: d.Get("port").(int), 219 Port: d.Get("port").(int),
220 TriggerRate: d.Get("trigger_rate").(int), 220 TriggerRate: d.Get("trigger_rate").(int),
@@ -353,7 +353,7 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test {
353 test.CheckRate = v.(int) 353 test.CheckRate = v.(int)
354 } 354 }
355 if v, ok := d.GetOk("contact_id"); ok { 355 if v, ok := d.GetOk("contact_id"); ok {
356 test.ContactID = v.(string) 356 test.ContactID = v.(int)
357 } 357 }
358 if v, ok := d.GetOk("test_type"); ok { 358 if v, ok := d.GetOk("test_type"); ok {
359 test.TestType = v.(string) 359 test.TestType = v.(string)
diff --git a/statuscake/resource_statuscaketest_test.go b/statuscake/resource_statuscaketest_test.go
index 99acd04..b727e92 100644
--- 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
162 case "timeout": 162 case "timeout":
163 err = check(key, value, strconv.Itoa(test.Timeout)) 163 err = check(key, value, strconv.Itoa(test.Timeout))
164 case "contact_id": 164 case "contact_id":
165 err = check(key, value, test.ContactID) 165 err = check(key, value, strconv.Itoa(test.ContactID))
166 case "confirmations": 166 case "confirmations":
167 err = check(key, value, strconv.Itoa(test.Confirmation)) 167 err = check(key, value, strconv.Itoa(test.Confirmation))
168 case "trigger_rate": 168 case "trigger_rate":
@@ -240,7 +240,7 @@ resource "statuscake_test" "google" {
240 test_type = "HTTP" 240 test_type = "HTTP"
241 check_rate = 300 241 check_rate = 300
242 timeout = 10 242 timeout = 10
243 contact_id = "43402" 243 contact_id = 43402
244 confirmations = 1 244 confirmations = 1
245 trigger_rate = 10 245 trigger_rate = 10
246} 246}
@@ -284,7 +284,7 @@ resource "statuscake_test" "google" {
284 test_type = "TCP" 284 test_type = "TCP"
285 check_rate = 300 285 check_rate = 300
286 timeout = 10 286 timeout = 10
287 contact_id = "43402" 287 contact_id = 43402
288 confirmations = 1 288 confirmations = 1
289 port = 80 289 port = 80
290} 290}
diff --git a/vendor/github.com/DreamItGetIT/statuscake/responses.go b/vendor/github.com/DreamItGetIT/statuscake/responses.go
index 9cdcb11..3cbf36d 100644
--- a/vendor/github.com/DreamItGetIT/statuscake/responses.go
+++ b/vendor/github.com/DreamItGetIT/statuscake/responses.go
@@ -28,7 +28,7 @@ type detailResponse struct {
28 Paused bool `json:"Paused"` 28 Paused bool `json:"Paused"`
29 WebsiteName string `json:"WebsiteName"` 29 WebsiteName string `json:"WebsiteName"`
30 URI string `json:"URI"` 30 URI string `json:"URI"`
31 ContactID string `json:"ContactID"` 31 ContactID int `json:"ContactID"`
32 Status string `json:"Status"` 32 Status string `json:"Status"`
33 Uptime float64 `json:"Uptime"` 33 Uptime float64 `json:"Uptime"`
34 CustomHeader string `json:"CustomHeader"` 34 CustomHeader string `json:"CustomHeader"`
diff --git a/vendor/github.com/DreamItGetIT/statuscake/tests.go b/vendor/github.com/DreamItGetIT/statuscake/tests.go
index 1b37fa1..a41b0bd 100644
--- a/vendor/github.com/DreamItGetIT/statuscake/tests.go
+++ b/vendor/github.com/DreamItGetIT/statuscake/tests.go
@@ -34,7 +34,7 @@ type Test struct {
34 Port int `json:"Port" querystring:"Port"` 34 Port int `json:"Port" querystring:"Port"`
35 35
36 // Contact group ID - will return int of contact group used else 0 36 // Contact group ID - will return int of contact group used else 0
37 ContactID string `json:"ContactID" querystring:"ContactGroup"` 37 ContactID int `json:"ContactID" querystring:"ContactGroup"`
38 38
39 // Current status at last test 39 // Current status at last test
40 Status string `json:"Status"` 40 Status string `json:"Status"`
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 921131f..d2bc87c 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -3,10 +3,11 @@
3 "ignore": "appengine test github.com/hashicorp/nomad/ github.com/hashicorp/terraform/backend", 3 "ignore": "appengine test github.com/hashicorp/nomad/ github.com/hashicorp/terraform/backend",
4 "package": [ 4 "package": [
5 { 5 {
6 "checksumSHA1": "xjfJ6T+mQFmC9oMR+UKdGtbs/p4=", 6 "checksumSHA1": "6Fo7YzTT+MDviHOsqg6dNw8WrV4=",
7 "origin": "github.com/matschaffer/statuscake",
7 "path": "github.com/DreamItGetIT/statuscake", 8 "path": "github.com/DreamItGetIT/statuscake",
8 "revision": "2081e16dbe691bccf20b1901897d8f8245beefcd", 9 "revision": "24c596002b80d84cf3bfb0f714e880c1b2e9af16",
9 "revisionTime": "2018-01-09T18:02:45Z" 10 "revisionTime": "2018-01-16T08:09:52Z"
10 }, 11 },
11 { 12 {
12 "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=", 13 "checksumSHA1": "FIL83loX9V9APvGQIjJpbxq53F0=",