google_logging_metric: add disabled argument (#7600) (#14198)

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

Author: modular-magician

.changelog/7600.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+logging: added support for `disabled` to `google_logging_metric`
+```

google/resource_logging_metric.go

@@ -158,6 +158,11 @@ Each bucket represents a constant absolute uncertainty on the specific value in
 				Description: `A description of this metric, which is used in documentation. The maximum length of the
 description is 8000 characters.`,
 			},
+			"disabled": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: `If set to True, then this metric is disabled and it does not generate any points.`,
+			},
 			"label_extractors": {
 				Type:     schema.TypeMap,
 				Optional: true,
@@ -296,6 +301,12 @@ func resourceLoggingMetricCreate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("bucket_name"); !isEmptyValue(reflect.ValueOf(bucketNameProp)) && (ok || !reflect.DeepEqual(v, bucketNameProp)) {
 		obj["bucketName"] = bucketNameProp
 	}
+	disabledProp, err := expandLoggingMetricDisabled(d.Get("disabled"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("disabled"); !isEmptyValue(reflect.ValueOf(disabledProp)) && (ok || !reflect.DeepEqual(v, disabledProp)) {
+		obj["disabled"] = disabledProp
+	}
 	filterProp, err := expandLoggingMetricFilter(d.Get("filter"), d, config)
 	if err != nil {
 		return err
@@ -431,6 +442,9 @@ func resourceLoggingMetricRead(d *schema.ResourceData, meta interface{}) error {
 	if err := d.Set("bucket_name", flattenLoggingMetricBucketName(res["bucketName"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Metric: %s", err)
 	}
+	if err := d.Set("disabled", flattenLoggingMetricDisabled(res["disabled"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Metric: %s", err)
+	}
 	if err := d.Set("filter", flattenLoggingMetricFilter(res["filter"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Metric: %s", err)
 	}
@@ -484,6 +498,12 @@ func resourceLoggingMetricUpdate(d *schema.ResourceData, meta interface{}) error
 	} else if v, ok := d.GetOkExists("bucket_name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, bucketNameProp)) {
 		obj["bucketName"] = bucketNameProp
 	}
+	disabledProp, err := expandLoggingMetricDisabled(d.Get("disabled"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("disabled"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, disabledProp)) {
+		obj["disabled"] = disabledProp
+	}
 	filterProp, err := expandLoggingMetricFilter(d.Get("filter"), d, config)
 	if err != nil {
 		return err
@@ -613,6 +633,10 @@ func flattenLoggingMetricBucketName(v interface{}, d *schema.ResourceData, confi
 	return v
 }
 
+func flattenLoggingMetricDisabled(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenLoggingMetricFilter(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -828,6 +852,10 @@ func expandLoggingMetricBucketName(v interface{}, d TerraformResourceData, confi
 	return v, nil
 }
 
+func expandLoggingMetricDisabled(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandLoggingMetricFilter(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

google/resource_logging_metric_generated_test.go

@@ -207,6 +207,44 @@ resource "google_logging_metric" "logging_metric" {
 `, context)
 }
 
+func TestAccLoggingMetric_loggingMetricDisabledExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": RandString(t, 10),
+	}
+
+	VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV5ProviderFactories: ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckLoggingMetricDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccLoggingMetric_loggingMetricDisabledExample(context),
+			},
+			{
+				ResourceName:      "google_logging_metric.logging_metric",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+func testAccLoggingMetric_loggingMetricDisabledExample(context map[string]interface{}) string {
+	return Nprintf(`
+resource "google_logging_metric" "logging_metric" {
+  name   = "tf-test-my-(custom)/metric%{random_suffix}"
+  filter = "resource.type=gae_app AND severity>=ERROR"
+  metric_descriptor {
+    metric_kind = "DELTA"
+    value_type  = "INT64"
+  }
+  disabled = true
+}
+`, context)
+}
+
 func testAccCheckLoggingMetricDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

website/docs/r/logging_metric.html.markdown

@@ -133,6 +133,25 @@ resource "google_logging_metric" "logging_metric" {
   bucket_name = google_logging_project_bucket_config.logging_metric.id
 }
 ```
+<div class = "oics-button" style="float: right; margin: 0 0 -15px">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.jpy.wang%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_working_dir=logging_metric_disabled&cloudshell_image=gcr.io%2Fgraphite-cloud-shell-images%2Fterraform%3Alatest&open_in_editor=main.tf&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md" target="_blank">
+    <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
+  </a>
+</div>
+## Example Usage - Logging Metric Disabled
+
+
+```hcl
+resource "google_logging_metric" "logging_metric" {
+  name   = "my-(custom)/metric"
+  filter = "resource.type=gae_app AND severity>=ERROR"
+  metric_descriptor {
+    metric_kind = "DELTA"
+    value_type  = "INT64"
+  }
+  disabled = true
+}
+```
 
 ## Argument Reference
 
@@ -166,6 +185,10 @@ The following arguments are supported:
   The resource name of the Log Bucket that owns the Log Metric. Only Log Buckets in projects
   are supported. The bucket has to be in the same project as the metric.
 
+* `disabled` -
+  (Optional)
+  If set to True, then this metric is disabled and it does not generate any points.
+
 * `metric_descriptor` -
   (Optional)
   The optional metric descriptor associated with the logs-based metric.