X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=statuscake%2Fresource_statuscaketest.go;h=88c7363dbd88025db9f679f388ceb58206cdd2e2;hb=4c25d89f7b248fb20b124fff6eb18b272b865463;hp=50e16f9ffb145418e201c496cfab8db73bd99f81;hpb=a609749989d4ea67354ac5a464ce42a7b807b869;p=github%2Ffretlink%2Fterraform-provider-statuscake.git diff --git a/statuscake/resource_statuscaketest.go b/statuscake/resource_statuscaketest.go index 50e16f9..88c7363 100644 --- a/statuscake/resource_statuscaketest.go +++ b/statuscake/resource_statuscaketest.go @@ -10,12 +10,33 @@ import ( "github.com/hashicorp/terraform/helper/schema" ) +func castSetToSliceStrings(configured []interface{}) []string { + res := make([]string, len(configured)) + + for i, element := range configured { + res[i] = element.(string) + } + return res +} + +// Special handling for node_locations since statuscake will return `[""]` for the empty case +func considerEmptyStringAsEmptyArray(in []string) []string { + if len(in) == 1 && in[0] == "" { + return []string{} + } else { + return in + } +} + func resourceStatusCakeTest() *schema.Resource { return &schema.Resource{ Create: CreateTest, Update: UpdateTest, Delete: DeleteTest, Read: ReadTest, + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, Schema: map[string]*schema.Schema{ "test_id": { @@ -33,9 +54,19 @@ func resourceStatusCakeTest() *schema.Resource { Required: true, }, + "contact_group": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Optional: true, + Set: schema.HashString, + ConflictsWith: []string{"contact_id"}, + }, + "contact_id": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeInt, + Optional: true, + ConflictsWith: []string{"contact_group"}, + Deprecated: "use contact_group instead", }, "check_rate": { @@ -76,6 +107,7 @@ func resourceStatusCakeTest() *schema.Resource { Optional: true, Default: 5, }, + "custom_header": { Type: schema.TypeString, Optional: true, @@ -97,9 +129,10 @@ func resourceStatusCakeTest() *schema.Resource { }, "node_locations": { - Type: schema.TypeList, + Type: schema.TypeSet, Elem: &schema.Schema{Type: schema.TypeString}, Optional: true, + Set: schema.HashString, }, "ping_url": { @@ -113,8 +146,9 @@ func resourceStatusCakeTest() *schema.Resource { }, "basic_pass": { - Type: schema.TypeString, - Optional: true, + Type: schema.TypeString, + Optional: true, + Sensitive: true, }, "public": { @@ -158,17 +192,15 @@ 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": { Type: schema.TypeString, Optional: true, - Default: "204, 205, 206, 303, 400, 401, 403, 404, 405, 406, " + - "408, 410, 413, 444, 429, 494, 495, 496, 499, 500, 501, 502, 503, " + - "504, 505, 506, 507, 508, 509, 510, 511, 521, 522, 523, 524, 520, " + - "598, 599", }, "use_jar": { @@ -186,6 +218,12 @@ func resourceStatusCakeTest() *schema.Resource { Optional: true, }, + "enable_ssl_alert": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + "follow_redirect": { Type: schema.TypeBool, Optional: true, @@ -204,7 +242,6 @@ 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").(string), Confirmation: d.Get("confirmations").(int), Port: d.Get("port").(int), TriggerRate: d.Get("trigger_rate").(int), @@ -212,7 +249,7 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error { UserAgent: d.Get("user_agent").(string), Status: d.Get("status").(string), Uptime: d.Get("uptime").(float64), - NodeLocations: d.Get("node_locations").([]string), + NodeLocations: castSetToSliceStrings(d.Get("node_locations").(*schema.Set).List()), PingURL: d.Get("ping_url").(string), BasicUser: d.Get("basic_user").(string), BasicPass: d.Get("basic_pass").(string), @@ -224,14 +261,21 @@ 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), FinalEndpoint: d.Get("final_endpoint").(string), + EnableSSLAlert: d.Get("enable_ssl_alert").(bool), FollowRedirect: d.Get("follow_redirect").(bool), } + if v, ok := d.GetOk("contact_group"); ok { + newTest.ContactGroup = castSetToSliceStrings(v.(*schema.Set).List()) + } else if v, ok := d.GetOk("contact_id"); ok { + newTest.ContactID = v.(int) + } + log.Printf("[DEBUG] Creating new StatusCake Test: %s", d.Get("website_name").(string)) response, err := client.Tests().Update(newTest) @@ -287,38 +331,47 @@ func ReadTest(d *schema.ResourceData, meta interface{}) error { if err != nil { return fmt.Errorf("Error Getting StatusCake Test Details for %s: Error: %s", d.Id(), err) } + + d.Set("contact_id", testResp.ContactID) + d.Set("contact_group", testResp.ContactGroup) d.Set("website_name", testResp.WebsiteName) d.Set("website_url", testResp.WebsiteURL) d.Set("check_rate", testResp.CheckRate) d.Set("test_type", testResp.TestType) d.Set("paused", testResp.Paused) d.Set("timeout", testResp.Timeout) - d.Set("contact_id", testResp.ContactID) d.Set("confirmations", testResp.Confirmation) d.Set("port", testResp.Port) d.Set("trigger_rate", testResp.TriggerRate) d.Set("custom_header", testResp.CustomHeader) - d.Set("user_agent", testResp.UserAgent) d.Set("status", testResp.Status) d.Set("uptime", testResp.Uptime) - d.Set("node_locations", testResp.NodeLocations) - d.Set("ping_url", testResp.PingURL) - d.Set("basic_user", testResp.BasicUser) - d.Set("basic_pass", testResp.BasicPass) - d.Set("public", testResp.Public) + if err := d.Set("node_locations", considerEmptyStringAsEmptyArray(testResp.NodeLocations)); err != nil { + return fmt.Errorf("[WARN] Error setting node locations: %s", err) + } d.Set("logo_image", testResp.LogoImage) - d.Set("branding", testResp.Branding) - d.Set("website_host", testResp.WebsiteHost) - d.Set("virus", testResp.Virus) + // Even after WebsiteHost is set, the API returns "" + // API docs aren't clear on usage will only override state if we get a non-empty value back + if testResp.WebsiteHost != "" { + d.Set("website_host", testResp.WebsiteHost) + } d.Set("find_string", testResp.FindString) d.Set("do_not_find", testResp.DoNotFind) - d.Set("real_browser", testResp.RealBrowser) - d.Set("test_tags", testResp.TestTags) d.Set("status_codes", testResp.StatusCodes) d.Set("use_jar", testResp.UseJar) + d.Set("user_agent", testResp.UserAgent) d.Set("post_raw", testResp.PostRaw) d.Set("final_endpoint", testResp.FinalEndpoint) + d.Set("enable_ssl_alert", testResp.EnableSSLAlert) d.Set("follow_redirect", testResp.FollowRedirect) + d.Set("ping_url", testResp.PingURL) + d.Set("basic_user", testResp.BasicUser) + d.Set("basic_pass", testResp.BasicPass) + d.Set("public", testResp.Public) + d.Set("branding", testResp.Branding) + d.Set("virus", testResp.Virus) + d.Set("real_browser", testResp.RealBrowser) + d.Set("RealBrowser", testResp.TestTags) return nil } @@ -340,8 +393,10 @@ 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.(string) + if v, ok := d.GetOk("contact_group"); ok { + test.ContactGroup = castSetToSliceStrings(v.(*schema.Set).List()) + } else if v, ok := d.GetOk("contact_id"); ok { + test.ContactID = v.(int) } if v, ok := d.GetOk("test_type"); ok { test.TestType = v.(string) @@ -368,7 +423,7 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test { test.UserAgent = v.(string) } if v, ok := d.GetOk("node_locations"); ok { - test.NodeLocations = v.([]string) + test.NodeLocations = castSetToSliceStrings(v.(*schema.Set).List()) } if v, ok := d.GetOk("ping_url"); ok { test.PingURL = v.(string) @@ -404,7 +459,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) @@ -418,6 +473,9 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test { if v, ok := d.GetOk("final_endpoint"); ok { test.FinalEndpoint = v.(string) } + if v, ok := d.GetOk("enable_ssl_alert"); ok { + test.EnableSSLAlert = v.(bool) + } if v, ok := d.GetOk("follow_redirect"); ok { test.FollowRedirect = v.(bool) }