Add log_config to backend service (#2316)

Merged PR #2316.
GoogleCloudPlatform · Sep 16, 2019 · 32eea00 · 32eea00
1 parent ee22e51
commit 32eea00
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 1 deletion.
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -932,6 +932,24 @@ objects:
         description: |
           How many seconds to wait for the backend before considering it a
           failed request. Default is 30 seconds. Valid range is [1, 86400].
+      - !ruby/object:Api::Type::NestedObject
+        name: 'logConfig'
+        min_version: beta
+        description: |
+          This field denotes the logging options for the load balancer traffic served by this backend service.
+          If logging is enabled, logs will be exported to Stackdriver.
+        properties:
+          - !ruby/object:Api::Type::Boolean
+            name: 'enable'
+            description: |
+              Whether to enable logging for the load balancer traffic served by this backend service.
+          - !ruby/object:Api::Type::Double
+            name: 'sampleRate'
+            description: |
+              This field can only be specified if logging is enabled for this backend service. The value of
+              the field must be in [0, 1]. This configures the sampling rate of requests to the load balancer
+              where 1.0 means all logged requests are reported and 0.0 means no logged requests are reported.
+              The default value is 1.0.
   - !ruby/object:Api::Resource
     name: 'RegionBackendService'
     kind: 'compute#backendService'

diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -230,6 +230,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         sensitive: true
       id: !ruby/object:Overrides::Terraform::PropertyOverride
         exclude: true
+      logConfig: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
       portName: !ruby/object:Overrides::Terraform::PropertyOverride
         default_from_api: true
       protocol: !ruby/object:Overrides::Terraform::PropertyOverride

diff --git a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb
@@ -752,6 +752,39 @@ func TestAccComputeBackendService_internalLoadBalancing(t *testing.T) {
 }
 <% end -%>
 
+<% unless version == 'ga' -%>
+func TestAccComputeBackendService_withLogConfig(t *testing.T) {
+	t.Parallel()
+
+	serviceName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	checkName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckComputeBackendServiceDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccComputeBackendService_withLogConfig(serviceName, checkName, 0.7),
+			},
+			resource.TestStep{
+				ResourceName:      "google_compute_backend_service.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			resource.TestStep{
+				Config: testAccComputeBackendService_withLogConfig(serviceName, checkName, 0.4),
+			},
+			resource.TestStep{
+				ResourceName:      "google_compute_backend_service.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+<% end -%>
+
 func testAccComputeBackendService_basic(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
@@ -1449,3 +1482,26 @@ resource "google_compute_instance_template" "foobar" {
 }`, fr, proxy, backend, hc, urlmap)
 }
 <% end -%>
+
+<% unless version == 'ga' -%>
+func testAccComputeBackendService_withLogConfig(serviceName, checkName string, sampleRate float64) string {
+	return fmt.Sprintf(`
+resource "google_compute_backend_service" "foobar" {
+  name          = "%s"
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
+
+  log_config {
+    enable = true
+    sample_rate = %v
+  }
+}
+
+resource "google_compute_http_health_check" "zero" {
+  name               = "%s"
+  request_path       = "/"
+  check_interval_sec = 1
+  timeout_sec        = 1
+}
+`, serviceName, sampleRate, checkName)
+}
+<% end -%>