Add Observability Organization Settings Resource by leowonderful · Pull Request #16543 · GoogleCloudPlatform/magic-modules

leowonderful · 2026-02-26T15:44:37Z

Description:

This PR introduces the google_observability_organization_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#26242

Release Note Template for Downstream PRs (will be copied)

`google_observability_organization_settings` (beta)

`google_observability_organization_settings` (beta)

…tasource

github-actions · 2026-02-26T15:45:37Z

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

@slevenick, 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:56:14Z

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

Missing doc report (experimental)

The following data sources are missing documents:

google_observability_organization_settings, expect file /website/docs/d/observability_organization_settings.html.markdown to exist.

Errors

google provider:

The diff processor failed to build. This is usually due to the downstream provider failing to compile.

modular-magician · 2026-02-26T16:00:38Z

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

Missing doc report (experimental)

The following data sources are missing documents:

google_observability_organization_settings, expect file /website/docs/d/observability_organization_settings.html.markdown to exist.

Errors

google provider:

The diff processor failed to build. This is usually due to the downstream provider failing to compile.

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

Tests analytics

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

Click here to see the affected service packages

observability

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

TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicExample

TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicGlobalExample

Get to know how VCR tests work

modular-magician · 2026-02-26T16:08:54Z

Tests analytics

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

Click here to see the affected service packages

observability

Action taken

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

TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicExample

TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicGlobalExample

TestAccObservabilityOrganizationSettings_update

Get to know how VCR tests work

modular-magician · 2026-02-26T16:09:24Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicExample [Debug log]
TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicGlobalExample [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:10:03Z

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

Missing doc report (experimental)

The following data sources are missing documents:

google_observability_organization_settings, expect file /website/docs/d/observability_organization_settings.html.markdown to exist.

modular-magician · 2026-02-26T16:13:22Z

🟢 Tests passed during RECORDING mode:
TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicExample [Debug log]
TestAccObservabilityOrganizationSettings_observabilityOrganizationSettingsBasicGlobalExample [Debug log]

🟢 No issues found for passed tests after REPLAYING rerun.

🔴 Tests failed during RECORDING mode:
TestAccObservabilityOrganizationSettings_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-26T16:18:33Z

Tests analytics

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

Click here to see the affected service packages

observability

🟢 All tests passed!

View the build log

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

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

modular-magician · 2026-02-26T16:33:28Z

Tests analytics

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

Click here to see the affected service packages

observability

🟢 All tests passed!

View the build log

modular-magician · 2026-02-26T16:40:48Z

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

modular-magician · 2026-02-26T16:49:25Z

Tests analytics

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

Click here to see the affected service packages

observability

🟢 All tests passed!

View the build log

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

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

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

Tests analytics

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

Click here to see the affected service packages

observability

🟢 All tests passed!

View the build log

mmv1/products/observability/OrganizationSettings.yaml

mmv1/templates/terraform/pre_update/observability_organization_settings.go.tmpl

slevenick · 2026-02-27T19:23:44Z

...erraform/services/observability/data_source_observability_organization_settings_test.go.tmpl

+		provider 	      = "google-beta"
+		organization 	  = "%{org_id}"
+		location 	      = "%{location}"
+		kms_key_name    = ""


"" is an odd thing to specify, should this be omitted instead?

Is it? My intent was to allow users to also unset fields as needed, we do support this on the API level by accepting empty strings for the kms_key_name and default_storage_location fields to effectively unset them.

If this is highly unusual then I could consider doing away with allowing this.

In general it's good to be able to do, but it's a bit odd in the data source test to be specifying this

OK gotcha. I need the resource because I'm trying to keep the Check step tidy by using CheckDataSourceStateMatchesResourceState instead of hardcoding attributes to check, this was just a simple way to initialize the resource in a valid way.

The other way I can initialize the resource validly is by setting default_storage_location, which I've done now. Hopefully this makes more sense?

slevenick · 2026-02-27T19:25:00Z

...y/terraform/services/observability/resource_observability_organization_settings_test.go.tmpl

+}
+
+# Add a delay to allow the service account to propagate
+resource "time_sleep" "wait_for_sa_propagation" {


Calling the read on the org settings datasource causes the SA to be created? That seems like a very weird pattern

I added this sleep because I observed lazy provisioning, i.e. if we immediately fetch the SA right after reading the datasource, it might not actually be fully propagated yet

This would cause google_kms_crypto_key_iam_member to fail, claiming the principal didn't exist

So doing the read seems to trigger backend creation of the service account, then we have to wait a bit before it can be referenced in IAM

modular-magician · 2026-02-27T21:11:09Z

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

modular-magician · 2026-02-27T21:19:41Z

Tests analytics

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

Click here to see the affected service packages

observability

🟢 All tests passed!

View the build log

leowonderful added 12 commits January 27, 2026 19:57

Add observability organization settings datasource

b0201cd

Add required wait to test

2089b9e

remove retry logic from datasource

eb66cf0

reflect beta, not ga

c9bdb19

Merge branch 'GoogleCloudPlatform:main' into organization-settings-da…

ab1e234

…tasource

Add Observability Organization Settings resource

a71fa19

reflect beta, not ga.

faee421

lock tests to beta-only

45531a4

disable autogen_async

887394b

Fix version guards, stop overriding entire create and update

b3cabc7

fix tmpl name

e5adec3

Add datasource handwritten docs

0fe1356

github-actions bot requested a review from slevenick February 26, 2026 15:45

format fix and delete unused custom code

e7c01af

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

version guard the handwritten datasource

d14a84d

fix doc naming

ad80ccf

Fix update test flakiness

bcb46f1

update docs, make pre_* cleaner, add test for empty string field case

b61bc64

slevenick reviewed Feb 27, 2026

View reviewed changes

leowonderful added 2 commits February 27, 2026 19:50

move examples before params

ddebc95

make datasource tests more robust and use update_mask

1cccc3a

github-actions bot requested a review from slevenick February 27, 2026 21:00

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

Missing doc report (experimental)

Errors

Uh oh!

modular-magician commented Feb 26, 2026

Diff report

Missing doc report (experimental)

Errors

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Action taken

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

Missing doc report (experimental)

Uh oh!

modular-magician commented Feb 26, 2026

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Uh oh!

modular-magician commented Feb 26, 2026

Diff report

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Uh oh!

modular-magician commented Feb 26, 2026

Diff report

Uh oh!

modular-magician commented Feb 26, 2026

Tests analytics

Uh oh!

modular-magician commented Feb 27, 2026

Diff report

Uh oh!

modular-magician commented Feb 27, 2026

Tests analytics

Uh oh!

Uh oh!

Uh oh!

slevenick Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

leowonderful Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

slevenick Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

leowonderful Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

slevenick Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

leowonderful Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

modular-magician commented Feb 27, 2026

Diff report

Uh oh!

modular-magician commented Feb 27, 2026

Tests analytics

Uh oh!

leowonderful Feb 27, 2026 •

edited

Loading

leowonderful Feb 27, 2026 •

edited

Loading