From 550036fb4a24c4f9cc9d4068af452d8202e1c974 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Sat, 9 Mar 2024 04:40:17 +0000 Subject: [PATCH 1/2] Stop merging sensitive fields in SQLInstance --- pkg/krmtotf/tftokrm.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/krmtotf/tftokrm.go b/pkg/krmtotf/tftokrm.go index 49c0ee8a0c..1f2aa4b2bc 100644 --- a/pkg/krmtotf/tftokrm.go +++ b/pkg/krmtotf/tftokrm.go @@ -520,6 +520,9 @@ func convertTFMapToKCCMap(state map[string]interface{}, prevSpec map[string]inte continue } if tfresource.IsSensitiveConfigurableField(schema) { + if rc.Name == "google_sql_database_instance" { + continue + } val := stateVal.(string) ret[key] = corekccv1alpha1.SensitiveField{ Value: &val, From 1a989c1d0ee0ba25e81e31e8f3a08902243e27a1 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Thu, 14 Mar 2024 22:38:50 +0000 Subject: [PATCH 2/2] Stop merging sensitive fields in ComputeBackendService --- pkg/krmtotf/tftokrm.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/krmtotf/tftokrm.go b/pkg/krmtotf/tftokrm.go index 1f2aa4b2bc..17853df4a4 100644 --- a/pkg/krmtotf/tftokrm.go +++ b/pkg/krmtotf/tftokrm.go @@ -520,7 +520,10 @@ func convertTFMapToKCCMap(state map[string]interface{}, prevSpec map[string]inte continue } if tfresource.IsSensitiveConfigurableField(schema) { - if rc.Name == "google_sql_database_instance" { + switch rc.Name { + case "google_sql_database_instance", + "google_compute_backend_service", + "google_compute_region_backend_service": continue } val := stateVal.(string)