Change datastream stream merge and append_only to conflicts with (#11…

…292) (#7835) [upstream:5d82d77abdda75a8711933f9f71bee8a0ebb3f94] Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Jul 30, 2024 · 46dacd2 · 46dacd2
1 parent bfd6a99
commit 46dacd2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.changelog/11292.txt b/.changelog/11292.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+datastream: removed a breaking change in `google_datastream_stream` that made one of `destination_config.0.bigquery_destination_config.0.merge` or `destination_config.0.bigquery_destination_config.0.append_only` required
+```
diff --git a/google-beta/services/datastream/resource_datastream_stream.go b/google-beta/services/datastream/resource_datastream_stream.go
@@ -158,7 +158,7 @@ historical state of the data.`,
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{},
 										},
-										ExactlyOneOf: []string{"destination_config.0.bigquery_destination_config.0.merge", "destination_config.0.bigquery_destination_config.0.append_only"},
+										ConflictsWith: []string{"destination_config.0.bigquery_destination_config.0.merge"},
 									},
 									"data_freshness": {
 										Type:     schema.TypeString,
@@ -179,7 +179,7 @@ in the source database. With Merge mode, no historical record of the change even
 										Elem: &schema.Resource{
 											Schema: map[string]*schema.Schema{},
 										},
-										ExactlyOneOf: []string{"destination_config.0.bigquery_destination_config.0.merge", "destination_config.0.bigquery_destination_config.0.append_only"},
+										ConflictsWith: []string{"destination_config.0.bigquery_destination_config.0.append_only"},
 									},
 									"single_target_dataset": {
 										Type:        schema.TypeList,

diff --git a/google-beta/services/datastream/resource_datastream_stream_generated_test.go b/google-beta/services/datastream/resource_datastream_stream_generated_test.go
@@ -710,7 +710,6 @@ resource "google_datastream_stream" "default" {
                     kms_key_name = "%{bigquery_destination_table_kms_key_name}"
                 }
             }
-            merge {}
         }
     }
 

diff --git a/website/docs/r/datastream_stream.html.markdown b/website/docs/r/datastream_stream.html.markdown
@@ -756,7 +756,6 @@ resource "google_datastream_stream" "default" {
                     kms_key_name = "bigquery-kms-name"
                 }
             }
-            merge {}
         }
     }