Adds probe_zone argument to LB Monitor resource

cloudflare · Dec 30, 2020 · df05381 · df05381
1 parent 9879db9
commit df05381
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/cloudflare/resource_cloudflare_load_balancer_monitor.go b/cloudflare/resource_cloudflare_load_balancer_monitor.go
@@ -133,6 +133,11 @@ func resourceCloudflareLoadBalancerMonitor() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+
+			"probe_zone": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 		},
 	}
 }
@@ -195,6 +200,12 @@ func resourceCloudflareLoadBalancerPoolMonitorCreate(d *schema.ResourceData, met
 		} else {
 			loadBalancerMonitor.Path = "/"
 		}
+
+		if probeZone, ok := d.GetOk("probe_zone"); ok {
+			loadBalancerMonitor.ProbeZone = probeZone.(string)
+		} else {
+			loadBalancerMonitor.ProbeZone = ""
+		}
 	}
 
 	log.Printf("[DEBUG] Creating Cloudflare Load Balancer Monitor from struct: %+v", loadBalancerMonitor)
@@ -277,6 +288,12 @@ func resourceCloudflareLoadBalancerPoolMonitorUpdate(d *schema.ResourceData, met
 		} else {
 			loadBalancerMonitor.Path = "/"
 		}
+
+		if probeZone, ok := d.GetOk("probe_zone"); ok {
+			loadBalancerMonitor.ProbeZone = probeZone.(string)
+		} else {
+			loadBalancerMonitor.ProbeZone = ""
+		}
 	}
 
 	log.Printf("[DEBUG] Update Cloudflare Load Balancer Monitor from struct: %+v", loadBalancerMonitor)
@@ -323,6 +340,7 @@ func resourceCloudflareLoadBalancerPoolMonitorRead(d *schema.ResourceData, meta
 		d.Set("expected_codes", loadBalancerMonitor.ExpectedCodes)
 		d.Set("follow_redirects", loadBalancerMonitor.FollowRedirects)
 		d.Set("path", loadBalancerMonitor.Path)
+		d.Set("probe_zone", loadBalancerMonitor.ProbeZone)
 
 		if err := d.Set("header", flattenLoadBalancerMonitorHeader(loadBalancerMonitor.Header)); err != nil {
 			log.Printf("[WARN] Error setting header for load balancer monitor %q: %s", d.Id(), err)

diff --git a/cloudflare/resource_cloudflare_load_balancer_monitor_test.go b/cloudflare/resource_cloudflare_load_balancer_monitor_test.go
@@ -60,6 +60,7 @@ func TestAccCloudflareLoadBalancerMonitor_FullySpecified(t *testing.T) {
 					resource.TestCheckResourceAttr(name, "retries", "5"),
 					resource.TestCheckResourceAttr(name, "port", "8080"),
 					resource.TestCheckResourceAttr(name, "expected_body", "dead"),
+					resource.TestCheckResourceAttr(name, "probe_zone", "example.com"),
 				),
 			},
 		},
@@ -301,6 +302,7 @@ resource "cloudflare_load_balancer_monitor" "test" {
   retries = 5
   port = 8080
   description = "this is a very weird load balancer"
+  probe_zone = "example.com"
   header {
     header = "Host"
     values = ["example.com"]

diff --git a/website/docs/r/load_balancer_monitor.html.markdown b/website/docs/r/load_balancer_monitor.html.markdown
@@ -32,6 +32,7 @@ resource "cloudflare_load_balancer_monitor" "http_monitor" {
   }
   allow_insecure = false
   follow_redirects = true
+  probe_zone = "example.com"
 }
 ```
 
@@ -65,6 +66,7 @@ The following arguments are supported:
 * `description` - (Optional) Free text description.
 * `allow_insecure` - (Optional) Do not validate the certificate when monitor use HTTPS. Only valid if `type` is "http" or "https".
 * `follow_redirects` - (Optional) Follow redirects if returned by the origin. Only valid if `type` is "http" or "https".
+* `probe_zone` - (Optional) Assign this monitor to emulate the specified zone while probing. Only valid if `type` is "http" or "https".
 
 **header** requires the following: