Fix client request only properties. (#10299) (#17714)

[upstream:860ff25fc1e80e04bf55ed3b2ef5dce146d9194c]

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

Author: modular-magician

.changelog/10299.txt

@@ -0,0 +1,2 @@
+```release-note:none
+```

google/services/integrations/resource_integrations_client.go

@@ -20,6 +20,7 @@ package integrations
 import (
 	"fmt"
 	"log"
+	"reflect"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
@@ -143,6 +144,30 @@ func resourceIntegrationsClientCreate(d *schema.ResourceData, meta interface{})
 	}
 
 	obj := make(map[string]interface{})
+	cloudKmsConfigProp, err := expandIntegrationsClientCloudKmsConfig(d.Get("cloud_kms_config"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("cloud_kms_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(cloudKmsConfigProp)) && (ok || !reflect.DeepEqual(v, cloudKmsConfigProp)) {
+		obj["cloudKmsConfig"] = cloudKmsConfigProp
+	}
+	createSampleWorkflowsProp, err := expandIntegrationsClientCreateSampleWorkflows(d.Get("create_sample_workflows"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("create_sample_workflows"); !tpgresource.IsEmptyValue(reflect.ValueOf(createSampleWorkflowsProp)) && (ok || !reflect.DeepEqual(v, createSampleWorkflowsProp)) {
+		obj["createSampleWorkflows"] = createSampleWorkflowsProp
+	}
+	provisionGmekProp, err := expandIntegrationsClientProvisionGmek(d.Get("provision_gmek"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("provision_gmek"); !tpgresource.IsEmptyValue(reflect.ValueOf(provisionGmekProp)) && (ok || !reflect.DeepEqual(v, provisionGmekProp)) {
+		obj["provisionGmek"] = provisionGmekProp
+	}
+	runAsServiceAccountProp, err := expandIntegrationsClientRunAsServiceAccount(d.Get("run_as_service_account"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("run_as_service_account"); !tpgresource.IsEmptyValue(reflect.ValueOf(runAsServiceAccountProp)) && (ok || !reflect.DeepEqual(v, runAsServiceAccountProp)) {
+		obj["runAsServiceAccount"] = runAsServiceAccountProp
+	}
 
 	lockName, err := tpgresource.ReplaceVars(d, config, "Client/{{location}}")
 	if err != nil {
@@ -322,6 +347,85 @@ func resourceIntegrationsClientImport(d *schema.ResourceData, meta interface{})
 	return []*schema.ResourceData{d}, nil
 }
 
+func expandIntegrationsClientCloudKmsConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	l := v.([]interface{})
+	if len(l) == 0 || l[0] == nil {
+		return nil, nil
+	}
+	raw := l[0]
+	original := raw.(map[string]interface{})
+	transformed := make(map[string]interface{})
+
+	transformedKmsLocation, err := expandIntegrationsClientCloudKmsConfigKmsLocation(original["kms_location"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedKmsLocation); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["kmsLocation"] = transformedKmsLocation
+	}
+
+	transformedKmsRing, err := expandIntegrationsClientCloudKmsConfigKmsRing(original["kms_ring"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedKmsRing); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["kmsRing"] = transformedKmsRing
+	}
+
+	transformedKey, err := expandIntegrationsClientCloudKmsConfigKey(original["key"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedKey); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["key"] = transformedKey
+	}
+
+	transformedKeyVersion, err := expandIntegrationsClientCloudKmsConfigKeyVersion(original["key_version"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedKeyVersion); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["keyVersion"] = transformedKeyVersion
+	}
+
+	transformedKmsProjectId, err := expandIntegrationsClientCloudKmsConfigKmsProjectId(original["kms_project_id"], d, config)
+	if err != nil {
+		return nil, err
+	} else if val := reflect.ValueOf(transformedKmsProjectId); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+		transformed["kmsProjectId"] = transformedKmsProjectId
+	}
+
+	return transformed, nil
+}
+
+func expandIntegrationsClientCloudKmsConfigKmsLocation(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientCloudKmsConfigKmsRing(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientCloudKmsConfigKey(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientCloudKmsConfigKeyVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientCloudKmsConfigKmsProjectId(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientCreateSampleWorkflows(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientProvisionGmek(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
+func expandIntegrationsClientRunAsServiceAccount(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func resourceIntegrationsClientDecoder(d *schema.ResourceData, meta interface{}, res map[string]interface{}) (map[string]interface{}, error) {
 	// Since Client resource doesnt have any properties,
 	// Adding this decoder as placeholder else the linter will

google/services/integrations/resource_integrations_client_generated_test.go

@@ -59,6 +59,7 @@ func testAccIntegrationsClient_integrationsClientBasicExample(context map[string
 	return acctest.Nprintf(`
 resource "google_integrations_client" "example" {
   location = "us-central1"
+  provision_gmek = true
 }
 `, context)
 }
@@ -96,7 +97,7 @@ data "google_project" "test_project" {
 
 resource "google_kms_key_ring" "keyring" {
   name     = "tf-test-my-keyring%{random_suffix}"
-  location = "us-central1"
+  location = "us-east1"
 }
 
 resource "google_kms_crypto_key" "cryptokey" {
@@ -111,19 +112,23 @@ resource "google_kms_crypto_key_version" "test_key" {
   depends_on = [google_kms_crypto_key.cryptokey]
 }
 
+resource "google_service_account" "service_account" {
+  account_id   = "service-account-id"
+  display_name = "Service Account"
+}
+
 resource "google_integrations_client" "example" {
-  location = "us-central1"
+  location = "us-east1"
   create_sample_workflows = true
-  provision_gmek = true
-  run_as_service_account = "radndom-service-account"
+  run_as_service_account = google_service_account.service_account.email
   cloud_kms_config {
-    kms_location = "us-central1"
+    kms_location = "us-east1"
     kms_ring = google_kms_key_ring.keyring.id
     key = google_kms_crypto_key.cryptokey.id
     key_version = google_kms_crypto_key_version.test_key.id
-    kms_project_id = data.google_project.test_project.id
+    kms_project_id = data.google_project.test_project.project_id
   }
-  depends_on = [google_kms_crypto_key_version.test_key]
+  depends_on = [google_kms_crypto_key_version.test_key, google_service_account.service_account]
 }
 `, context)
 }

website/docs/r/integrations_client.html.markdown

@@ -40,6 +40,7 @@ To get more information about Client, see:
 ```hcl
 resource "google_integrations_client" "example" {
   location = "us-central1"
+  provision_gmek = true
 }
 ```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
@@ -56,7 +57,7 @@ data "google_project" "test_project" {
 
 resource "google_kms_key_ring" "keyring" {
   name     = "my-keyring"
-  location = "us-central1"
+  location = "us-east1"
 }
 
 resource "google_kms_crypto_key" "cryptokey" {
@@ -71,19 +72,23 @@ resource "google_kms_crypto_key_version" "test_key" {
   depends_on = [google_kms_crypto_key.cryptokey]
 }
 
+resource "google_service_account" "service_account" {
+  account_id   = "service-account-id"
+  display_name = "Service Account"
+}
+
 resource "google_integrations_client" "example" {
-  location = "us-central1"
+  location = "us-east1"
   create_sample_workflows = true
-  provision_gmek = true
-  run_as_service_account = "radndom-service-account"
+  run_as_service_account = google_service_account.service_account.email
   cloud_kms_config {
-    kms_location = "us-central1"
+    kms_location = "us-east1"
     kms_ring = google_kms_key_ring.keyring.id
     key = google_kms_crypto_key.cryptokey.id
     key_version = google_kms_crypto_key_version.test_key.id
-    kms_project_id = data.google_project.test_project.id
+    kms_project_id = data.google_project.test_project.project_id
   }
-  depends_on = [google_kms_crypto_key_version.test_key]
+  depends_on = [google_kms_crypto_key_version.test_key, google_service_account.service_account]
 }
 ```