Skip to content

Spanner MR CMEK Backup Schedule Integration#14307

Merged
c2thorn merged 9 commits intoGoogleCloudPlatform:mainfrom
panerorenn9541:main
Jun 23, 2025
Merged

Spanner MR CMEK Backup Schedule Integration#14307
c2thorn merged 9 commits intoGoogleCloudPlatform:mainfrom
panerorenn9541:main

Conversation

@panerorenn9541
Copy link
Copy Markdown
Contributor

@panerorenn9541 panerorenn9541 commented Jun 18, 2025

Promote Spanner MR CMEK backup schedule support to GA:

Adds the new field kmsKeyNames to encryptionConfig to support creating a Spanner MR CMEK backup schedule.

Release Note Template for Downstream PRs (will be copied)

spanner: added `encryption_config.kms_key_name` in `google_spanner_backup_schedule`

@github-actions github-actions bot requested a review from rileykarson June 18, 2025 19:17
@github-actions
Copy link
Copy Markdown

github-actions bot commented Jun 18, 2025

Hello! I am a robot. Tests will require approval from a repository maintainer to run.

Googlers: For automatic test runs see go/terraform-auto-test-runs.

@NickElliot, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 220 insertions(+))
google-beta provider: Diff ( 4 files changed, 220 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

Breaking Change(s) Detected

The following breaking change(s) were detected within your pull request.

  • Field encryption_config.kms_key_name within resource google_spanner_backup_schedule was added to exactly one of - reference

If you believe this detection to be incorrect please raise the concern with your reviewer.
If you intend to make this change you will need to wait for a major release window.
An override-breaking-change label can be added to allow merging.

@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 220 insertions(+))
google-beta provider: Diff ( 4 files changed, 220 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

Breaking Change(s) Detected

The following breaking change(s) were detected within your pull request.

  • Field encryption_config.kms_key_name within resource google_spanner_backup_schedule was added to exactly one of - reference

If you believe this detection to be incorrect please raise the concern with your reviewer.
If you intend to make this change you will need to wait for a major release window.
An override-breaking-change label can be added to allow merging.

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 36
Skipped tests: 6
Affected tests: 5

Click here to see the affected service packages
  • spanner
#### Action taken
Found 5 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_CMEKIncrementalBackup
  • TestAccSpannerBackupSchedule_MRCMEKFullBackup
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup
  • TestAccSpannerBackupSchedule_spannerBackupScheduleDailyFullExample
  • TestAccSpannerBackupSchedule_spannerBackupScheduleDailyIncrementalExample

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🔴 Tests failed during RECORDING mode:
TestAccSpannerBackupSchedule_CMEKIncrementalBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_MRCMEKFullBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_spannerBackupScheduleDailyFullExample [Error message] [Debug log]
TestAccSpannerBackupSchedule_spannerBackupScheduleDailyIncrementalExample [Error message] [Debug log]

🔴 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
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 36
Skipped tests: 6
Affected tests: 5

Click here to see the affected service packages
  • spanner
#### Action taken
Found 5 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_CMEKIncrementalBackup
  • TestAccSpannerBackupSchedule_MRCMEKFullBackup
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup
  • TestAccSpannerBackupSchedule_spannerBackupScheduleDailyFullExample
  • TestAccSpannerBackupSchedule_spannerBackupScheduleDailyIncrementalExample

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🔴 Tests failed during RECORDING mode:
TestAccSpannerBackupSchedule_CMEKIncrementalBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_MRCMEKFullBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_spannerBackupScheduleDailyFullExample [Error message] [Debug log]
TestAccSpannerBackupSchedule_spannerBackupScheduleDailyIncrementalExample [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

Use conflicts instead of exactly_one_of. If the encryption type is not customer managed, we would not need key or keys
@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 220 insertions(+))
google-beta provider: Diff ( 4 files changed, 220 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 39
Skipped tests: 6
Affected tests: 2

Click here to see the affected service packages
  • spanner
#### Action taken
Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_MRCMEKFullBackup
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 220 insertions(+))
google-beta provider: Diff ( 4 files changed, 220 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 39
Skipped tests: 6
Affected tests: 2

Click here to see the affected service packages
  • spanner
#### Action taken
Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_MRCMEKFullBackup
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🔴 Tests failed during RECORDING mode:
TestAccSpannerBackupSchedule_MRCMEKFullBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

Use ENTERPRISE_PLUS rather than ENTERPRISE for Multi-Region
@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 220 insertions(+))
google-beta provider: Diff ( 4 files changed, 220 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 39
Skipped tests: 6
Affected tests: 2

Click here to see the affected service packages
  • spanner
#### Action taken
Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_MRCMEKFullBackup
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🔴 Tests failed during RECORDING mode:
TestAccSpannerBackupSchedule_MRCMEKFullBackup [Error message] [Debug log]
TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

Change CMEK to GMEK for incremental schedules because incremental schedules are currently not supported by CMEK. Change back once CMEK supports incremental backups
@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 212 insertions(+))
google-beta provider: Diff ( 4 files changed, 212 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 39
Skipped tests: 6
Affected tests: 2

Click here to see the affected service packages
  • spanner
#### Action taken
Found 2 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_MRCMEKFullBackup
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccSpannerBackupSchedule_MRCMEKFullBackup [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🔴 Tests failed during RECORDING mode:
TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup [Error message] [Debug log]

🔴 Errors occurred during RECORDING mode. Please fix them to complete your PR.

View the build log or the debug log for each test

Remove kms_key_names from incremental test.

When CMEK + Incremental is supported add kms_key_names and encryption_type = "CUSTOMER_MANAGED_ENCRYPTION" back to encryption config
@modular-magician
Copy link
Copy Markdown
Collaborator

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 ( 4 files changed, 207 insertions(+))
google-beta provider: Diff ( 4 files changed, 207 insertions(+))
terraform-google-conversion: Diff ( 1 file changed, 11 insertions(+))

@modular-magician
Copy link
Copy Markdown
Collaborator

Tests analytics

Total tests: 47
Passed tests: 40
Skipped tests: 6
Affected tests: 1

Click here to see the affected service packages
  • spanner
#### Action taken
Found 1 affected test(s) by replaying old test recordings. Starting RECORDING based on the most recent commit. Click here to see the affected tests
  • TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup

Get to know how VCR tests work

@modular-magician
Copy link
Copy Markdown
Collaborator

🟢 Tests passed during RECORDING mode:
TestAccSpannerBackupSchedule_MRCMEKIncrementalBackup [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.


🟢 All tests passed!

View the build log or the debug log for each test

@github-actions
Copy link
Copy Markdown

@rileykarson This PR has been waiting for review for 3 weekdays. Please take a look! Use the label disable-review-reminders to disable these notifications.

@c2thorn
Copy link
Copy Markdown
Member

c2thorn commented Jun 23, 2025

@modular-magician reassign-reviewer

@github-actions github-actions bot requested review from NickElliot and removed request for rileykarson June 23, 2025 19:19
Copy link
Copy Markdown
Member

@c2thorn c2thorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

basically already reviewed it, LGTM

@c2thorn c2thorn added this pull request to the merge queue Jun 23, 2025
Merged via the queue into GoogleCloudPlatform:main with commit 6272df3 Jun 23, 2025
28 checks passed
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jun 25, 2025
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jun 25, 2025
jingqizz pushed a commit to jingqizz/magic-modules that referenced this pull request Jul 9, 2025
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
BBBmau pushed a commit to BBBmau/magic-modules that referenced this pull request Jul 28, 2025
NandiniAgrawal15 pushed a commit to NandiniAgrawal15/magic-modules that referenced this pull request Sep 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants