add matcher attribute to contentmatchers (#3607) (#2150)

* add matcher attribute to contentmatcher

* removed the required field as its mandatory

* tab removed and used spaces

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/3607.txt

@@ -0,0 +1,4 @@
+```release-note:enhancement
+monitoring: added `matcher` attribute to `content_matchers` block for 
+ `google_monitoring_uptime_check_config`
+```

google-beta/resource_monitoring_uptime_check_config.go

@@ -65,6 +65,12 @@ func resourceMonitoringUptimeCheckConfig() *schema.Resource {
 							Required:    true,
 							Description: `String or regex content to match (max 1024 bytes)`,
 						},
+						"matcher": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringInSlice([]string{"CONTAINS_STRING", "NOT_CONTAINS_STRING", "MATCHES_REGEX", "NON_MATCHES_REGEX", ""}, false),
+							Description:  `The type of content matcher that will be applied to the server output, compared to the content string when the check is run. Possible values: ["CONTAINS_STRING", "NOT_CONTAINS_STRING", "MATCHES_REGEX", "NON_MATCHES_REGEX"]`,
+						},
 					},
 				},
 			},
@@ -629,6 +635,7 @@ func flattenMonitoringUptimeCheckConfigContentMatchers(v interface{}, d *schema.
 		}
 		transformed = append(transformed, map[string]interface{}{
 			"content": flattenMonitoringUptimeCheckConfigContentMatchersContent(original["content"], d, config),
+			"matcher": flattenMonitoringUptimeCheckConfigContentMatchersMatcher(original["matcher"], d, config),
 		})
 	}
 	return transformed
@@ -637,6 +644,10 @@ func flattenMonitoringUptimeCheckConfigContentMatchersContent(v interface{}, d *
 	return v
 }
 
+func flattenMonitoringUptimeCheckConfigContentMatchersMatcher(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenMonitoringUptimeCheckConfigSelectedRegions(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -832,6 +843,13 @@ func expandMonitoringUptimeCheckConfigContentMatchers(v interface{}, d Terraform
 			transformed["content"] = transformedContent
 		}
 
+		transformedMatcher, err := expandMonitoringUptimeCheckConfigContentMatchersMatcher(original["matcher"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedMatcher); val.IsValid() && !isEmptyValue(val) {
+			transformed["matcher"] = transformedMatcher
+		}
+
 		req = append(req, transformed)
 	}
 	return req, nil
@@ -841,6 +859,10 @@ func expandMonitoringUptimeCheckConfigContentMatchersContent(v interface{}, d Te
 	return v, nil
 }
 
+func expandMonitoringUptimeCheckConfigContentMatchersMatcher(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandMonitoringUptimeCheckConfigSelectedRegions(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

google-beta/resource_monitoring_uptime_check_config_test.go

@@ -106,6 +106,7 @@ resource "google_monitoring_uptime_check_config" "http" {
 
   content_matchers {
     content = "example"
+    matcher = "CONTAINS_STRING"
   }
 }
 `, suffix, path, project, pwd, host,

website/docs/r/monitoring_uptime_check_config.html.markdown

@@ -182,6 +182,16 @@ The `content_matchers` block supports:
   (Required)
   String or regex content to match (max 1024 bytes)
 
+* `matcher` -
+  (Optional)
+  The type of content matcher that will be applied to the server output, compared to the content string when the check is run.
+
+  Possible values are:
+  * `CONTAINS_STRING`
+  * `NOT_CONTAINS_STRING`
+  * `MATCHES_REGEX`
+  * `NON_MATCHES_REGEX`
+
 The `http_check` block supports:
 
 * `auth_info` -