address feedback

Author: katherinekim-51

datadog/fwprovider/resource_datadog_integration_gcp_sts.go

@@ -356,9 +356,8 @@ func (r *integrationGcpStsResource) updateState(ctx context.Context, state *inte
 		state.AccountTags, _ = types.SetValueFrom(ctx, types.StringType, accountTags)
 	}
 
-	mncsapi := attributes.GetMetricNamespaceConfigs()
-	mncs := make([]*MetricNamespaceConfigModel, 0, len(mncsapi))
-	for _, mnc := range mncsapi {
+	mncs := make([]*MetricNamespaceConfigModel, 0)
+	for _, mnc := range attributes.GetMetricNamespaceConfigs() {
 		mncs = append(mncs, &MetricNamespaceConfigModel{
 			ID:       types.StringValue(mnc.GetId()),
 			Disabled: types.BoolValue(mnc.GetDisabled()),
@@ -403,17 +402,16 @@ func (r *integrationGcpStsResource) buildIntegrationGcpStsRequestBody(ctx contex
 
 	attributes.SetAccountTags(tfCollectionToSlice[string](ctx, diags, state.AccountTags))
 
-	mncs := make([]datadogV2.GCPMetricNamespaceConfig, 0)
-	for _, mnc := range tfCollectionToSlice[*MetricNamespaceConfigModel](ctx, diags, state.MetricNamespaceConfigs) {
-		mncs = append(mncs, datadogV2.GCPMetricNamespaceConfig{
-			Id:       mnc.ID.ValueStringPointer(),
-			Disabled: mnc.Disabled.ValueBoolPointer(),
-		})
-	}
-
 	// only set this field if the user explicitly sets the field
 	// otherwise we want to omit it so that the API server can populate defaults when applicable
-	if !state.MetricNamespaceConfigs.IsUnknown() {
+	if cfgs := state.MetricNamespaceConfigs; !cfgs.IsUnknown() {
+		mncs := make([]datadogV2.GCPMetricNamespaceConfig, 0)
+		for _, mnc := range tfCollectionToSlice[*MetricNamespaceConfigModel](ctx, diags, cfgs) {
+			mncs = append(mncs, datadogV2.GCPMetricNamespaceConfig{
+				Id:       mnc.ID.ValueStringPointer(),
+				Disabled: mnc.Disabled.ValueBoolPointer(),
+			})
+		}
 		attributes.SetMetricNamespaceConfigs(mncs)
 	}
 

datadog/tests/cassettes/TestAccIntGcpStsMetricNamespaceConfigs.freeze

@@ -0,0 +1 @@
+2025-10-28T13:40:01.25536-04:00

datadog/tests/cassettes/TestAccIntegrationGCPMcs.yaml renamed to datadog/tests/cassettes/TestAccIntGcpStsMetricNamespaceConfigs.yaml

@@ -1 +1 @@
-2025-10-24T14:47:21.228764-04:00
+2025-10-28T13:35:36.829284-04:00

datadog/tests/cassettes/TestAccIntegrationGCPMcs.freeze

@@ -1 +1 @@
-2025-10-24T14:47:45.052034-04:00
+2025-10-28T13:35:51.289884-04:00

datadog/tests/cassettes/TestAccIntegrationGcpStsBasic.freeze

@@ -15,13 +15,12 @@ import (
 	"github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils"
 )
 
-func TestAccIntegrationGCPMcs(t *testing.T) {
+func TestAccIntGcpStsMetricNamespaceConfigs(t *testing.T) {
 	t.Parallel()
 	ctx, providers, accProviders := testAccFrameworkMuxProviders(context.Background(), t)
 	uniq := uniqueEntityName(ctx, t)
 
-	// this test the setting of mcs (metric_namespace_configs), which can be updated to have a prometheus default if the user omits the field
-	t.Run("1. user creates with the field omitted, and updates with the field omitted: both results should have the prometheus entry", func(t *testing.T) {
+	t.Run("when mrcs never specified in create and update, uses default", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			ProtoV5ProviderFactories: accProviders,
 			CheckDestroy:             testAccCheckDatadogIntegrationGcpStsDestroy(providers.frameworkProvider),
@@ -45,6 +44,7 @@ func TestAccIntegrationGCPMcs(t *testing.T) {
 					Config: fmt.Sprintf(`
 					resource "datadog_integration_gcp_sts" "foo" {
 					  client_email                          = "%s@test-project.iam.gserviceaccount.com"
+					  is_cspm_enabled                       = "true"
 					}`, uniq),
 					Check: resource.ComposeTestCheckFunc(testAccCheckDatadogIntegrationGcpStsExists(providers.frameworkProvider)),
 					ConfigStateChecks: []statecheck.StateCheck{
@@ -60,7 +60,7 @@ func TestAccIntegrationGCPMcs(t *testing.T) {
 		})
 	})
 
-	t.Run("2. user creates with the field omitted, and updates with the field NOT omitted: prometheus should be gone", func(t *testing.T) {
+	t.Run("when mrcs never specified in create, but specified on update, overwrites default", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			ProtoV5ProviderFactories: accProviders,
 			CheckDestroy:             testAccCheckDatadogIntegrationGcpStsDestroy(providers.frameworkProvider),
@@ -105,7 +105,7 @@ func TestAccIntegrationGCPMcs(t *testing.T) {
 		})
 	})
 
-	t.Run("3. user creates with the field NOT omitted, and updates with omission, previous entries should be kept", func(t *testing.T) {
+	t.Run("when mrcs specified in create, but omitted on update, initial configs kept", func(t *testing.T) {
 		resource.Test(t, resource.TestCase{
 			ProtoV5ProviderFactories: accProviders,
 			CheckDestroy:             testAccCheckDatadogIntegrationGcpStsDestroy(providers.frameworkProvider),