[datadog_cloud_configuration_rule] reverting the tags field type change and default tags support (#3010)

* Revert "[datadog_cloud_configuration_rule] Add default tag support (#2969)"

This reverts commit ca50052.

* Revert "[datadog_cloud_configuration_rule] Changed tags field type to Set (#2997)"

This reverts commit e76989f.

Author: Supam

datadog/fwprovider/framework_provider.go

@@ -223,13 +223,13 @@ func (p *FrameworkProvider) Schema(_ context.Context, _ provider.SchemaRequest,
 				Validators: []validator.List{
 					listvalidator.SizeAtMost(1),
 				},
-				Description: "[Experimental - Cloud Configuration Rules, Logs Pipelines, Monitors and Security Monitoring Rules only] Configuration block containing settings to apply default resource tags across all resources.",
+				Description: "[Experimental - Logs Pipelines, Monitors and Security Monitoring Rules only] Configuration block containing settings to apply default resource tags across all resources.",
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{
 						"tags": schema.MapAttribute{
 							ElementType: types.StringType,
 							Optional:    true,
-							Description: "[Experimental - Cloud Configuration Rules, Logs Pipelines, Monitors and Security Monitoring Rules only] Resource tags to be applied by default across all resources.",
+							Description: "[Experimental - Logs Pipelines, Monitors and Security Monitoring Rules only] Resource tags to be applied by default across all resources.",
 						},
 					},
 				},

datadog/internal/utils/utils.go

@@ -349,16 +349,6 @@ func GetStringSlice(d Resource, key string) []string {
 	return []string{}
 }
 
-// GetStringSliceFromSet returns a string slice for a given schema.Set
-func GetStringSliceFromSet(set *schema.Set) []string {
-	values := set.List()
-	stringValues := make([]string, len(values))
-	for i, value := range values {
-		stringValues[i] = value.(string)
-	}
-	return stringValues
-}
-
 // GetMultiEnvVar returns first matching env var
 func GetMultiEnvVar(envVars ...string) (string, error) {
 	for _, value := range envVars {

datadog/provider.go

@@ -159,14 +159,14 @@ func Provider() *schema.Provider {
 				Type:        schema.TypeList,
 				Optional:    true,
 				MaxItems:    1,
-				Description: "[Experimental - Cloud Configuration Rules, Logs Pipelines, Monitors and Security Monitoring Rules only] Configuration block containing settings to apply default resource tags across all resources.",
+				Description: "[Experimental - Logs Pipelines, Monitors and Security Monitoring Rules only] Configuration block containing settings to apply default resource tags across all resources.",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"tags": {
 							Type:        schema.TypeMap,
 							Optional:    true,
 							Elem:        &schema.Schema{Type: schema.TypeString},
-							Description: "[Experimental - Cloud Configuration Rules, Logs Pipelines, Monitors and Security Monitoring Rules only] Resource tags to be applied by default across all resources.",
+							Description: "[Experimental - Logs Pipelines, Monitors and Security Monitoring Rules only] Resource tags to be applied by default across all resources.",
 						},
 					},
 				},
@@ -451,7 +451,6 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
 }
 
 // custom diff function that changes plan to take default tags into account
-// This is used for when the `tags` attribute is a set
 func tagDiff(ctx context.Context, d *schema.ResourceDiff, meta interface{}) error {
 	providerConf := meta.(*ProviderConfiguration)
 	if len(providerConf.DefaultTags) == 0 {

datadog/resource_datadog_cloud_configuration_rule.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadogV2"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 
 	"github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils"
@@ -42,7 +41,6 @@ func resourceDatadogCloudConfigurationRule() *schema.Resource {
 		SchemaFunc: func() map[string]*schema.Schema {
 			return cloudConfigurationRuleSchema()
 		},
-		CustomizeDiff: customdiff.All(tagDiff),
 	}
 }
 
@@ -100,10 +98,9 @@ func cloudConfigurationRuleSchema() map[string]*schema.Schema {
 			Elem:        &schema.Schema{Type: schema.TypeString},
 		},
 		tagsField: {
-			Type:        schema.TypeSet,
+			Type:        schema.TypeList,
 			Optional:    true,
-			Computed:    true,
-			Description: "Tags of the rule, propagated to findings and signals. Defaults to empty list. **Note**: if default tags are present at the provider level, they will be added to this resource.",
+			Description: "Tags of the rule, propagated to findings and signals. Defaults to empty list.",
 			Elem:        &schema.Schema{Type: schema.TypeString},
 		},
 		filterField: {
@@ -161,7 +158,7 @@ func buildRuleCreatePayload(d *schema.ResourceData) *datadogV2.SecurityMonitorin
 	payload.SetOptions(buildRuleCreationOptions(d))
 	payload.SetComplianceSignalOptions(*buildComplianceSignalOptions(d))
 	payload.SetCases(*buildRuleCreationCases(d))
-	payload.SetTags(utils.GetStringSliceFromSet(d.Get(tagsField).(*schema.Set)))
+	payload.SetTags(utils.GetStringSlice(d, tagsField))
 	payload.SetType(datadogV2.CLOUDCONFIGURATIONRULETYPE_CLOUD_CONFIGURATION)
 	payload.SetFilters(buildFiltersFromResourceData(d))
 
@@ -222,7 +219,7 @@ func buildRuleUpdatePayload(d *schema.ResourceData) *datadogV2.SecurityMonitorin
 	payload.SetOptions(buildRuleUpdateOptions(d))
 	payload.SetComplianceSignalOptions(*buildComplianceSignalOptions(d))
 	payload.SetCases(*buildRuleUpdateCases(d))
-	payload.SetTags(utils.GetStringSliceFromSet(d.Get(tagsField).(*schema.Set)))
+	payload.SetTags(utils.GetStringSlice(d, tagsField))
 	payload.SetFilters(buildFiltersFromResourceData(d))
 	return &payload
 }

datadog/tests/cassettes/TestAccDatadogCloudConfigurationRule_Basic.freeze

@@ -1 +1 @@
-2025-05-13T10:03:28.99193+02:00
+2024-10-23T09:39:41.380247+02:00