Fix conflicts

Author: deanhuynh

docs/index.md

@@ -1,7 +1,6 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
 page_title: "segment Provider"
-subcategory: ""
 description: |-
   Use the Segment provider to manage resources in your Segment workspace https://segment.com/docs/. This provider is built on top of Segment's Public API https://segment.com/docs/api/public-api/, so you must configure the provider with the proper Public API token before you can use it.
 ---

go.mod

@@ -5,22 +5,25 @@ go 1.24.2
 require (
 	github.com/avast/retry-go/v4 v4.6.1
 	github.com/hashicorp/go-retryablehttp v0.7.8
-	github.com/hashicorp/terraform-plugin-docs v0.21.0
+	github.com/hashicorp/terraform-plugin-docs v0.23.0
 	github.com/hashicorp/terraform-plugin-framework v1.16.1
 	github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
 	github.com/hashicorp/terraform-plugin-go v0.29.0
 	github.com/hashicorp/terraform-plugin-testing v1.12.0
 	github.com/segmentio/public-api-sdk-go v0.0.0-20250113195817-34106b6e08dd
+	github.com/stretchr/testify v1.10.0
 	gotest.tools/gotestsum v1.13.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/Kunde21/markdownfmt/v3 v3.1.0 // indirect
 	github.com/bitfield/gotestdox v0.2.2 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.9.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/hashicorp/cli v1.1.7 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/yuin/goldmark v1.7.7 // indirect
 	github.com/yuin/goldmark-meta v1.1.0 // indirect
 	go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect

go.sum

@@ -27,8 +27,8 @@ github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQ
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bitfield/gotestdox v0.2.2 h1:x6RcPAbBbErKLnapz1QeAlf3ospg8efBsedU93CDsnE=
 github.com/bitfield/gotestdox v0.2.2/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY=
-github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
-github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=
+github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bufbuild/protocompile v0.14.1 h1:iA73zAf/fyljNjQKwYzUHD6AD4R8KMasmwa/FBatYVw=
 github.com/bufbuild/protocompile v0.14.1/go.mod h1:ppVdAIhbr2H8asPk6k4pY7t9zB1OU5DoEw9xY/FUi1c=
 github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
@@ -114,8 +114,8 @@ github.com/hashicorp/terraform-exec v0.23.1 h1:diK5NSSDXDKqHEOIQefBMu9ny+FhzwlwV
 github.com/hashicorp/terraform-exec v0.23.1/go.mod h1:e4ZEg9BJDRaSalGm2z8vvrPONt0XWG0/tXpmzYTf+dM=
 github.com/hashicorp/terraform-json v0.27.1 h1:zWhEracxJW6lcjt/JvximOYyc12pS/gaKSy/wzzE7nY=
 github.com/hashicorp/terraform-json v0.27.1/go.mod h1:GzPLJ1PLdUG5xL6xn1OXWIjteQRT2CNT9o/6A9mi9hE=
-github.com/hashicorp/terraform-plugin-docs v0.21.0 h1:yoyA/Y719z9WdFJAhpUkI1jRbKP/nteVNBaI3hW7iQ8=
-github.com/hashicorp/terraform-plugin-docs v0.21.0/go.mod h1:J4Wott1J2XBKZPp/NkQv7LMShJYOcrqhQ2myXBcu64s=
+github.com/hashicorp/terraform-plugin-docs v0.23.0 h1:sipnfD4/9EJBg9zekym+s1H6qmLAKJHhGWBwvN9v/hE=
+github.com/hashicorp/terraform-plugin-docs v0.23.0/go.mod h1:J4b5AtMRgJlDrwCQz+G4hKABgHY5m56PnsRmdAzBwW8=
 github.com/hashicorp/terraform-plugin-framework v1.16.1 h1:1+zwFm3MEqd/0K3YBB2v9u9DtyYHyEuhVOfeIXbteWA=
 github.com/hashicorp/terraform-plugin-framework v1.16.1/go.mod h1:0xFOxLy5lRzDTayc4dzK/FakIgBhNf/lC4499R9cV4Y=
 github.com/hashicorp/terraform-plugin-framework-jsontypes v0.2.0 h1:SJXL5FfJJm17554Kpt9jFXngdM6fXbnUnZ6iT2IeiYA=

internal/provider/destination_resource.go

@@ -615,9 +615,18 @@ func (r *destinationResource) Read(ctx context.Context, req resource.ReadRequest
 		return
 	}
 
-	// This is to satisfy terraform requirements that the returned fields must match the input ones because new settings can be generated in the response
+	// Merge settings: keep config-defined settings while ignoring backend-generated ones not in config
 	if !previousState.Settings.IsNull() && !previousState.Settings.IsUnknown() {
-		state.Settings = previousState.Settings
+		mergedSettings, err := mergeSettings(previousState.Settings, state.Settings, false)
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Unable to merge Destination settings",
+				err.Error(),
+			)
+
+			return
+		}
+		state.Settings = mergedSettings
 	}
 
 	diags = resp.State.Set(ctx, &state)

internal/provider/destination_subscription_resource.go

@@ -255,8 +255,18 @@ func (r *destinationSubscriptionResource) Read(ctx context.Context, req resource
 		return
 	}
 
+	// Merge settings: keep config-defined settings while ignoring backend-generated ones not in config
 	if !previousState.Settings.IsNull() && !previousState.Settings.IsUnknown() {
-		state.Settings = previousState.Settings
+		mergedSettings, err := mergeSettings(previousState.Settings, state.Settings, false)
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Unable to merge Destination subscription settings",
+				err.Error(),
+			)
+
+			return
+		}
+		state.Settings = mergedSettings
 	}
 
 	diags = resp.State.Set(ctx, &state)

internal/provider/insert_function_instance_resource.go

@@ -186,8 +186,18 @@ func (r *insertFunctionInstanceResource) Read(ctx context.Context, req resource.
 		return
 	}
 
+	// Merge settings: keep config-defined settings while ignoring backend-generated ones not in config
 	if !previousState.Settings.IsNull() && !previousState.Settings.IsUnknown() {
-		state.Settings = previousState.Settings
+		mergedSettings, err := mergeSettings(previousState.Settings, state.Settings, false)
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Unable to merge Insert Function instance settings",
+				err.Error(),
+			)
+
+			return
+		}
+		state.Settings = mergedSettings
 	}
 
 	// This is to satisfy terraform requirements that the input fields must match the returned ones. The input FunctionID can be prefixed with "ifnd_" and the returned one is not.

internal/provider/profiles_warehouse_resource.go

@@ -195,8 +195,18 @@ func (r *profilesWarehouseResource) Read(ctx context.Context, req resource.ReadR
 		return
 	}
 
+	// Merge settings: keep config-defined settings while ignoring backend-generated ones not in config
 	if !previousState.Settings.IsNull() && !previousState.Settings.IsUnknown() {
-		state.Settings = previousState.Settings
+		mergedSettings, err := mergeSettings(previousState.Settings, state.Settings, true)
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Unable to merge Profiles Warehouse settings",
+				err.Error(),
+			)
+
+			return
+		}
+		state.Settings = mergedSettings
 	}
 
 	diags = resp.State.Set(ctx, &state)

internal/provider/source_resource.go

@@ -415,9 +415,18 @@ func (r *sourceResource) Read(ctx context.Context, req resource.ReadRequest, res
 		return
 	}
 
-	// This is to satisfy terraform requirements that the returned fields must match the input ones because new settings can be generated in the response
+	// Merge settings: keep config-defined settings while ignoring backend-generated ones not in config
 	if !previousState.Settings.IsNull() && !previousState.Settings.IsUnknown() {
-		state.Settings = previousState.Settings
+		mergedSettings, err := mergeSettings(previousState.Settings, state.Settings, false)
+		if err != nil {
+			resp.Diagnostics.AddError(
+				"Unable to merge Source settings",
+				err.Error(),
+			)
+
+			return
+		}
+		state.Settings = mergedSettings
 	}
 
 	diags = resp.State.Set(ctx, &state)

internal/provider/utils.go

@@ -3,8 +3,13 @@ package provider
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
+	"strings"
+
+	"github.com/hashicorp/terraform-plugin-framework-jsontypes/jsontypes"
+	"github.com/segmentio/terraform-provider-segment/internal/provider/models"
 )
 
 func getError(err error, body *http.Response) string {
@@ -23,3 +28,39 @@ func getError(err error, body *http.Response) string {
 
 	return err.Error() + "\n" + formattedBody.String()
 }
+
+// mergeSettings merges config settings with remote settings, preserving only the keys defined in config.
+func mergeSettings(configSettings, remoteSettings jsontypes.Normalized, isWarehouse bool) (jsontypes.Normalized, error) {
+	var configMap map[string]interface{}
+	if diags := configSettings.Unmarshal(&configMap); diags.HasError() {
+		return jsontypes.NewNormalizedNull(), fmt.Errorf("failed to unmarshal config settings: %s", diags.Errors())
+	}
+
+	var remoteMap map[string]interface{}
+	if diags := remoteSettings.Unmarshal(&remoteMap); diags.HasError() {
+		return jsontypes.NewNormalizedNull(), fmt.Errorf("failed to unmarshal remote settings: %s", diags.Errors())
+	}
+
+	// Create merged map with only config-defined keys that exist in remote (to detect drift)
+	// Keys in config but not in remote are excluded (they don't exist or aren't supported)
+	merged := make(map[string]interface{})
+	for key := range configMap {
+		if isWarehouse && key == "password" { // Warehouses do not output password in the response
+			merged[key] = configMap[key]
+		} else if value, exists := remoteMap[key]; exists {
+			strValue, ok := value.(string)
+			if ok && strings.Contains(strValue, "•") { // If the secret is censored, do not update it
+				merged[key] = configMap[key]
+			} else {
+				merged[key] = value
+			}
+		}
+	}
+
+	result, err := models.GetSettings(merged)
+	if err != nil {
+		return jsontypes.Normalized{}, fmt.Errorf("failed to merge settings: %w", err)
+	}
+
+	return result, nil
+}