Supports expected_status_code in external monitor resources.

Author: fujiwara

docs/data-sources/monitor.md

@@ -63,6 +63,7 @@ data "mackerel_monitor" "this" {
   * `headers` - The values configured as the HTTP request header.
   * `max_check_attempts` - Number of consecutive Warning/Critical counts before an alert is made.
   * `follow_redirect` - Evaluates the response of the redirector as a result.
+  * `expected_status_code` - Expected http status code of the response.
 * `expression` -  The settings for the monitor of expression monitoring.
   * `expression` - Expression of the monitoring target.
   * `operator` - The comparison operator to determines the conditions that state whether the designated variable is either big or small. The observed value is on the left of the operator and the designated value is on the right.

docs/resources/monitor.md

@@ -179,6 +179,7 @@ The following arguments are required:
 * `headers` - The values configured as the HTTP request header.
 * `max_check_attempts` - Number of consecutive Warning/Critical counts before an alert is made. Default is `1`. Valid values are numbers `1` through `10` inclusive.
 * `follow_redirect` - Evaluates the response of the redirector as a result. Valid values are `true` and `false`. Default is `false`.
+* `expected_status_code` - Expected http status code of the response.
 
 ### expression
 

go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/hashicorp/terraform-plugin-mux v0.16.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
 	github.com/hashicorp/terraform-plugin-testing v1.9.0
-	github.com/mackerelio/mackerel-client-go v0.33.0
+	github.com/mackerelio/mackerel-client-go v0.36.0
 )
 
 require (

go.sum

@@ -426,8 +426,8 @@ github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7s
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM=
 github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM=
-github.com/mackerelio/mackerel-client-go v0.33.0 h1:dMv0pyR3Exvtxxq3l7xzGF6D/5ky2Jgftzmp4aAoFYg=
-github.com/mackerelio/mackerel-client-go v0.33.0/go.mod h1:b4qVMQi+w4rxtKQIFycLWXNBtIi9d0r571RzYmg/aXo=
+github.com/mackerelio/mackerel-client-go v0.36.0 h1:/dLedCmGWpo1cIKi5BB8QYtbA8w/R8McieleQ+Vme8w=
+github.com/mackerelio/mackerel-client-go v0.36.0/go.mod h1:EJom2FXbK0Akv61dVsRiH9oKggk4IWlgb6hrQtGK1Z4=
 github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
 github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI=

internal/mackerel/monitor.go

@@ -88,6 +88,7 @@ type MonitorExternal struct {
 	SkipCertificateVerification     types.Bool        `tfsdk:"skip_certificate_verification"`
 	Headers                         map[string]string `tfsdk:"headers"`
 	FollowRedirect                  types.Bool        `tfsdk:"follow_redirect"`
+	ExpectedStatusCode              types.Int64       `tfsdk:"expected_status_code"`
 }
 
 type MonitorAnomalyDetection struct {
@@ -418,6 +419,10 @@ func (m MonitorModel) mackerelMonitor() mackerel.Monitor {
 			certExpWarnU64 := uint64(certExpWarn)
 			mon.CertificationExpirationWarning = &certExpWarnU64
 		}
+		if expectedStatusCode := ehm.ExpectedStatusCode.ValueInt64(); expectedStatusCode > 0 {
+			expectedStatusCode := int(expectedStatusCode)
+			mon.ExpectedStatusCode = &expectedStatusCode
+		}
 
 		// Headers
 		fields := make([]mackerel.HeaderField, 0, len(ehm.Headers))

internal/mackerel/monitor_test.go

@@ -346,6 +346,7 @@ func Test_Monitor_toModel(t *testing.T) {
 					SkipCertificateVerification:     types.BoolValue(false),
 					Headers:                         nil,
 					FollowRedirect:                  types.BoolValue(false),
+					ExpectedStatusCode:              types.Int64Value(200),
 				}},
 			},
 		},

mackerel/data_source_mackerel_monitor.go

@@ -205,6 +205,10 @@ func dataSourceMackerelMonitor() *schema.Resource {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
+						"expected_status_code": {
+							Type:     schema.TypeInt,
+							Computed: true,
+						},
 					},
 				},
 			},

mackerel/resource_mackerel_monitor.go

@@ -266,6 +266,10 @@ func resourceMackerelMonitor() *schema.Resource {
 							Type:     schema.TypeBool,
 							Optional: true,
 						},
+						"expected_status_code": {
+							Type:     schema.TypeInt,
+							Optional: true,
+						},
 					},
 				},
 			},
@@ -567,6 +571,10 @@ func expandMonitorExternalHTTP(d *schema.ResourceData) *mackerel.MonitorExternal
 		certificationExpirationWarning := uint64(certificationExpirationWarning.(int))
 		monitor.CertificationExpirationWarning = &certificationExpirationWarning
 	}
+	if expectedStatusCode, ok := d.GetOkExists("external.0.expected_status_code"); ok {
+		expectedStatusCode := expectedStatusCode.(int)
+		monitor.ExpectedStatusCode = &expectedStatusCode
+	}
 	if headers, ok := d.GetOk("external.0.headers"); ok {
 		for name, value := range headers.(map[string]interface{}) {
 			monitor.Headers = append(monitor.Headers, mackerel.HeaderField{Name: name, Value: value.(string)})

mackerel/structure_flattens.go

@@ -166,6 +166,7 @@ func flattenMonitorExternalHTTP(monitor *mackerel.MonitorExternalHTTP, d *schema
 		"skip_certificate_verification":     monitor.SkipCertificateVerification,
 		"headers":                           headers,
 		"follow_redirect":                   monitor.FollowRedirect,
+		"expected_status_code":              monitor.ExpectedStatusCode,
 	}
 	d.Set("external", []map[string]interface{}{external})
 	return diags