Fixed custom destination creation failing without forward_tags_restri…

…ction_list (#2565)
DataDog · Sep 6, 2024 · 53c4c1a · 53c4c1a
1 parent 4e54cb8
commit 53c4c1a
Show file tree

Hide file tree

Showing 6 changed files with 500 additions and 350 deletions.
diff --git a/datadog/fwprovider/resource_datadog_logs_custom_destination.go b/datadog/fwprovider/resource_datadog_logs_custom_destination.go
@@ -489,29 +489,27 @@ func (r *logsCustomDestinationResource) buildLogsCustomDestinationCreateRequestB
 		attributes.SetForwarderDestination(*forwarderDestination)
 	}
 
-	if !state.Name.IsNull() {
-		attributes.SetName(state.Name.ValueString())
-	}
+	attributes.SetName(state.Name.ValueString())
 
-	if !state.Query.IsNull() {
+	if !state.Query.IsUnknown() {
 		attributes.SetQuery(state.Query.ValueString())
 	}
 
-	if !state.Enabled.IsNull() {
+	if !state.Enabled.IsUnknown() {
 		attributes.SetEnabled(state.Enabled.ValueBool())
 	}
 
-	if !state.ForwardTags.IsNull() {
+	if !state.ForwardTags.IsUnknown() {
 		attributes.SetForwardTags(state.ForwardTags.ValueBool())
 	}
 
-	if !state.ForwardTagsRestrictionList.IsNull() {
+	if !state.ForwardTagsRestrictionList.IsUnknown() {
 		var forwardTagsRestrictionList []string
 		diags.Append(state.ForwardTagsRestrictionList.ElementsAs(ctx, &forwardTagsRestrictionList, false)...)
 		attributes.SetForwardTagsRestrictionList(forwardTagsRestrictionList)
 	}
 
-	if !state.ForwardTagsRestrictionListType.IsNull() {
+	if !state.ForwardTagsRestrictionListType.IsUnknown() {
 		forwardTagsRestrictionListType, err := datadogV2.NewCustomDestinationAttributeTagsRestrictionListTypeFromValue(state.ForwardTagsRestrictionListType.ValueString())
 		if err == nil {
 			attributes.SetForwardTagsRestrictionListType(*forwardTagsRestrictionListType)
@@ -534,29 +532,27 @@ func (r *logsCustomDestinationResource) buildLogsCustomDestinationUpdateRequestB
 		attributes.SetForwarderDestination(*forwarderDestination)
 	}
 
-	if !state.Name.IsNull() {
-		attributes.SetName(state.Name.ValueString())
-	}
+	attributes.SetName(state.Name.ValueString())
 
-	if !state.Query.IsNull() {
+	if !state.Query.IsUnknown() {
 		attributes.SetQuery(state.Query.ValueString())
 	}
 
-	if !state.Enabled.IsNull() {
+	if !state.Enabled.IsUnknown() {
 		attributes.SetEnabled(state.Enabled.ValueBool())
 	}
 
-	if !state.ForwardTags.IsNull() {
+	if !state.ForwardTags.IsUnknown() {
 		attributes.SetForwardTags(state.ForwardTags.ValueBool())
 	}
 
-	if !state.ForwardTagsRestrictionList.IsNull() {
+	if !state.ForwardTagsRestrictionList.IsUnknown() {
 		var forwardTagsRestrictionList []string
 		diags.Append(state.ForwardTagsRestrictionList.ElementsAs(ctx, &forwardTagsRestrictionList, false)...)
 		attributes.SetForwardTagsRestrictionList(forwardTagsRestrictionList)
 	}
 
-	if !state.ForwardTagsRestrictionListType.IsNull() {
+	if !state.ForwardTagsRestrictionListType.IsUnknown() {
 		forwardTagsRestrictionListType, err := datadogV2.NewCustomDestinationAttributeTagsRestrictionListTypeFromValue(state.ForwardTagsRestrictionListType.ValueString())
 		if err == nil {
 			attributes.SetForwardTagsRestrictionListType(*forwardTagsRestrictionListType)

diff --git a/datadog/tests/cassettes/TestAccDatadogLogsCustomDestination_basic.freeze b/datadog/tests/cassettes/TestAccDatadogLogsCustomDestination_basic.freeze
@@ -1 +1 @@
-2024-09-04T21:44:08.351625+02:00
+2024-09-06T16:56:04.416023+02:00
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2024-09-04T21:44:08.351625+02:00
		2024-09-06T16:56:04.416023+02:00