Automated Config Connector import.

  - 2273409d2478ad9792f9f0b4a9be51a38c885373 Fix regression caused by unique_writer_identity in resour... by Config Connector Team <[email protected]>

GitOrigin-RevId: 2273409d2478ad9792f9f0b4a9be51a38c885373

hack/terraform-overrides/combined_log_sink.patch

@@ -101,3 +101,48 @@ index 24c0afc04..8d51a4eba 100644
  		return []*schema.ResourceData{d}, nil
  	}
  }
+diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_billing_account_sink.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_billing_account_sink.go
+index b675beec1..0c477ca83 100644
+--- a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_billing_account_sink.go
++++ b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_billing_account_sink.go
+@@ -66,6 +66,10 @@ func resourceLoggingBillingAccountSinkRead(d *schema.ResourceData, meta interfac
+ 		return err
+ 	}
+
++	if err := d.Set("unique_writer_identity", false); err != nil {
++		return fmt.Errorf("Error setting unique_writer_identity: %s", err)
++	}
++
+ 	return nil
+ }
+
+diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_folder_sink.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_folder_sink.go
+index 3dcf07925..deb5f016d 100644
+--- a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_folder_sink.go
++++ b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_folder_sink.go
+@@ -85,6 +85,10 @@ func resourceLoggingFolderSinkRead(d *schema.ResourceData, meta interface{}) err
+ 		return fmt.Errorf("Error setting include_children: %s", err)
+ 	}
+
++	if err := d.Set("unique_writer_identity", false); err != nil {
++		return fmt.Errorf("Error setting unique_writer_identity: %s", err)
++	}
++
+ 	return nil
+ }
+
+diff --git a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_organization_sink.go b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_organization_sink.go
+index 5593d1fb0..1a9055f0b 100644
+--- a/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_organization_sink.go
++++ b/third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_organization_sink.go
+@@ -84,6 +84,10 @@ func resourceLoggingOrganizationSinkRead(d *schema.ResourceData, meta interface{
+ 		return fmt.Errorf("Error setting include_children: %s", err)
+ 	}
+
++	if err := d.Set("unique_writer_identity", false); err != nil {
++		return fmt.Errorf("Error setting unique_writer_identity: %s", err)
++	}
++
+ 	return nil
+ }
+

third_party/Makefile

@@ -163,8 +163,10 @@ apply-patches:
 	git apply ../hack/terraform-overrides/sql_database_instance_settings.patch
 	# `project_team` field should be an object rather than a list
 	git apply ../hack/terraform-overrides/storage_default_object_access_control.patch
-	# Add combined_resources.go so that we can create custom TF resources
+	# 1) Add combined_resources.go so that we can create custom TF resources
 	# that combined multiple TF resources.
+	# 2) Set unique_writer_identity to false for Org/Folder/BillingAccount logging sink
+	# on read, this avoids constant diff being generated in the combined KCC resource.
 	git apply ../hack/terraform-overrides/combined_resources.patch
 	# Add a combined logging log sink resource to the provider, in order to
 	# avoid needing to implement more generic resource merging in KCC.

third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_billing_account_sink.go

@@ -66,6 +66,10 @@ func resourceLoggingBillingAccountSinkRead(d *schema.ResourceData, meta interfac
 		return err
 	}
 
+	if err := d.Set("unique_writer_identity", false); err != nil {
+		return fmt.Errorf("Error setting unique_writer_identity: %s", err)
+	}
+
 	return nil
 }
 

third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_folder_sink.go

@@ -85,6 +85,10 @@ func resourceLoggingFolderSinkRead(d *schema.ResourceData, meta interface{}) err
 		return fmt.Errorf("Error setting include_children: %s", err)
 	}
 
+	if err := d.Set("unique_writer_identity", false); err != nil {
+		return fmt.Errorf("Error setting unique_writer_identity: %s", err)
+	}
+
 	return nil
 }
 

third_party/github.com/hashicorp/terraform-provider-google-beta/google-beta/services/logging/resource_logging_organization_sink.go

@@ -84,6 +84,10 @@ func resourceLoggingOrganizationSinkRead(d *schema.ResourceData, meta interface{
 		return fmt.Errorf("Error setting include_children: %s", err)
 	}
 
+	if err := d.Set("unique_writer_identity", false); err != nil {
+		return fmt.Errorf("Error setting unique_writer_identity: %s", err)
+	}
+
 	return nil
 }