Add Observability Folder Settings Resource by leowonderful · Pull Request #16542 · GoogleCloudPlatform/magic-modules

leowonderful · 2026-02-26T14:58:02Z

Description:

This PR introduces the google_observability_folder_settings resource to Magic Modules for the google-beta provider, part of the broader Observability Settings surface for customers to manage observability compliance configurations across the project, folder and organization structures.

Fixes hashicorp/terraform-provider-google#26239

Release Note Template for Downstream PRs (will be copied)

`google_observability_folder_settings` (beta)

`google_observability_folder_settings` (beta)

…tings resources

github-actions · 2026-02-26T14:59:04Z

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

@rileykarson, 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 · 2026-02-26T15:09:58Z

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 ( 6 files changed, 387 insertions(+))
google-beta provider: Diff ( 10 files changed, 1340 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-02-26T15:14:45Z

Tests analytics

Total tests: 7
Passed tests: 2
Skipped tests: 0
Affected tests: 5

Click here to see the affected service packages

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

Get to know how VCR tests work

modular-magician · 2026-02-26T15:22:19Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityFolderSettings_datasource [Debug log]
TestAccObservabilityFolderSettings_globalUpdate [Debug log]
TestAccObservabilityFolderSettings_observabilityFolderSettingsBasicExample [Debug log]
TestAccObservabilityFolderSettings_observabilityFolderSettingsBasicGlobalExample [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.

🔴 Tests failed during RECORDING mode:
TestAccObservabilityFolderSettings_update [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 · 2026-02-26T15:51:25Z

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 ( 6 files changed, 387 insertions(+))
google-beta provider: Diff ( 10 files changed, 1352 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-02-26T15:58:51Z

Tests analytics

Total tests: 7
Passed tests: 6
Skipped tests: 0
Affected tests: 1

Click here to see the affected service packages

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

Get to know how VCR tests work

modular-magician · 2026-02-26T16:03:36Z

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 ( 6 files changed, 387 insertions(+))
google-beta provider: Diff ( 10 files changed, 1352 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-02-26T16:05:44Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityFolderSettings_update [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

modular-magician · 2026-02-26T16:11:14Z

Tests analytics

Total tests: 7
Passed tests: 7
Skipped tests: 0
Affected tests: 0

Click here to see the affected service packages

🟢 All tests passed!

View the build log

modular-magician · 2026-02-27T16:01:27Z

Tests analytics

Total tests: 7
Passed tests: 5
Skipped tests: 0
Affected tests: 2

Click here to see the affected service packages

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

Get to know how VCR tests work

modular-magician · 2026-02-27T16:02:49Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityFolderSettings_datasource [Debug log]
TestAccObservabilityFolderSettings_update [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

modular-magician · 2026-02-27T16:08:20Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityFolderSettings_datasource [Debug log]
TestAccObservabilityFolderSettings_update [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

modular-magician · 2026-02-27T21:29:47Z

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 ( 6 files changed, 389 insertions(+))
google-beta provider: Diff ( 10 files changed, 1370 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-02-27T21:37:05Z

Tests analytics

Total tests: 7
Passed tests: 7
Skipped tests: 0
Affected tests: 0

Click here to see the affected service packages

🟢 All tests passed!

View the build log

modular-magician · 2026-03-02T18:00:24Z

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 ( 5 files changed, 284 insertions(+))
google-beta provider: Diff ( 9 files changed, 1265 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-03-02T18:10:48Z

Tests analytics

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

Click here to see the affected service packages

🟢 All tests passed!

View the build log

modular-magician · 2026-03-02T18:30:32Z

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 ( 6 files changed, 290 insertions(+), 94 deletions(-))
google-beta provider: Diff ( 10 files changed, 1291 insertions(+), 12 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-03-02T18:41:31Z

Tests analytics

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

Click here to see the affected service packages

🟢 All tests passed!

View the build log

leowonderful · 2026-03-02T19:17:35Z

@rileykarson Hi! Could you please take a look at this PR? Thank you :)

mmv1/third_party/terraform/services/observability/observability_operation.go.tmpl

rileykarson · 2026-03-02T23:53:19Z

mmv1/templates/terraform/pre_create/observability_folder_settings.go.tmpl

@@ -0,0 +1,14 @@
+var masks []string
+if !d.GetRawConfig().GetAttr("default_storage_location").IsNull() {


Checking for explicit set-ness in config will guard against nulling these values out, but will also create a permadiff because Terraform expects the values out to be null/zero if unset. Can you walk through why we want to guard on being set here vs just setting both values in a fixed update mask?

There are two reasons, the first is that we never allow users to update both resource fields (kmsKeyName and defaultStorageLocation). The second is because I want to allow setting a field to "".

Very briefly:

You can't set kmsKeyName if the Settings is in the global region.

You can't set defaultStorageLocation if the Settings is not in the global region.

You can set either one of these fields in a Settings resource, but not both. When I used the default fixed update mask the API would complain that both fields were included as update masks, this is why I needed to make a custom pre_create and pre_update in the first place.

Second, I wanted the explicit set-ness check of ...IsNull() to allow explicit clears by setting a field to the empty string "". Originally I just had this check as GetOk but this didn't work because it treated "" as being unset.

There's no pre_update in this change- just confirming, are you seeing the results you expect w/o one?

Thanks! I'll note there's no pre_update atm, but it does appear to work as intended.

mmv1/third_party/terraform/services/observability/observability_operation.go.tmpl

modular-magician · 2026-03-03T21:15:56Z

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 ( 6 files changed, 292 insertions(+), 5 deletions(-))
google-beta provider: Diff ( 11 files changed, 1279 insertions(+), 9 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-03-03T21:26:57Z

Tests analytics

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

Click here to see the affected service packages

🟢 All tests passed!

View the build log

modular-magician · 2026-03-04T13:17:55Z

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 ( 5 files changed, 284 insertions(+))
google-beta provider: Diff ( 9 files changed, 1267 insertions(+), 2 deletions(-))
terraform-google-conversion: Diff ( 1 file changed, 135 insertions(+))

modular-magician · 2026-03-04T13:29:48Z

Tests analytics

Total tests: 17
Passed tests: 12
Skipped tests: 0
Affected tests: 5

Click here to see the affected service packages

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

Get to know how VCR tests work

modular-magician · 2026-03-04T13:35:51Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityProjectSettings_datasource [Debug log]
TestAccObservabilityProjectSettings_globalUpdate [Debug log]
TestAccObservabilityProjectSettings_observabilityProjectSettingsBasicExample [Debug log]
TestAccObservabilityProjectSettings_observabilityProjectSettingsBasicGlobalExample [Debug log]
TestAccObservabilityProjectSettings_update [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

leowonderful added 17 commits January 27, 2026 19:55

Add datasource for observability folder settings

4107b3a

Add required wait to test

7e22557

remove retry logic from datasource

0011be5

Add Observability Folder Settings resource

07a0ec0

reflect beta, not ga

586ab72

Test formatting fixes

ca7f7c7

make tests beta-only

5a35816

fully make tests beta-only

768777e

stop using autogen async

23ec614

format and add version guards

309d58f

guard the entire import block

69be1ac

add docs

d76e4d7

reflect beta-only in datasource doc

eda2f96

backlink to resource

4a06d7a

just use a shared pre_create and pre_update for all observability set…

dcfb264

…tings resources

actually just use unique pre_[create, update]

2fcae96

version guard datasource and remove custom operation

33f530c

github-actions bot requested a review from rileykarson February 26, 2026 14:59

modular-magician added the service/logging label Feb 26, 2026

leowonderful added 2 commits February 26, 2026 15:37

add sleep for propagation

667e225

More descriptive fmt.Error

1cf8a27

format examples correctly, use update_mask

8d24055

Merge branch 'main' into observability-folder-settings-resource

2fd215f

Fix "too many arguments" by custom defining Wait operation

879efeb

rileykarson reviewed Mar 2, 2026

View reviewed changes

use include_project so we can get rid of the custom operation code

28596ae

github-actions bot requested a review from rileykarson March 3, 2026 19:40

also do include_project for org settings

9dfcdb7

Merge branch 'main' into observability-folder-settings-resource

1d941ed

rileykarson approved these changes Mar 4, 2026

View reviewed changes

rileykarson added this pull request to the merge queue Mar 4, 2026

Merged via the queue into GoogleCloudPlatform:main with commit d09be34 Mar 4, 2026
23 checks passed

		@@ -0,0 +1,14 @@
		var masks []string
		if !d.GetRawConfig().GetAttr("default_storage_location").IsNull() {

Conversation

leowonderful commented Feb 26, 2026

Uh oh!

github-actions bot commented Feb 26, 2026

Uh oh!

modular-magician commented Feb 26, 2026

Diff report

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Action taken

Uh oh!

modular-magician commented Feb 26, 2026

Uh oh!

modular-magician commented Feb 26, 2026

Diff report

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Action taken

Uh oh!

modular-magician commented Feb 26, 2026

Diff report

Uh oh!

modular-magician commented Feb 26, 2026

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Uh oh!

modular-magician commented Feb 27, 2026

Tests analytics

Action taken

Uh oh!

modular-magician commented Feb 27, 2026

Uh oh!

modular-magician commented Feb 27, 2026

Uh oh!

modular-magician commented Feb 27, 2026

Diff report

Uh oh!

modular-magician commented Feb 27, 2026

Tests analytics

Uh oh!

modular-magician commented Mar 2, 2026

Diff report

Uh oh!

modular-magician commented Mar 2, 2026

Tests analytics

Uh oh!

modular-magician commented Mar 2, 2026

Diff report

Uh oh!

modular-magician commented Mar 2, 2026

Tests analytics

Uh oh!

leowonderful commented Mar 2, 2026

Uh oh!

Uh oh!

rileykarson Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

leowonderful Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

rileykarson Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

rileykarson Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

modular-magician commented Mar 3, 2026

Diff report

Uh oh!

modular-magician commented Mar 3, 2026

Tests analytics

Uh oh!

modular-magician commented Mar 4, 2026

Diff report

Uh oh!