Added Fingerprint to TargetHttpProxy and TartgetHttpsProxy (#14193) (#10175)

[upstream:50cb21c344228c799747b74044b5dca798c85ab2]

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

Author: modular-magician

.changelog/14193.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+compute: added `fingerprint` field in `google_compute_target_http_proxy` and `google_compute_target_https_proxy` resources.
+```

google-beta/services/compute/resource_compute_target_http_proxy.go

@@ -107,6 +107,15 @@ this target proxy has a loadBalancingScheme set to INTERNAL_SELF_MANAGED.`,
 				Computed:    true,
 				Description: `Creation timestamp in RFC3339 text format.`,
 			},
+			"fingerprint": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `Fingerprint of this resource. A hash of the contents stored in this object. This field is used in optimistic locking.
+This field will be ignored when inserting a TargetHttpProxy. An up-to-date fingerprint must be provided in order to
+patch/update the TargetHttpProxy; otherwise, the request will fail with error 412 conditionNotMet.
+To see the latest fingerprint, make a get() request to retrieve the TargetHttpProxy.
+A base64-encoded string.`,
+			},
 			"proxy_id": {
 				Type:        schema.TypeInt,
 				Computed:    true,
@@ -165,6 +174,12 @@ func resourceComputeTargetHttpProxyCreate(d *schema.ResourceData, meta interface
 	} else if v, ok := d.GetOkExists("http_keep_alive_timeout_sec"); !tpgresource.IsEmptyValue(reflect.ValueOf(httpKeepAliveTimeoutSecProp)) && (ok || !reflect.DeepEqual(v, httpKeepAliveTimeoutSecProp)) {
 		obj["httpKeepAliveTimeoutSec"] = httpKeepAliveTimeoutSecProp
 	}
+	fingerprintProp, err := expandComputeTargetHttpProxyFingerprint(d.Get("fingerprint"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("fingerprint"); !tpgresource.IsEmptyValue(reflect.ValueOf(fingerprintProp)) && (ok || !reflect.DeepEqual(v, fingerprintProp)) {
+		obj["fingerprint"] = fingerprintProp
+	}
 
 	url, err := tpgresource.ReplaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/global/targetHttpProxies")
 	if err != nil {
@@ -285,6 +300,9 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{}
 	if err := d.Set("http_keep_alive_timeout_sec", flattenComputeTargetHttpProxyHttpKeepAliveTimeoutSec(res["httpKeepAliveTimeoutSec"], d, config)); err != nil {
 		return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
 	}
+	if err := d.Set("fingerprint", flattenComputeTargetHttpProxyFingerprint(res["fingerprint"], d, config)); err != nil {
+		return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
+	}
 	if err := d.Set("self_link", tpgresource.ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
 		return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
 	}
@@ -493,6 +511,10 @@ func flattenComputeTargetHttpProxyHttpKeepAliveTimeoutSec(v interface{}, d *sche
 	return v // let terraform core handle it otherwise
 }
 
+func flattenComputeTargetHttpProxyFingerprint(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func expandComputeTargetHttpProxyDescription(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
@@ -516,3 +538,7 @@ func expandComputeTargetHttpProxyProxyBind(v interface{}, d tpgresource.Terrafor
 func expandComputeTargetHttpProxyHttpKeepAliveTimeoutSec(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
+
+func expandComputeTargetHttpProxyFingerprint(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}

google-beta/services/compute/resource_compute_target_http_proxy_generated_meta.yaml

@@ -7,6 +7,7 @@ api_resource_type_kind: 'TargetHttpProxy'
 fields:
   - field: 'creation_timestamp'
   - field: 'description'
+  - field: 'fingerprint'
   - field: 'http_keep_alive_timeout_sec'
   - field: 'name'
   - field: 'proxy_bind'

google-beta/services/compute/resource_compute_target_http_proxy_generated_test.go

@@ -214,6 +214,81 @@ resource "google_compute_url_map" "default" {
 `, context)
 }
 
+func TestAccComputeTargetHttpProxy_targetHttpProxyFingerprintExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeTargetHttpProxyDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeTargetHttpProxy_targetHttpProxyFingerprintExample(context),
+			},
+			{
+				ResourceName:            "google_compute_target_http_proxy.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"url_map"},
+			},
+		},
+	})
+}
+
+func testAccComputeTargetHttpProxy_targetHttpProxyFingerprintExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_target_http_proxy" "default" {
+  name    = "tf-test-test-fingerprint-proxy%{random_suffix}"
+  url_map = google_compute_url_map.default.id
+}
+
+resource "google_compute_url_map" "default" {
+  name            = "tf-test-url-map%{random_suffix}"
+  default_service = google_compute_backend_service.default.id
+
+  host_rule {
+    hosts        = ["mysite.com"]
+    path_matcher = "allpaths"
+  }
+
+  path_matcher {
+    name            = "allpaths"
+    default_service = google_compute_backend_service.default.id
+
+    path_rule {
+      paths   = ["/*"]
+      service = google_compute_backend_service.default.id
+    }
+  }
+}
+
+resource "google_compute_backend_service" "default" {
+  name        = "tf-test-backend-service%{random_suffix}"
+  port_name   = "http"
+  protocol    = "HTTP"
+  timeout_sec = 10
+
+  health_checks = [google_compute_http_health_check.default.id]
+}
+
+resource "google_compute_http_health_check" "default" {
+  name               = "tf-test-http-health-check%{random_suffix}"
+  request_path       = "/"
+  check_interval_sec = 1
+  timeout_sec        = 1
+}
+
+output "target_http_proxy_fingerprint" {
+  value       = google_compute_target_http_proxy.default.fingerprint
+  description = "The fingerprint of the target HTTP proxy for optimistic locking"
+}
+`, context)
+}
+
 func testAccCheckComputeTargetHttpProxyDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

google-beta/services/compute/resource_compute_target_https_proxy.go

@@ -192,6 +192,15 @@ This applies to TLS 1.3 connections over TCP (HTTP/2) as well as over UDP (QUIC/
 				Computed:    true,
 				Description: `Creation timestamp in RFC3339 text format.`,
 			},
+			"fingerprint": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Description: `Fingerprint of this resource. A hash of the contents stored in this object. This field is used in optimistic locking.
+This field will be ignored when inserting a TargetHttpsProxy. An up-to-date fingerprint must be provided in order to
+patch the TargetHttpsProxy; otherwise, the request will fail with error 412 conditionNotMet.
+To see the latest fingerprint, make a get() request to retrieve the TargetHttpsProxy.
+A base64-encoded string.`,
+			},
 			"proxy_id": {
 				Type:        schema.TypeInt,
 				Computed:    true,
@@ -292,6 +301,12 @@ func resourceComputeTargetHttpsProxyCreate(d *schema.ResourceData, meta interfac
 	} else if v, ok := d.GetOkExists("server_tls_policy"); !tpgresource.IsEmptyValue(reflect.ValueOf(serverTlsPolicyProp)) && (ok || !reflect.DeepEqual(v, serverTlsPolicyProp)) {
 		obj["serverTlsPolicy"] = serverTlsPolicyProp
 	}
+	fingerprintProp, err := expandComputeTargetHttpsProxyFingerprint(d.Get("fingerprint"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("fingerprint"); !tpgresource.IsEmptyValue(reflect.ValueOf(fingerprintProp)) && (ok || !reflect.DeepEqual(v, fingerprintProp)) {
+		obj["fingerprint"] = fingerprintProp
+	}
 
 	obj, err = resourceComputeTargetHttpsProxyEncoder(d, meta, obj)
 	if err != nil {
@@ -450,6 +465,9 @@ func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{
 	if err := d.Set("server_tls_policy", flattenComputeTargetHttpsProxyServerTlsPolicy(res["serverTlsPolicy"], d, config)); err != nil {
 		return fmt.Errorf("Error reading TargetHttpsProxy: %s", err)
 	}
+	if err := d.Set("fingerprint", flattenComputeTargetHttpsProxyFingerprint(res["fingerprint"], d, config)); err != nil {
+		return fmt.Errorf("Error reading TargetHttpsProxy: %s", err)
+	}
 	if err := d.Set("self_link", tpgresource.ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
 		return fmt.Errorf("Error reading TargetHttpsProxy: %s", err)
 	}
@@ -983,6 +1001,10 @@ func flattenComputeTargetHttpsProxyServerTlsPolicy(v interface{}, d *schema.Reso
 	return tpgresource.ConvertSelfLinkToV1(v.(string))
 }
 
+func flattenComputeTargetHttpsProxyFingerprint(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func expandComputeTargetHttpsProxyDescription(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }
@@ -1072,6 +1094,10 @@ func expandComputeTargetHttpsProxyServerTlsPolicy(v interface{}, d tpgresource.T
 	return v, nil
 }
 
+func expandComputeTargetHttpsProxyFingerprint(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func resourceComputeTargetHttpsProxyEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
 
 	if _, ok := obj["certificateManagerCertificates"]; ok {

google-beta/services/compute/resource_compute_target_https_proxy_generated_meta.yaml

@@ -9,6 +9,7 @@ fields:
   - field: 'certificate_map'
   - field: 'creation_timestamp'
   - field: 'description'
+  - field: 'fingerprint'
   - field: 'http_keep_alive_timeout_sec'
   - field: 'name'
   - field: 'proxy_bind'

google-beta/services/compute/resource_compute_target_https_proxy_generated_test.go

@@ -386,6 +386,90 @@ resource "google_compute_backend_service" "default" {
 `, context)
 }
 
+func TestAccComputeTargetHttpsProxy_targetHttpsProxyFingerprintExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeTargetHttpsProxyDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeTargetHttpsProxy_targetHttpsProxyFingerprintExample(context),
+			},
+			{
+				ResourceName:            "google_compute_target_https_proxy.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"server_tls_policy", "ssl_policy", "url_map"},
+			},
+		},
+	})
+}
+
+func testAccComputeTargetHttpsProxy_targetHttpsProxyFingerprintExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_compute_target_https_proxy" "default" {
+  name             = "tf-test-test-fingerprint-proxy%{random_suffix}"
+  url_map          = google_compute_url_map.default.id
+  ssl_certificates = [google_compute_ssl_certificate.default.id]
+}
+
+resource "google_compute_ssl_certificate" "default" {
+  name        = "tf-test-my-certificate%{random_suffix}"
+  private_key = file("test-fixtures/test.key")
+  certificate = file("test-fixtures/test.crt")
+}
+
+resource "google_compute_url_map" "default" {
+  name        = "tf-test-url-map%{random_suffix}"
+  description = "a description"
+
+  default_service = google_compute_backend_service.default.id
+
+  host_rule {
+    hosts        = ["mysite.com"]
+    path_matcher = "allpaths"
+  }
+
+  path_matcher {
+    name            = "allpaths"
+    default_service = google_compute_backend_service.default.id
+
+    path_rule {
+      paths   = ["/*"]
+      service = google_compute_backend_service.default.id
+    }
+  }
+}
+
+resource "google_compute_backend_service" "default" {
+  name        = "tf-test-backend-service%{random_suffix}"
+  port_name   = "http"
+  protocol    = "HTTP"
+  timeout_sec = 10
+
+  health_checks = [google_compute_http_health_check.default.id]
+}
+
+resource "google_compute_http_health_check" "default" {
+  name               = "tf-test-http-health-check%{random_suffix}"
+  request_path       = "/"
+  check_interval_sec = 1
+  timeout_sec        = 1
+}
+
+output "target_https_proxy_fingerprint" {
+  value       = google_compute_target_https_proxy.default.fingerprint
+  description = "The fingerprint of the target HTTPS proxy for optimistic locking"
+}
+`, context)
+}
+
 func testAccCheckComputeTargetHttpsProxyDestroyProducer(t *testing.T) func(s *terraform.State) error {
 	return func(s *terraform.State) error {
 		for name, rs := range s.RootModule().Resources {

website/docs/r/compute_target_http_proxy.html.markdown

@@ -156,6 +156,61 @@ resource "google_compute_url_map" "default" {
   }
 }
 ```
+<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.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=target_http_proxy_fingerprint&open_in_editor=main.tf" 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 - Target Http Proxy Fingerprint
+
+
+```hcl
+resource "google_compute_target_http_proxy" "default" {
+  name    = "test-fingerprint-proxy"
+  url_map = google_compute_url_map.default.id
+}
+
+resource "google_compute_url_map" "default" {
+  name            = "url-map"
+  default_service = google_compute_backend_service.default.id
+
+  host_rule {
+    hosts        = ["mysite.com"]
+    path_matcher = "allpaths"
+  }
+
+  path_matcher {
+    name            = "allpaths"
+    default_service = google_compute_backend_service.default.id
+
+    path_rule {
+      paths   = ["/*"]
+      service = google_compute_backend_service.default.id
+    }
+  }
+}
+
+resource "google_compute_backend_service" "default" {
+  name        = "backend-service"
+  port_name   = "http"
+  protocol    = "HTTP"
+  timeout_sec = 10
+
+  health_checks = [google_compute_http_health_check.default.id]
+}
+
+resource "google_compute_http_health_check" "default" {
+  name               = "http-health-check"
+  request_path       = "/"
+  check_interval_sec = 1
+  timeout_sec        = 1
+}
+
+output "target_http_proxy_fingerprint" {
+  value       = google_compute_target_http_proxy.default.fingerprint
+  description = "The fingerprint of the target HTTP proxy for optimistic locking"
+}
+```
 
 ## Argument Reference
 
@@ -217,6 +272,13 @@ In addition to the arguments listed above, the following computed attributes are
 
 * `proxy_id` -
   The unique identifier for the resource.
+
+* `fingerprint` -
+  Fingerprint of this resource. A hash of the contents stored in this object. This field is used in optimistic locking.
+  This field will be ignored when inserting a TargetHttpProxy. An up-to-date fingerprint must be provided in order to
+  patch/update the TargetHttpProxy; otherwise, the request will fail with error 412 conditionNotMet.
+  To see the latest fingerprint, make a get() request to retrieve the TargetHttpProxy.
+  A base64-encoded string.
 * `self_link` - The URI of the created resource.