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

)
GoogleCloudPlatform · Jul 30, 2024 · 5d82d77 · 5d82d77
1 parent 6f36319
commit 5d82d77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/mmv1/products/datastream/Stream.yaml b/mmv1/products/datastream/Stream.yaml
@@ -1139,8 +1139,7 @@ properties:
             send_empty_value: true
             allow_empty_object: true
             immutable: true
-            exactly_one_of:
-              - destination_config.0.bigquery_destination_config.0.merge
+            conflicts:
               - destination_config.0.bigquery_destination_config.0.append_only
             description: |
               Merge mode defines that all changes to a table will be merged at the destination Google BigQuery
@@ -1152,9 +1151,8 @@ properties:
             send_empty_value: true
             allow_empty_object: true
             immutable: true
-            exactly_one_of:
+            conflicts:
               - destination_config.0.bigquery_destination_config.0.merge
-              - destination_config.0.bigquery_destination_config.0.append_only
             description: |
               AppendOnly mode defines that the stream of changes (INSERT, UPDATE-INSERT, UPDATE-DELETE and DELETE
               events) to a source table will be written to the destination Google BigQuery table, retaining the

diff --git a/mmv1/templates/terraform/examples/datastream_stream_bigquery.tf.erb b/mmv1/templates/terraform/examples/datastream_stream_bigquery.tf.erb
@@ -106,7 +106,6 @@ resource "google_datastream_stream" "<%= ctx[:primary_resource_id] %>" {
                     kms_key_name = "<%= ctx[:vars]['bigquery_destination_table_kms_key_name'] %>"
                 }
             }
-            merge {}
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                         kms_key_name = "<%= ctx[:vars]['bigquery_destination_table_kms_key_name'] %>"
                     }
                 }
-                merge {}
             }
         }
@@ Expand Down @@