Change datastream stream merge and append_only to conflicts with

[c2thorn]

fix-forward part of hashicorp/terraform-provider-google#18890

manual confirmation:
error recreation: gpaste/6276707390849024
after fix: gpaste/5739342071070720

Release Note Template for Downstream PRs (will be copied)

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

[modular-magician]

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 3 files changed, 2 insertions(+), 4 deletions(-))
google-beta provider: Diff ( 3 files changed, 2 insertions(+), 4 deletions(-))
Open in Cloud Shell: Diff ( 1 file changed, 1 deletion(-))

[modular-magician]

Tests analytics

Total tests: 12
Passed tests: 0
Skipped tests: 8
Affected tests: 4

Click here to see the affected service packages

• datastream

Action taken

Found 4 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests

• TestAccDataSourceGoogleDatastreamStaticIps_basic
• TestAccDatastreamConnectionProfile_datastreamConnectionProfileBasicExample
• TestAccDatastreamConnectionProfile_datastreamConnectionProfileFullExample
• TestAccDatastreamPrivateConnection_datastreamPrivateConnectionFullExample

Get to know how VCR tests work

[modular-magician]

$\textcolor{red}{\textsf{Tests failed during RECORDING mode:}}$
TestAccDataSourceGoogleDatastreamStaticIps_basic[Error message] [Debug log]
TestAccDatastreamConnectionProfile_datastreamConnectionProfileBasicExample[Error message] [Debug log]
TestAccDatastreamConnectionProfile_datastreamConnectionProfileFullExample[Error message] [Debug log]
TestAccDatastreamPrivateConnection_datastreamPrivateConnectionFullExample[Error message] [Debug log]

$\textcolor{red}{\textsf{Errors occurred during RECORDING mode. Please fix them to complete your PR.}}$

View the build log or the debug log for each test

[modular-magician]

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 3 files changed, 2 insertions(+), 4 deletions(-))
google-beta provider: Diff ( 3 files changed, 2 insertions(+), 4 deletions(-))
Open in Cloud Shell: Diff ( 1 file changed, 1 deletion(-))

[modular-magician]

Tests analytics

Total tests: 12
Passed tests: 4
Skipped tests: 8
Affected tests: 0

Click here to see the affected service packages

• datastream

$\textcolor{green}{\textsf{All tests passed!}}$

View the build log

[c2thorn]

Trying to verify manually, the example I'm using takes 30 minutes

[c2thorn]

/gcbrun

[modular-magician]

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

google provider: Diff ( 3 files changed, 2 insertions(+), 4 deletions(-))
google-beta provider: Diff ( 3 files changed, 2 insertions(+), 4 deletions(-))
Open in Cloud Shell: Diff ( 1 file changed, 1 deletion(-))

[modular-magician]

Tests analytics

Total tests: 12
Passed tests: 4
Skipped tests: 8
Affected tests: 0

Click here to see the affected service packages

• datastream

$\textcolor{green}{\textsf{All tests passed!}}$

View the build log

[c2thorn]

@slevenick
I'm not sure why the tgc unit test is showing the previous failure. The VCR tests pass as well as my manual testing

[c2thorn]

https://github.com/GoogleCloudPlatform/magic-modules/actions/runs/10166055628/job/28115320223?pr=11292#step:8:12996

append_only is no longer referencing itself. Maybe it's using a cached version or something