Merge branch 'main' into fix/issue-4692

Author: alexott

.codegen/_openapi_sha

@@ -1 +1 @@
-e2018bb00cba203508f8afe5a6d41bd49789ba25
+59c4c0f3d5f0ef00cd5350b5674e941a7606d91a

.release_metadata.json

@@ -1,3 +1,3 @@
 {
-    "timestamp": "2025-10-30 14:12:51+0000"
+    "timestamp": "2025-11-06 13:49:08+0000"
 }

AGENTS.md

@@ -95,6 +95,45 @@ Resources are being migrated from SDKv2 to Plugin Framework. When migrating:
   - `TestMwsAcc*` - Account-level tests across all clouds
   - `TestUcAcc*` - Unity Catalog tests across all clouds
 
+### Exporter Architecture
+
+The exporter (`exporter/` directory) generates Terraform configuration (`.tf` files) and import scripts from existing Databricks resources.
+
+#### Unified HCL Code Generation
+
+The exporter uses a **unified code generation approach** for both SDKv2 and Plugin Framework resources:
+
+**Entry Point**: `unifiedDataToHcl()` in `exporter/codegen.go`
+- Works with both SDKv2 and Plugin Framework resources through abstraction layers
+- Uses `ResourceDataWrapper` and `SchemaWrapper` interfaces for unified data access
+- Extracts ~70% of common logic into shared helper functions
+
+**Architecture**:
+```
+unifiedDataToHcl()
+├── extractFieldsForGeneration() ← Shared: field iteration, omission, variable refs, skip logic
+├── generateSdkv2Field() ← SDKv2-specific: generates blocks
+├── generatePluginFrameworkField() ← Plugin Framework-specific: generates attributes
+└── generateDependsOnAttribute() ← Shared: depends_on generation
+```
+
+**Resource Definition Callbacks** (`importable` struct in `exporter/model.go`):
+- `ShouldOmitFieldUnified` - Unified callback for field omission (works with both frameworks)
+- `ShouldGenerateFieldUnified` - Unified callback for field generation (works with both frameworks)
+- `ShouldOmitField` - Legacy SDKv2-only callback (deprecated, use Unified version)
+- `ShouldGenerateField` - Legacy SDKv2-only callback (deprecated, use Unified version)
+
+**Key Differences**:
+- SDKv2 generates nested structures as **blocks**: `evaluation { ... }`
+- Plugin Framework generates nested structures as **attributes**: `evaluation = { ... }`
+
+**When Adding Exporter Support**:
+1. Define resource in `exporter/importables.go` with `PluginFramework: true` for Plugin Framework resources
+2. Implement `List` function to discover resources
+3. Implement `Import` function to emit dependencies (use `convertPluginFrameworkToGoSdk` helper for Plugin Framework)
+4. Define `Depends` relationships for cross-resource references
+5. Use unified callbacks (`ShouldOmitFieldUnified`, `ShouldGenerateFieldUnified`) for custom field logic
+
 ### Dual-Provider Resource Patterns
 
 #### Import Handling for Account/Workspace Resources

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Version changelog
 
+## Release v1.97.0 (2025-11-06)
+
+### Bug Fixes
+
+* Fixed spurious diffs in `databricks_model_serving` and `databricks_model_serving_provisioned_throughput` resources when the API returns `served_models` or `served_entities` in a different order than specified in the configuration ([#5188](https://github.com/databricks/terraform-provider-databricks/pull/5188)).
+
+### Documentation
+
+* Explain that special characters in URLs should be percent-encoded ([#5178](https://github.com/databricks/terraform-provider-databricks/pull/5178)).
+* Improve documentation about `preloaded_docker_images.basic_auth` in `databricks_cluster` and `databricks_instance_pool` ([#5154](https://github.com/databricks/terraform-provider-databricks/pull/5154)).
+
+### Exporter
+
+* Support exporting of `databricks_mws_ncc_binding` ([#5184](https://github.com/databricks/terraform-provider-databricks/pull/5184)).
+* Initial support for resources implemented with plugin framework ([#5176](https://github.com/databricks/terraform-provider-databricks/pull/5176)).
+
+### Internal Changes
+* Add client support in CustomizeDiff for SDKv2 resources and data sources ([#5171](https://github.com/databricks/terraform-provider-databricks/pull/5171)).
+
+
 ## Release v1.96.0 (2025-10-30)
 
 ### New Features and Improvements

NEXT_CHANGELOG.md

@@ -1,6 +1,6 @@
 # NEXT CHANGELOG
 
-## Release v1.97.0
+## Release v1.98.0
 
 ### Breaking Changes
 

access/resource_permission_assignment.go

@@ -148,8 +148,8 @@ func ResourcePermissionAssignment() common.Resource {
 	})
 	return common.Resource{
 		Schema: s,
-		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
-			return common.NamespaceCustomizeDiff(d)
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff, c *common.DatabricksClient) error {
+			return common.NamespaceCustomizeDiff(ctx, d, c)
 		},
 		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			c, err := c.DatabricksClientForUnifiedProvider(ctx, d)

catalog/resource_catalog.go

@@ -216,7 +216,7 @@ func ResourceCatalog() common.Resource {
 			}
 			return w.Catalogs.Delete(ctx, catalog.DeleteCatalogRequest{Force: force, Name: d.Id()})
 		},
-		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff, c *common.DatabricksClient) error {
 			// The only scenario in which we can update options is for the `authorized_paths` key. Any
 			// other changes to the options field will result in an error.
 			if d.HasChange("options") {

catalog/resource_sql_table.go

@@ -611,7 +611,7 @@ func ResourceSqlTable() common.Resource {
 	tableSchema := common.StructToSchema(SqlTableInfo{}, nil)
 	return common.Resource{
 		Schema: tableSchema,
-		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff, c *common.DatabricksClient) error {
 			if d.HasChange("column") {
 				var newTableStruct SqlTableInfo
 				common.DiffToStructPointer(d, tableSchema, &newTableStruct)

catalog/resource_table.go

@@ -78,7 +78,7 @@ func ResourceTable() common.Resource {
 		"view_definition", "comment", "properties"})
 	return common.Resource{
 		Schema: tableSchema,
-		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff, c *common.DatabricksClient) error {
 			if d.Get("table_type") != "EXTERNAL" {
 				return nil
 			}

clusters/resource_cluster.go

@@ -31,8 +31,8 @@ const (
 
 func ResourceCluster() common.Resource {
 	return common.Resource{
-		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff) error {
-			return common.NamespaceCustomizeDiff(d)
+		CustomizeDiff: func(ctx context.Context, d *schema.ResourceDiff, c *common.DatabricksClient) error {
+			return common.NamespaceCustomizeDiff(ctx, d, c)
 		},
 		Create:        resourceClusterCreate,
 		Read:          resourceClusterRead,