[datadog_integration_gcp_sts] Add Support for MetricNamesapceConfig &…

… IsResourceCollectionChangeEnabled for GCP Service Accounts (#2650) * add is_resource_change_collection_enabled * Update to include metric namespace config * add docs * update recording * update tests * record v1 test
DataDog · Nov 8, 2024 · aecf0c4 · aecf0c4
1 parent b27579d
commit aecf0c4
Show file tree

Hide file tree

Showing 14 changed files with 222 additions and 96 deletions.
diff --git a/datadog/fwprovider/resource_datadog_integration_gcp.go b/datadog/fwprovider/resource_datadog_integration_gcp.go
@@ -39,18 +39,19 @@ type integrationGcpResource struct {
 }
 
 type integrationGcpModel struct {
-	ID                             types.String `tfsdk:"id"`
-	ProjectID                      types.String `tfsdk:"project_id"`
-	PrivateKeyId                   types.String `tfsdk:"private_key_id"`
-	PrivateKey                     types.String `tfsdk:"private_key"`
-	ClientEmail                    types.String `tfsdk:"client_email"`
-	ClientId                       types.String `tfsdk:"client_id"`
-	Automute                       types.Bool   `tfsdk:"automute"`
-	HostFilters                    types.String `tfsdk:"host_filters"`
-	CloudRunRevisionFilters        types.Set    `tfsdk:"cloud_run_revision_filters"`
-	ResourceCollectionEnabled      types.Bool   `tfsdk:"resource_collection_enabled"`
-	CspmResourceCollectionEnabled  types.Bool   `tfsdk:"cspm_resource_collection_enabled"`
-	IsSecurityCommandCenterEnabled types.Bool   `tfsdk:"is_security_command_center_enabled"`
+	ID                                types.String `tfsdk:"id"`
+	ProjectID                         types.String `tfsdk:"project_id"`
+	PrivateKeyId                      types.String `tfsdk:"private_key_id"`
+	PrivateKey                        types.String `tfsdk:"private_key"`
+	ClientEmail                       types.String `tfsdk:"client_email"`
+	ClientId                          types.String `tfsdk:"client_id"`
+	Automute                          types.Bool   `tfsdk:"automute"`
+	HostFilters                       types.String `tfsdk:"host_filters"`
+	CloudRunRevisionFilters           types.Set    `tfsdk:"cloud_run_revision_filters"`
+	ResourceCollectionEnabled         types.Bool   `tfsdk:"resource_collection_enabled"`
+	CspmResourceCollectionEnabled     types.Bool   `tfsdk:"cspm_resource_collection_enabled"`
+	IsSecurityCommandCenterEnabled    types.Bool   `tfsdk:"is_security_command_center_enabled"`
+	IsResourceChangeCollectionEnabled types.Bool   `tfsdk:"is_resource_change_collection_enabled"`
 }
 
 func NewIntegrationGcpResource() resource.Resource {
@@ -69,6 +70,9 @@ func (r *integrationGcpResource) Metadata(_ context.Context, request resource.Me
 
 func (r *integrationGcpResource) Schema(_ context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) {
 	response.Schema = schema.Schema{
+		// Avoid using default values for bool settings to prevent breaking changes for existing customers.
+		// Customers who have previously modified these settings via the UI should not be impacted
+		// https://github.com/DataDog/terraform-provider-datadog/pull/2424#issuecomment-2150871460
 		Description: "This resource is deprecated—use the `datadog_integration_gcp_sts` resource instead. Provides a Datadog - Google Cloud Platform integration resource. This can be used to create and manage Datadog - Google Cloud Platform integration.",
 		Attributes: map[string]schema.Attribute{
 			"project_id": schema.StringAttribute{
@@ -141,6 +145,11 @@ func (r *integrationGcpResource) Schema(_ context.Context, _ resource.SchemaRequ
 				Computed:    true,
 				Default:     booldefault.StaticBool(false),
 			},
+			"is_resource_change_collection_enabled": schema.BoolAttribute{
+				Description: "When enabled, Datadog scans for all resource change data in your Google Cloud environment.",
+				Optional:    true,
+				Computed:    true,
+			},
 			"id": utils.ResourceIDAttribute(),
 		},
 	}
@@ -292,6 +301,7 @@ func (r *integrationGcpResource) updateState(ctx context.Context, state *integra
 	state.CspmResourceCollectionEnabled = types.BoolValue(resp.GetIsCspmEnabled())
 	state.ResourceCollectionEnabled = types.BoolValue(resp.GetResourceCollectionEnabled())
 	state.IsSecurityCommandCenterEnabled = types.BoolValue(resp.GetIsSecurityCommandCenterEnabled())
+	state.IsResourceChangeCollectionEnabled = types.BoolValue(resp.GetIsResourceChangeCollectionEnabled())
 
 	// Non-computed values
 	if clientId, ok := resp.GetClientIdOk(); ok {
@@ -366,5 +376,9 @@ func (r *integrationGcpResource) addOptionalFieldsToBody(ctx context.Context, bo
 		body.SetResourceCollectionEnabled(state.ResourceCollectionEnabled.ValueBool())
 	}
 
+	if !state.IsResourceChangeCollectionEnabled.IsUnknown() {
+		body.SetIsResourceChangeCollectionEnabled(state.IsResourceChangeCollectionEnabled.ValueBool())
+	}
+
 	return diags
 }
diff --git a/datadog/fwprovider/resource_datadog_integration_gcp_sts.go b/datadog/fwprovider/resource_datadog_integration_gcp_sts.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"sync"
 
+	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/booldefault"
 
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadogV2"
@@ -29,17 +30,24 @@ type integrationGcpStsResource struct {
 	Auth context.Context
 }
 
+type MetricNamespaceConfigModel struct {
+	ID       types.String `tfsdk:"id"`
+	Disabled types.Bool   `tfsdk:"disabled"`
+}
+
 type integrationGcpStsModel struct {
-	ID                             types.String `tfsdk:"id"`
-	AccountTags                    types.Set    `tfsdk:"account_tags"`
-	Automute                       types.Bool   `tfsdk:"automute"`
-	ClientEmail                    types.String `tfsdk:"client_email"`
-	DelegateAccountEmail           types.String `tfsdk:"delegate_account_email"`
-	HostFilters                    types.Set    `tfsdk:"host_filters"`
-	CloudRunRevisionFilters        types.Set    `tfsdk:"cloud_run_revision_filters"`
-	IsCspmEnabled                  types.Bool   `tfsdk:"is_cspm_enabled"`
-	IsSecurityCommandCenterEnabled types.Bool   `tfsdk:"is_security_command_center_enabled"`
-	ResourceCollectionEnabled      types.Bool   `tfsdk:"resource_collection_enabled"`
+	ID                                types.String                  `tfsdk:"id"`
+	AccountTags                       types.Set                     `tfsdk:"account_tags"`
+	Automute                          types.Bool                    `tfsdk:"automute"`
+	ClientEmail                       types.String                  `tfsdk:"client_email"`
+	DelegateAccountEmail              types.String                  `tfsdk:"delegate_account_email"`
+	HostFilters                       types.Set                     `tfsdk:"host_filters"`
+	CloudRunRevisionFilters           types.Set                     `tfsdk:"cloud_run_revision_filters"`
+	MetricNamespaceConfigs            []*MetricNamespaceConfigModel `tfsdk:"metric_namespace_configs"`
+	IsCspmEnabled                     types.Bool                    `tfsdk:"is_cspm_enabled"`
+	IsSecurityCommandCenterEnabled    types.Bool                    `tfsdk:"is_security_command_center_enabled"`
+	IsResourceChangeCollectionEnabled types.Bool                    `tfsdk:"is_resource_change_collection_enabled"`
+	ResourceCollectionEnabled         types.Bool                    `tfsdk:"resource_collection_enabled"`
 }
 
 func NewIntegrationGcpStsResource() resource.Resource {
@@ -58,6 +66,9 @@ func (r *integrationGcpStsResource) Metadata(_ context.Context, request resource
 
 func (r *integrationGcpStsResource) Schema(_ context.Context, _ resource.SchemaRequest, response *resource.SchemaResponse) {
 	response.Schema = schema.Schema{
+		// Avoid using default values for bool settings to prevent breaking changes for existing customers.
+		// Customers who have previously modified these settings via the UI should not be impacted
+		// https://github.com/DataDog/terraform-provider-datadog/pull/2424#issuecomment-2150871460
 		Description: "Provides a Datadog Integration GCP Sts resource. This can be used to create and manage Datadog - Google Cloud Platform integration.",
 		Attributes: map[string]schema.Attribute{
 			"account_tags": schema.SetAttribute{
@@ -94,6 +105,16 @@ func (r *integrationGcpStsResource) Schema(_ context.Context, _ resource.SchemaR
 				Description: "Tags to filter which Cloud Run revisions are imported into Datadog. Only revisions that meet specified criteria are monitored.",
 				ElementType: types.StringType,
 			},
+			"metric_namespace_configs": schema.SetAttribute{
+				Optional:    true,
+				Description: "Configuration for a GCP metric namespace.",
+				ElementType: types.ObjectType{
+					AttrTypes: map[string]attr.Type{
+						"id":       types.StringType,
+						"disabled": types.BoolType,
+					},
+				},
+			},
 			"is_cspm_enabled": schema.BoolAttribute{
 				Optional:    true,
 				Computed:    true,
@@ -105,6 +126,11 @@ func (r *integrationGcpStsResource) Schema(_ context.Context, _ resource.SchemaR
 				Computed:    true,
 				Default:     booldefault.StaticBool(false),
 			},
+			"is_resource_change_collection_enabled": schema.BoolAttribute{
+				Description: "When enabled, Datadog scans for all resource change data in your Google Cloud environment.",
+				Optional:    true,
+				Computed:    true,
+			},
 			"resource_collection_enabled": schema.BoolAttribute{
 				Description: "When enabled, Datadog scans for all resources in your GCP environment.",
 				Optional:    true,
@@ -285,12 +311,24 @@ func (r *integrationGcpStsResource) updateState(ctx context.Context, state *inte
 	if runFilters, ok := attributes.GetCloudRunRevisionFiltersOk(); ok && len(*runFilters) > 0 {
 		state.CloudRunRevisionFilters, _ = types.SetValueFrom(ctx, types.StringType, *runFilters)
 	}
+	if namespaceConfigs, ok := attributes.GetMetricNamespaceConfigsOk(); ok && len(*namespaceConfigs) > 0 {
+		state.MetricNamespaceConfigs = make([]*MetricNamespaceConfigModel, len(*namespaceConfigs))
+		for i, namespaceConfig := range *namespaceConfigs {
+			state.MetricNamespaceConfigs[i] = &MetricNamespaceConfigModel{
+				ID:       types.StringValue(namespaceConfig.GetId()),
+				Disabled: types.BoolValue(namespaceConfig.GetDisabled()),
+			}
+		}
+	}
 	if isCspmEnabled, ok := attributes.GetIsCspmEnabledOk(); ok {
 		state.IsCspmEnabled = types.BoolValue(*isCspmEnabled)
 	}
 	if isSecurityCommandCenterEnabled, ok := attributes.GetIsSecurityCommandCenterEnabledOk(); ok {
 		state.IsSecurityCommandCenterEnabled = types.BoolValue(*isSecurityCommandCenterEnabled)
 	}
+	if isResourceChangeCollectionEnabled, ok := attributes.GetIsResourceChangeCollectionEnabledOk(); ok {
+		state.IsResourceChangeCollectionEnabled = types.BoolValue(*isResourceChangeCollectionEnabled)
+	}
 	if resourceCollectionEnabled, ok := attributes.GetResourceCollectionEnabledOk(); ok {
 		state.ResourceCollectionEnabled = types.BoolValue(*resourceCollectionEnabled)
 	}
@@ -325,9 +363,23 @@ func (r *integrationGcpStsResource) buildIntegrationGcpStsRequestBody(ctx contex
 	}
 	attributes.SetCloudRunRevisionFilters(runFilters)
 
+	namespaceConfigs := make([]datadogV2.GCPMetricNamespaceConfig, 0)
+	if len(state.MetricNamespaceConfigs) > 0 {
+		for _, namespaceConfig := range state.MetricNamespaceConfigs {
+			namespaceConfigs = append(namespaceConfigs, datadogV2.GCPMetricNamespaceConfig{
+				Id:       namespaceConfig.ID.ValueStringPointer(),
+				Disabled: namespaceConfig.Disabled.ValueBoolPointer(),
+			})
+		}
+	}
+	attributes.SetMetricNamespaceConfigs(namespaceConfigs)
+
 	if !state.IsSecurityCommandCenterEnabled.IsUnknown() {
 		attributes.SetIsSecurityCommandCenterEnabled(state.IsSecurityCommandCenterEnabled.ValueBool())
 	}
+	if !state.IsResourceChangeCollectionEnabled.IsUnknown() {
+		attributes.SetIsResourceChangeCollectionEnabled(state.IsResourceChangeCollectionEnabled.ValueBool())
+	}
 	if !state.ResourceCollectionEnabled.IsUnknown() {
 		attributes.SetResourceCollectionEnabled(state.ResourceCollectionEnabled.ValueBool())
 	}

diff --git a/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.freeze b/datadog/tests/cassettes/TestAccDatadogIntegrationGCP.freeze
@@ -1 +1 @@
-2024-10-10T16:22:07.145845-04:00
+2024-11-07T14:02:19.978741-05:00
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2024-10-10T16:22:07.145845-04:00
		2024-11-07T14:02:19.978741-05:00