Fix lint errors

Author: deanhuynh

internal/provider/destination_resource.go

@@ -623,6 +623,7 @@ func (r *destinationResource) Read(ctx context.Context, req resource.ReadRequest
 				"Unable to merge Destination settings",
 				err.Error(),
 			)
+
 			return
 		}
 		state.Settings = mergedSettings

internal/provider/destination_subscription_resource.go

@@ -263,6 +263,7 @@ func (r *destinationSubscriptionResource) Read(ctx context.Context, req resource
 				"Unable to merge Destination subscription settings",
 				err.Error(),
 			)
+
 			return
 		}
 		state.Settings = mergedSettings

internal/provider/insert_function_instance_resource.go

@@ -194,6 +194,7 @@ func (r *insertFunctionInstanceResource) Read(ctx context.Context, req resource.
 				"Unable to merge Insert Function instance settings",
 				err.Error(),
 			)
+
 			return
 		}
 		state.Settings = mergedSettings

internal/provider/profiles_warehouse_resource.go

@@ -203,6 +203,7 @@ func (r *profilesWarehouseResource) Read(ctx context.Context, req resource.ReadR
 				"Unable to merge Profiles Warehouse settings",
 				err.Error(),
 			)
+
 			return
 		}
 		state.Settings = mergedSettings

internal/provider/source_resource.go

@@ -423,6 +423,7 @@ func (r *sourceResource) Read(ctx context.Context, req resource.ReadRequest, res
 				"Unable to merge Source settings",
 				err.Error(),
 			)
+
 			return
 		}
 		state.Settings = mergedSettings

internal/provider/utils.go

@@ -29,7 +29,7 @@ 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
+// 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() {
@@ -57,5 +57,10 @@ func mergeSettings(configSettings, remoteSettings jsontypes.Normalized, isWareho
 		}
 	}
 
-	return models.GetSettings(merged)
+	result, err := models.GetSettings(merged)
+	if err != nil {
+		return jsontypes.Normalized{}, fmt.Errorf("failed to merge settings: %s", err.Error())
+	}
+
+	return result, nil
 }

internal/provider/utils_test.go

@@ -9,7 +9,10 @@ import (
 )
 
 func TestMergeSettings(t *testing.T) {
+	t.Parallel()
+
 	t.Run("merges config-defined settings with remote values", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"key1":"configValue1","key2":"configValue2"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"key1":"remoteValue1","key2":"remoteValue2","key3":"remoteValue3"}`)
 
@@ -30,6 +33,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("excludes config keys missing in remote", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"key1":"configValue1","key2":"configValue2"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"key1":"remoteValue1"}`)
 
@@ -50,6 +54,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("ignores backend-only settings", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"apiKey":"myKey"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"apiKey":"myKey","autoGeneratedField":"autoValue","internalFlag":true}`)
 
@@ -69,6 +74,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("detects drift in config-defined settings", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"key1":"originalValue","key2":"originalValue2"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"key1":"driftedValue","key2":"originalValue2"}`)
 
@@ -86,6 +92,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("handles empty config settings", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"key1":"remoteValue1"}`)
 
@@ -102,6 +109,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("handles complex nested settings", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"nested":{"key1":"value1"},"simple":"value"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"nested":{"key1":"changedValue"},"simple":"value","extra":"ignored"}`)
 
@@ -120,6 +128,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("returns error for invalid config JSON", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`invalid json`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"key":"value"}`)
 
@@ -130,6 +139,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("returns error for invalid remote JSON", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"key":"value"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`invalid json`)
 
@@ -140,6 +150,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("preserves config password when isWarehouse is true", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"password":"secretPassword","username":"user123"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"username":"user123"}`)
 
@@ -157,6 +168,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("does not preserve password when isWarehouse is false", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"password":"secretPassword","username":"user123"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"username":"user123"}`)
 
@@ -174,6 +186,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("preserves config value when remote secret is censored", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"apiKey":"mySecretKey","publicKey":"publicValue"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"apiKey":"••••••••","publicKey":"publicValue"}`)
 
@@ -192,6 +205,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("handles multiple censored secrets", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"secret1":"value1","secret2":"value2","normal":"normalValue"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"secret1":"••••","secret2":"•••••••","normal":"normalValue"}`)
 
@@ -211,6 +225,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("handles censored secrets in warehouse mode", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"password":"dbPassword","apiKey":"myApiKey","username":"user"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"apiKey":"••••••••","username":"user"}`)
 
@@ -231,6 +246,7 @@ func TestMergeSettings(t *testing.T) {
 	})
 
 	t.Run("only treats strings with bullet character as censored", func(t *testing.T) {
+		t.Parallel()
 		configSettings := jsontypes.NewNormalizedValue(`{"key1":"configValue","key2":"configValue2"}`)
 		remoteSettings := jsontypes.NewNormalizedValue(`{"key1":"dotdotdot...","key2":"••••"}`)
 

internal/provider/warehouse_resource.go

@@ -324,6 +324,7 @@ func (r *warehouseResource) Read(ctx context.Context, req resource.ReadRequest,
 				"Unable to merge Warehouse settings",
 				err.Error(),
 			)
+
 			return
 		}
 		state.Settings = mergedSettings