Change datastream stream merge and append_only to conflicts with (#11292) (#7835)

modular-magician · c2thorn · commit 46dacd2927e1 · 2024-07-30T12:10:55.000-05:00
[upstream:5d82d77abdda75a8711933f9f71bee8a0ebb3f94]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
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 {}
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+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
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,6 @@ resource "google_datastream_stream" "default" {`
`710`	`710`	`kms_key_name = "%{bigquery_destination_table_kms_key_name}"`
`711`	`711`	`}`
`712`	`712`	`}`
`713`		`- merge {}`
`714`	`713`	`}`
`715`	`714`	`}`
`716`	`715`
Original file line number	Diff line number	Diff line change
`@@ -756,7 +756,6 @@ resource "google_datastream_stream" "default" {`
`756`	`756`	`kms_key_name = "bigquery-kms-name"`
`757`	`757`	`}`
`758`	`758`	`}`
`759`		`- merge {}`
`760`	`759`	`}`
`761`	`760`	`}`
`762`	`761`