X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=statuscake%2Fresource_statuscaketest.go;h=f8b69e3dadc4063d64e5251935d475137c27bb72;hb=6278bbb270b0a456466a876b991c67fa29c7b1e1;hp=101ee83582caa4b409ae71f237ebda0ee8ed8769;hpb=dbde71c990295605ce351a494888c15f3d6be9a8;p=github%2Ffretlink%2Fterraform-provider-statuscake.git diff --git a/statuscake/resource_statuscaketest.go b/statuscake/resource_statuscaketest.go index 101ee83..f8b69e3 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.TypeInt, - Optional: true, + Type: schema.TypeInt, + Optional: true, + ConflictsWith: []string{"contact_group"}, + Deprecated: "use contact_group instead", }, "check_rate": { @@ -76,6 +107,127 @@ func resourceStatusCakeTest() *schema.Resource { Optional: true, Default: 5, }, + + "custom_header": { + Type: schema.TypeString, + Optional: true, + }, + + "user_agent": { + Type: schema.TypeString, + Optional: true, + }, + + "status": { + Type: schema.TypeString, + Computed: true, + }, + + "uptime": { + Type: schema.TypeFloat, + Computed: true, + }, + + "node_locations": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Optional: true, + Set: schema.HashString, + }, + + "ping_url": { + Type: schema.TypeString, + Optional: true, + }, + + "basic_user": { + Type: schema.TypeString, + Optional: true, + }, + + "basic_pass": { + Type: schema.TypeString, + Optional: true, + Sensitive: true, + }, + + "public": { + Type: schema.TypeInt, + Optional: true, + }, + + "logo_image": { + Type: schema.TypeString, + Optional: true, + }, + + "branding": { + Type: schema.TypeInt, + Optional: true, + }, + + "website_host": { + Type: schema.TypeString, + Optional: true, + }, + + "virus": { + Type: schema.TypeInt, + Optional: true, + }, + + "find_string": { + Type: schema.TypeString, + Optional: true, + }, + + "do_not_find": { + Type: schema.TypeBool, + Optional: true, + }, + + "real_browser": { + Type: schema.TypeInt, + Optional: true, + }, + + "test_tags": { + Type: schema.TypeSet, + Elem: &schema.Schema{Type: schema.TypeString}, + Optional: true, + Set: schema.HashString, + }, + + "status_codes": { + Type: schema.TypeString, + Optional: true, + }, + + "use_jar": { + Type: schema.TypeInt, + Optional: true, + }, + + "post_raw": { + Type: schema.TypeString, + Optional: true, + }, + + "final_endpoint": { + Type: schema.TypeString, + Optional: true, + }, + + "enable_ssl_alert": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, + + "follow_redirect": { + Type: schema.TypeBool, + Optional: true, + }, }, } } @@ -84,16 +236,44 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error { client := meta.(*statuscake.Client) newTest := &statuscake.Test{ - WebsiteName: d.Get("website_name").(string), - WebsiteURL: d.Get("website_url").(string), - CheckRate: d.Get("check_rate").(int), - TestType: d.Get("test_type").(string), - Paused: d.Get("paused").(bool), - Timeout: d.Get("timeout").(int), - ContactID: d.Get("contact_id").(int), - Confirmation: d.Get("confirmations").(int), - Port: d.Get("port").(int), - TriggerRate: d.Get("trigger_rate").(int), + WebsiteName: d.Get("website_name").(string), + WebsiteURL: d.Get("website_url").(string), + CheckRate: d.Get("check_rate").(int), + TestType: d.Get("test_type").(string), + Paused: d.Get("paused").(bool), + Timeout: d.Get("timeout").(int), + Confirmation: d.Get("confirmations").(int), + Port: d.Get("port").(int), + TriggerRate: d.Get("trigger_rate").(int), + CustomHeader: d.Get("custom_header").(string), + UserAgent: d.Get("user_agent").(string), + Status: d.Get("status").(string), + Uptime: d.Get("uptime").(float64), + 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), + Public: d.Get("public").(int), + LogoImage: d.Get("logo_image").(string), + Branding: d.Get("branding").(int), + WebsiteHost: d.Get("website_host").(string), + Virus: d.Get("virus").(int), + FindString: d.Get("find_string").(string), + DoNotFind: d.Get("do_not_find").(bool), + RealBrowser: d.Get("real_browser").(int), + 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)) @@ -104,6 +284,8 @@ func CreateTest(d *schema.ResourceData, meta interface{}) error { } d.Set("test_id", fmt.Sprintf("%d", response.TestID)) + d.Set("status", response.Status) + d.Set("uptime", fmt.Sprintf("%.3f", response.Uptime)) d.SetId(fmt.Sprintf("%d", response.TestID)) return ReadTest(d, meta) @@ -149,16 +331,52 @@ 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) } + + if v, ok := d.GetOk("contact_group"); ok { + d.Set("contact_group", v) + } else if v, ok := d.GetOk("contact_id"); ok { + d.Set("contact_id", v) + } + + 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("status", testResp.Status) + d.Set("uptime", testResp.Uptime) + 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) + // 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("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("test_tags", testResp.TestTags) return nil } @@ -180,7 +398,9 @@ 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 { + 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 { @@ -192,9 +412,6 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test { if v, ok := d.GetOk("timeout"); ok { test.Timeout = v.(int) } - if v, ok := d.GetOk("contact_id"); ok { - test.ContactID = v.(int) - } if v, ok := d.GetOk("confirmations"); ok { test.Confirmation = v.(int) } @@ -204,13 +421,69 @@ func getStatusCakeTestInput(d *schema.ResourceData) *statuscake.Test { if v, ok := d.GetOk("trigger_rate"); ok { test.TriggerRate = v.(int) } - - defaultStatusCodes := "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" - - test.StatusCodes = defaultStatusCodes + if v, ok := d.GetOk("custom_header"); ok { + test.CustomHeader = v.(string) + } + if v, ok := d.GetOk("user_agent"); ok { + test.UserAgent = v.(string) + } + if v, ok := d.GetOk("node_locations"); ok { + test.NodeLocations = castSetToSliceStrings(v.(*schema.Set).List()) + } + if v, ok := d.GetOk("ping_url"); ok { + test.PingURL = v.(string) + } + if v, ok := d.GetOk("basic_user"); ok { + test.BasicUser = v.(string) + } + if v, ok := d.GetOk("basic_pass"); ok { + test.BasicPass = v.(string) + } + if v, ok := d.GetOk("public"); ok { + test.Public = v.(int) + } + if v, ok := d.GetOk("logo_image"); ok { + test.LogoImage = v.(string) + } + if v, ok := d.GetOk("branding"); ok { + test.Branding = v.(int) + } + if v, ok := d.GetOk("website_host"); ok { + test.WebsiteHost = v.(string) + } + if v, ok := d.GetOk("virus"); ok { + test.Virus = v.(int) + } + if v, ok := d.GetOk("find_string"); ok { + test.FindString = v.(string) + } + if v, ok := d.GetOk("do_not_find"); ok { + test.DoNotFind = v.(bool) + } + if v, ok := d.GetOk("real_browser"); ok { + test.RealBrowser = v.(int) + } + if v, ok := d.GetOk("test_tags"); ok { + test.TestTags = castSetToSliceStrings(v.(*schema.Set).List()) + } + if v, ok := d.GetOk("status_codes"); ok { + test.StatusCodes = v.(string) + } + if v, ok := d.GetOk("use_jar"); ok { + test.UseJar = v.(int) + } + if v, ok := d.GetOk("post_raw"); ok { + test.PostRaw = v.(string) + } + 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) + } return test }