diff options
author | Lee Johnson <leejohnson@ijoinsolutions.com> | 2016-11-29 16:03:58 -0500 |
---|---|---|
committer | Lee Johnson <leejohnson@ijoinsolutions.com> | 2016-11-29 16:03:58 -0500 |
commit | 312d16361a769314812c256f7433bcb0f2c72193 (patch) | |
tree | 5f35b10b1463b11186e3048212b10875503cb0b3 | |
parent | 2f15340f09a2a9dd12f9a47c009b9743e0d2f2db (diff) | |
download | terraform-provider-statuscake-312d16361a769314812c256f7433bcb0f2c72193.tar.gz terraform-provider-statuscake-312d16361a769314812c256f7433bcb0f2c72193.tar.zst terraform-provider-statuscake-312d16361a769314812c256f7433bcb0f2c72193.zip |
simplifying tests by removing tests and test data that is no longer needed
-rw-r--r-- | resource_statuscaketest.go | 5 | ||||
-rw-r--r-- | resource_statuscaketest_test.go | 83 |
2 files changed, 0 insertions, 88 deletions
diff --git a/resource_statuscaketest.go b/resource_statuscaketest.go index 389a7d6..a1d7354 100644 --- a/resource_statuscaketest.go +++ b/resource_statuscaketest.go | |||
@@ -58,10 +58,6 @@ func resourceStatusCakeTest() *schema.Resource { | |||
58 | Type: schema.TypeInt, | 58 | Type: schema.TypeInt, |
59 | Computed: true, | 59 | Computed: true, |
60 | }, | 60 | }, |
61 | "contact_id": &schema.Schema{ | ||
62 | Type: schema.TypeInt, | ||
63 | Optional: true, | ||
64 | }, | ||
65 | }, | 61 | }, |
66 | } | 62 | } |
67 | } | 63 | } |
@@ -74,7 +70,6 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error { | |||
74 | WebsiteURL: d.Get("website_url").(string), | 70 | WebsiteURL: d.Get("website_url").(string), |
75 | TestType: d.Get("test_type").(string), | 71 | TestType: d.Get("test_type").(string), |
76 | CheckRate: d.Get("check_rate").(int), | 72 | CheckRate: d.Get("check_rate").(int), |
77 | ContactID: d.Get("contact_id").(int), | ||
78 | } | 73 | } |
79 | 74 | ||
80 | log.Printf("[DEBUG] Creating new StatusCake Test: %s", d.Get("website_name").(string)) | 75 | log.Printf("[DEBUG] Creating new StatusCake Test: %s", d.Get("website_name").(string)) |
diff --git a/resource_statuscaketest_test.go b/resource_statuscaketest_test.go index 236b790..bec1a45 100644 --- a/resource_statuscaketest_test.go +++ b/resource_statuscaketest_test.go | |||
@@ -2,7 +2,6 @@ package statuscake | |||
2 | 2 | ||
3 | import ( | 3 | import ( |
4 | "fmt" | 4 | "fmt" |
5 | "os" | ||
6 | "strconv" | 5 | "strconv" |
7 | "testing" | 6 | "testing" |
8 | 7 | ||
@@ -11,19 +10,6 @@ import ( | |||
11 | "github.com/hashicorp/terraform/terraform" | 10 | "github.com/hashicorp/terraform/terraform" |
12 | ) | 11 | ) |
13 | 12 | ||
14 | // check to ensure that contact group id is provided before running | ||
15 | // tests on it. | ||
16 | func testAccContactGroupPreCheck(t *testing.T, testAlt bool) { | ||
17 | if v := os.Getenv("CONTACT_GROUP"); v == "" { | ||
18 | t.Fatal("CONTACT_GROUP must be set for contact group acceptance tests") | ||
19 | } | ||
20 | if testAlt { | ||
21 | if v := os.Getenv("ALT_CONTACT_GROUP"); v == "" { | ||
22 | t.Fatal("ALT_CONTACT_GROUP must be set for contact group acceptance tests") | ||
23 | } | ||
24 | } | ||
25 | } | ||
26 | |||
27 | func TestAccStatusCake_basic(t *testing.T) { | 13 | func TestAccStatusCake_basic(t *testing.T) { |
28 | var test statuscake.Test | 14 | var test statuscake.Test |
29 | 15 | ||
@@ -70,57 +56,6 @@ func TestAccStatusCake_withUpdate(t *testing.T) { | |||
70 | }) | 56 | }) |
71 | } | 57 | } |
72 | 58 | ||
73 | func TestAccStatusCake_contactGroup_basic(t *testing.T) { | ||
74 | var test statuscake.Test | ||
75 | |||
76 | resource.Test(t, resource.TestCase{ | ||
77 | PreCheck: func() { | ||
78 | testAccPreCheck(t) | ||
79 | testAccContactGroupPreCheck(t, false) | ||
80 | }, | ||
81 | Providers: testAccProviders, | ||
82 | CheckDestroy: testAccTestCheckDestroy(&test), | ||
83 | Steps: []resource.TestStep{ | ||
84 | resource.TestStep{ | ||
85 | Config: testAccTestConfig_contactGroup, | ||
86 | Check: resource.ComposeTestCheckFunc( | ||
87 | testAccTestCheckExists("statuscake_test.google", &test), | ||
88 | ), | ||
89 | }, | ||
90 | }, | ||
91 | }) | ||
92 | } | ||
93 | |||
94 | func TestAccStatusCake_contactGroup_withUpdate(t *testing.T) { | ||
95 | var test statuscake.Test | ||
96 | var altContactGroup = os.Getenv("ALT_CONTACT_GROUP") | ||
97 | |||
98 | resource.Test(t, resource.TestCase{ | ||
99 | PreCheck: func() { | ||
100 | testAccPreCheck(t) | ||
101 | testAccContactGroupPreCheck(t, true) | ||
102 | }, | ||
103 | Providers: testAccProviders, | ||
104 | CheckDestroy: testAccTestCheckDestroy(&test), | ||
105 | Steps: []resource.TestStep{ | ||
106 | resource.TestStep{ | ||
107 | Config: testAccTestConfig_contactGroup, | ||
108 | Check: resource.ComposeTestCheckFunc( | ||
109 | testAccTestCheckExists("statuscake_test.google", &test), | ||
110 | ), | ||
111 | }, | ||
112 | // make sure to creat | ||
113 | resource.TestStep{ | ||
114 | Config: testAccTestConfig_contactGroup_update, | ||
115 | Check: resource.ComposeTestCheckFunc( | ||
116 | testAccTestCheckExists("statuscake_test.google", &test), | ||
117 | resource.TestCheckResourceAttr("statuscake_test.google", "contact_id", altContactGroup), | ||
118 | ), | ||
119 | }, | ||
120 | }, | ||
121 | }) | ||
122 | } | ||
123 | |||
124 | func testAccTestCheckExists(rn string, test *statuscake.Test) resource.TestCheckFunc { | 59 | func testAccTestCheckExists(rn string, test *statuscake.Test) resource.TestCheckFunc { |
125 | return func(s *terraform.State) error { | 60 | return func(s *terraform.State) error { |
126 | rs, ok := s.RootModule().Resources[rn] | 61 | rs, ok := s.RootModule().Resources[rn] |
@@ -181,21 +116,3 @@ resource "statuscake_test" "google" { | |||
181 | contact_id = 23456 | 116 | contact_id = 23456 |
182 | } | 117 | } |
183 | ` | 118 | ` |
184 | |||
185 | var testAccTestConfig_contactGroup string = `` + | ||
186 | `resource "statuscake_test" "google" { | ||
187 | website_name = "google.com" | ||
188 | website_url = "www.google.com" | ||
189 | test_type = "HTTP" | ||
190 | check_rate = 300 | ||
191 | contact_id = ` + os.Getenv("CONTACT_GROUP") + ` | ||
192 | }` | ||
193 | |||
194 | var testAccTestConfig_contactGroup_update string = `` + | ||
195 | `resource "statuscake_test" "google" { | ||
196 | website_name = "google.com" | ||
197 | website_url = "www.google.com" | ||
198 | test_type = "HTTP" | ||
199 | check_rate = 300 | ||
200 | contact_id = ` + os.Getenv("ALT_CONTACT_GROUP") + ` | ||
201 | }` | ||