fix bugs

Author: QuentinGuillard

datadog/fwprovider/data_source_datadog_csm_threats_multi_policy_agent_rules.go

@@ -97,41 +97,13 @@ func (r *csmThreatsMultiPolicyAgentRulesDataSource) Read(ctx context.Context, re
 		agentRuleModel.Description = types.StringValue(attributes.GetDescription())
 		agentRuleModel.Enabled = types.BoolValue(attributes.GetEnabled())
 		agentRuleModel.Expression = types.StringValue(*attributes.Expression)
-
-		// Handle product tags if they exist
-		if attributes.ProductTags != nil && len(attributes.GetProductTags()) > 0 {
-			// Remove duplicates from product tags
-			uniqueTags := make(map[string]struct{})
-			for _, tag := range attributes.GetProductTags() {
-				uniqueTags[tag] = struct{}{}
-			}
-			uniqueTagsSlice := make([]string, 0, len(uniqueTags))
-			for tag := range uniqueTags {
-				uniqueTagsSlice = append(uniqueTagsSlice, tag)
-			}
-
-			productTags, diags := types.SetValueFrom(ctx, types.StringType, uniqueTagsSlice)
-			if diags.HasError() {
-				response.Diagnostics.Append(diags...)
-				continue
-			}
-			agentRuleModel.ProductTags = productTags
-		} else {
-			// Create an empty set if no product tags
-			emptySet, diags := types.SetValueFrom(ctx, types.StringType, []string{})
-			if diags.HasError() {
-				response.Diagnostics.Append(diags...)
-				continue
-			}
-			agentRuleModel.ProductTags = emptySet
-		}
-
+		agentRuleModel.ProductTags, _ = types.SetValueFrom(ctx, types.StringType, attributes.GetProductTags())
 		agentRuleIds[idx] = agentRule.GetId()
 		agentRules[idx] = agentRuleModel
 	}
 
 	stateId := strings.Join(agentRuleIds, "--")
-	state.Id = types.StringValue(computeDataSourceID(&stateId))
+	state.Id = types.StringValue(computeMultiPolicyAgentRulesID(&stateId))
 	tfAgentRuleIds, diags := types.ListValueFrom(ctx, types.StringType, agentRuleIds)
 	response.Diagnostics.Append(diags...)
 	state.AgentRulesIds = tfAgentRuleIds
@@ -140,6 +112,19 @@ func (r *csmThreatsMultiPolicyAgentRulesDataSource) Read(ctx context.Context, re
 	response.Diagnostics.Append(response.State.Set(ctx, &state)...)
 }
 
+func computeMultiPolicyAgentRulesID(ids *string) string {
+	// Key for hashing
+	var b strings.Builder
+	if ids != nil {
+		b.WriteString(*ids)
+	}
+	keyStr := b.String()
+	h := sha256.New()
+	h.Write([]byte(keyStr))
+
+	return fmt.Sprintf("%x", h.Sum(nil))
+}
+
 func (*csmThreatsMultiPolicyAgentRulesDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, response *datasource.SchemaResponse) {
 	response.Schema = schema.Schema{
 		Description: "Use this data source to retrieve information about existing Agent rules.",
@@ -173,16 +158,3 @@ func (*csmThreatsMultiPolicyAgentRulesDataSource) Schema(_ context.Context, _ da
 		},
 	}
 }
-
-func computeDataSourceID(ids *string) string {
-	// Key for hashing
-	var b strings.Builder
-	if ids != nil {
-		b.WriteString(*ids)
-	}
-	keyStr := b.String()
-	h := sha256.New()
-	h.Write([]byte(keyStr))
-
-	return fmt.Sprintf("%x", h.Sum(nil))
-}

datadog/fwprovider/data_source_datadog_csm_threats_policy.go

@@ -72,7 +72,7 @@ func (r *csmThreatsPoliciesDataSource) Read(ctx context.Context, request datasou
 	}
 
 	stateId := strings.Join(policyIds, "--")
-	state.Id = types.StringValue(computeDataSourceID(&stateId))
+	state.Id = types.StringValue(computeMultiPolicyAgentRulesID(&stateId))
 	tfAgentRuleIds, diags := types.ListValueFrom(ctx, types.StringType, policyIds)
 	response.Diagnostics.Append(diags...)
 	state.PolicyIds = tfAgentRuleIds

datadog/fwprovider/resource_datadog_csm_threats_multi_policies.go

@@ -3,6 +3,7 @@ package fwprovider
 import (
 	"context"
 	"fmt"
+	"sync"
 
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadogV2"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
@@ -15,8 +16,9 @@ import (
 )
 
 var (
-	_ resource.ResourceWithConfigure   = &csmThreatsPoliciesListResource{}
-	_ resource.ResourceWithImportState = &csmThreatsPoliciesListResource{}
+	csmThreatsMutex sync.Mutex
+	_               resource.ResourceWithConfigure   = &csmThreatsPoliciesListResource{}
+	_               resource.ResourceWithImportState = &csmThreatsPoliciesListResource{}
 )
 
 type csmThreatsPoliciesListResource struct {

datadog/fwprovider/resource_datadog_csm_threats_multi_policy_agent_rule.go

@@ -3,7 +3,6 @@ package fwprovider
 import (
 	"context"
 	"strings"
-	"sync"
 
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadogV2"
 	"github.com/hashicorp/terraform-plugin-framework/path"
@@ -17,9 +16,8 @@ import (
 )
 
 var (
-	csmThreatsMutex sync.Mutex
-	_               resource.ResourceWithConfigure   = &csmThreatsMultiPolicyAgentRuleResource{}
-	_               resource.ResourceWithImportState = &csmThreatsMultiPolicyAgentRuleResource{}
+	_ resource.ResourceWithConfigure   = &csmThreatsMultiPolicyAgentRuleResource{}
+	_ resource.ResourceWithImportState = &csmThreatsMultiPolicyAgentRuleResource{}
 )
 
 type csmThreatsMultiPolicyAgentRuleResource struct {
@@ -110,9 +108,6 @@ func (r *csmThreatsMultiPolicyAgentRuleResource) Create(ctx context.Context, req
 		return
 	}
 
-	csmThreatsMutex.Lock()
-	defer csmThreatsMutex.Unlock()
-
 	agentRulePayload, err := r.buildCreateCSMThreatsAgentRulePayload(&state)
 	if err != nil {
 		response.Diagnostics.AddError("error while parsing resource", err.Error())
@@ -166,9 +161,6 @@ func (r *csmThreatsMultiPolicyAgentRuleResource) Update(ctx context.Context, req
 		return
 	}
 
-	csmThreatsMutex.Lock()
-	defer csmThreatsMutex.Unlock()
-
 	agentRulePayload, err := r.buildUpdateCSMThreatsAgentRulePayload(&state)
 	if err != nil {
 		response.Diagnostics.AddError("error while parsing resource", err.Error())
@@ -195,9 +187,6 @@ func (r *csmThreatsMultiPolicyAgentRuleResource) Delete(ctx context.Context, req
 		return
 	}
 
-	csmThreatsMutex.Lock()
-	defer csmThreatsMutex.Unlock()
-
 	id := state.Id.ValueString()
 	policyId := state.PolicyId.ValueString()
 	httpResp, err := r.api.DeleteCSMThreatsAgentRule(r.auth, id, *datadogV2.NewDeleteCSMThreatsAgentRuleOptionalParameters().WithPolicyId(policyId))

go.mod

@@ -102,4 +102,3 @@ require (
 )
 
 go 1.23.0
-replace github.com/DataDog/datadog-api-client-go/v2 v2.35.0 => ../datadog-api-spec/generated/datadog-api-client-go