Promoted SslPolicy on regional target HTTPS proxy resource

.changelog/8702.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: promoted the `ssl_policy` field on the `google_compute_region_target_https_proxy` resource to GA.
+```

google/services/compute/resource_compute_region_target_https_proxy.go

@@ -91,6 +91,15 @@ to the RegionBackendService.`,
 				DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
 				Description: `The Region in which the created target https proxy should reside.
 If it is not provided, the provider region is used.`,
+			},
+			"ssl_policy": {
+				Type:             schema.TypeString,
+				Optional:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: tpgresource.CompareSelfLinkOrResourceName,
+				Description: `A reference to the Region SslPolicy resource that will be associated with
+the TargetHttpsProxy resource. If not set, the TargetHttpsProxy
+resource will not have any SSL policy configured.`,
 			},
 			"creation_timestamp": {
 				Type:        schema.TypeString,
@@ -143,6 +152,12 @@ func resourceComputeRegionTargetHttpsProxyCreate(d *schema.ResourceData, meta in
 	} else if v, ok := d.GetOkExists("ssl_certificates"); !tpgresource.IsEmptyValue(reflect.ValueOf(sslCertificatesProp)) && (ok || !reflect.DeepEqual(v, sslCertificatesProp)) {
 		obj["sslCertificates"] = sslCertificatesProp
 	}
+	sslPolicyProp, err := expandComputeRegionTargetHttpsProxySslPolicy(d.Get("ssl_policy"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("ssl_policy"); !tpgresource.IsEmptyValue(reflect.ValueOf(sslPolicyProp)) && (ok || !reflect.DeepEqual(v, sslPolicyProp)) {
+		obj["sslPolicy"] = sslPolicyProp
+	}
 	urlMapProp, err := expandComputeRegionTargetHttpsProxyUrlMap(d.Get("url_map"), d, config)
 	if err != nil {
 		return err
@@ -265,6 +280,9 @@ func resourceComputeRegionTargetHttpsProxyRead(d *schema.ResourceData, meta inte
 	if err := d.Set("ssl_certificates", flattenComputeRegionTargetHttpsProxySslCertificates(res["sslCertificates"], d, config)); err != nil {
 		return fmt.Errorf("Error reading RegionTargetHttpsProxy: %s", err)
 	}
+	if err := d.Set("ssl_policy", flattenComputeRegionTargetHttpsProxySslPolicy(res["sslPolicy"], d, config)); err != nil {
+		return fmt.Errorf("Error reading RegionTargetHttpsProxy: %s", err)
+	}
 	if err := d.Set("url_map", flattenComputeRegionTargetHttpsProxyUrlMap(res["urlMap"], d, config)); err != nil {
 		return fmt.Errorf("Error reading RegionTargetHttpsProxy: %s", err)
 	}
@@ -495,6 +513,13 @@ func flattenComputeRegionTargetHttpsProxySslCertificates(v interface{}, d *schem
 	return tpgresource.ConvertAndMapStringArr(v.([]interface{}), tpgresource.ConvertSelfLinkToV1)
 }
 
+func flattenComputeRegionTargetHttpsProxySslPolicy(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return v
+	}
+	return tpgresource.ConvertSelfLinkToV1(v.(string))
+}
+
 func flattenComputeRegionTargetHttpsProxyUrlMap(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -533,6 +558,14 @@ func expandComputeRegionTargetHttpsProxySslCertificates(v interface{}, d tpgreso
 	return req, nil
 }
 
+func expandComputeRegionTargetHttpsProxySslPolicy(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	f, err := tpgresource.ParseRegionalFieldValue("sslPolicies", v.(string), "project", "region", "zone", d, config, true)
+	if err != nil {
+		return nil, fmt.Errorf("Invalid value for ssl_policy: %s", err)
+	}
+	return f.RelativeLink(), nil
+}
+
 func expandComputeRegionTargetHttpsProxyUrlMap(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	f, err := tpgresource.ParseRegionalFieldValue("urlMaps", v.(string), "project", "region", "zone", d, config, true)
 	if err != nil {

google/services/compute/resource_compute_region_target_https_proxy_generated_test.go

@@ -49,7 +49,7 @@ func TestAccComputeRegionTargetHttpsProxy_regionTargetHttpsProxyBasicExample(t *
 				ResourceName:            "google_compute_region_target_https_proxy.default",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"url_map", "region"},
+				ImportStateVerifyIgnore: []string{"ssl_policy", "url_map", "region"},
 			},
 		},
 	})

google/services/compute/resource_compute_region_target_https_proxy_test.go

@@ -36,6 +36,14 @@ func TestAccComputeRegionTargetHttpsProxy_update(t *testing.T) {
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
+			{
+				Config: testAccComputeRegionTargetHttpsProxy_basic3(resourceSuffix),
+			},
+			{
+				ResourceName:      "google_compute_region_target_https_proxy.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -236,3 +244,109 @@ resource "google_compute_region_ssl_certificate" "foobar2" {
 }
 `, id, id, id, id, id, id, id, id, id)
 }
+
+func testAccComputeRegionTargetHttpsProxy_basic3(id string) string {
+	return fmt.Sprintf(`
+resource "google_compute_region_target_https_proxy" "foobar" {
+  description      = "Resource created for Terraform acceptance testing"
+  name             = "httpsproxy-test-%s"
+  url_map          = google_compute_region_url_map.foobar2.self_link
+  ssl_certificates = [google_compute_region_ssl_certificate.foobar2.self_link]
+  ssl_policy       = google_compute_region_ssl_policy.foobar.self_link
+}
+
+resource "google_compute_region_backend_service" "foobar1" {
+  name          = "httpsproxy-test-backend1-%s"
+  health_checks = [google_compute_region_health_check.zero.self_link]
+  protocol      = "HTTP"
+  load_balancing_scheme = "INTERNAL_MANAGED"
+}
+
+resource "google_compute_region_backend_service" "foobar2" {
+  name          = "httpsproxy-test-backend2-%s"
+  health_checks = [google_compute_region_health_check.one.self_link]
+  protocol      = "HTTP"
+  load_balancing_scheme = "INTERNAL_MANAGED"
+}
+
+resource "google_compute_region_health_check" "zero" {
+  name     = "httpsproxy-test-health-check1-%s"
+  http_health_check {
+    port = 443
+  }
+}
+
+resource "google_compute_region_health_check" "one" {
+  name     = "httpsproxy-test-health-check2-%s"
+  http_health_check {
+    port = 443
+  }
+}
+
+resource "google_compute_region_url_map" "foobar1" {
+  name            = "httpsproxy-test-url-map1-%s"
+  default_service = google_compute_region_backend_service.foobar1.self_link
+  host_rule {
+    hosts        = ["mysite.com", "myothersite.com"]
+    path_matcher = "boop"
+  }
+  path_matcher {
+    default_service = google_compute_region_backend_service.foobar1.self_link
+    name            = "boop"
+    path_rule {
+      paths   = ["/*"]
+      service = google_compute_region_backend_service.foobar1.self_link
+    }
+  }
+  test {
+    host    = "mysite.com"
+    path    = "/*"
+    service = google_compute_region_backend_service.foobar1.self_link
+  }
+}
+
+resource "google_compute_region_url_map" "foobar2" {
+  name            = "httpsproxy-test-url-map2-%s"
+  default_service = google_compute_region_backend_service.foobar2.self_link
+  host_rule {
+    hosts        = ["mysite2.com", "myothersite2.com"]
+    path_matcher = "boop"
+  }
+  path_matcher {
+    default_service = google_compute_region_backend_service.foobar2.self_link
+    name            = "boop"
+    path_rule {
+      paths   = ["/*"]
+      service = google_compute_region_backend_service.foobar2.self_link
+    }
+  }
+  test {
+    host    = "mysite2.com"
+    path    = "/*"
+    service = google_compute_region_backend_service.foobar2.self_link
+  }
+}
+
+resource "google_compute_region_ssl_policy" "foobar" {
+  name            = "sslproxy-test-%s"
+  description     = "my-description"
+  min_tls_version = "TLS_1_2"
+  profile         = "MODERN"
+  region          = "us-central1"
+}
+
+resource "google_compute_region_ssl_certificate" "foobar1" {
+  name        = "httpsproxy-test-cert1-%s"
+  description = "very descriptive"
+  private_key = file("test-fixtures/test.key")
+  certificate = file("test-fixtures/test.crt")
+}
+
+resource "google_compute_region_ssl_certificate" "foobar2" {
+  name        = "httpsproxy-test-cert2-%s"
+  description = "very descriptive"
+  private_key = file("test-fixtures/test.key")
+  certificate = file("test-fixtures/test.crt")
+}
+`, id, id, id, id, id, id, id, id, id, id)
+}

website/docs/r/compute_region_target_https_proxy.html.markdown

@@ -130,7 +130,7 @@ The following arguments are supported:
   An optional description of this resource.
 
 * `ssl_policy` -
-  (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html))
+  (Optional)
   A reference to the Region SslPolicy resource that will be associated with
   the TargetHttpsProxy resource. If not set, the TargetHttpsProxy
   resource will not have any SSL policy configured.