Merge branch 'main' into fix/deleting-wait

Author: varundeepsaini

.codegen/_openapi_sha

@@ -1 +1 @@
-59c4c0f3d5f0ef00cd5350b5674e941a7606d91a
+8b2cd47cbac64b32e120601110a5fc70b8189ba4

.gitattributes

@@ -34,6 +34,8 @@ docs/data-sources/external_metadata.md linguist-generated=true
 docs/data-sources/external_metadatas.md linguist-generated=true
 docs/data-sources/feature_engineering_feature.md linguist-generated=true
 docs/data-sources/feature_engineering_features.md linguist-generated=true
+docs/data-sources/feature_engineering_kafka_config.md linguist-generated=true
+docs/data-sources/feature_engineering_kafka_configs.md linguist-generated=true
 docs/data-sources/feature_engineering_materialized_feature.md linguist-generated=true
 docs/data-sources/feature_engineering_materialized_features.md linguist-generated=true
 docs/data-sources/materialized_features_feature_tag.md linguist-generated=true
@@ -49,6 +51,8 @@ docs/data-sources/service_principal_federation_policies.md linguist-generated=tr
 docs/data-sources/service_principal_federation_policy.md linguist-generated=true
 docs/data-sources/tag_policies.md linguist-generated=true
 docs/data-sources/tag_policy.md linguist-generated=true
+docs/data-sources/workspace_entity_tag_assignment.md linguist-generated=true
+docs/data-sources/workspace_entity_tag_assignments.md linguist-generated=true
 docs/data-sources/workspace_network_option.md linguist-generated=true
 docs/data-sources/workspace_setting_v2.md linguist-generated=true
 docs/resources/account_federation_policy.md linguist-generated=true
@@ -65,6 +69,7 @@ docs/resources/database_synced_database_table.md linguist-generated=true
 docs/resources/entity_tag_assignment.md linguist-generated=true
 docs/resources/external_metadata.md linguist-generated=true
 docs/resources/feature_engineering_feature.md linguist-generated=true
+docs/resources/feature_engineering_kafka_config.md linguist-generated=true
 docs/resources/feature_engineering_materialized_feature.md linguist-generated=true
 docs/resources/materialized_features_feature_tag.md linguist-generated=true
 docs/resources/online_store.md linguist-generated=true
@@ -73,6 +78,7 @@ docs/resources/quality_monitor_v2.md linguist-generated=true
 docs/resources/rfa_access_request_destinations.md linguist-generated=true
 docs/resources/service_principal_federation_policy.md linguist-generated=true
 docs/resources/tag_policy.md linguist-generated=true
+docs/resources/workspace_entity_tag_assignment.md linguist-generated=true
 docs/resources/workspace_network_option.md linguist-generated=true
 docs/resources/workspace_setting_v2.md linguist-generated=true
 internal/providers/common/common.go linguist-generated=true
@@ -127,6 +133,9 @@ internal/providers/pluginfw/products/external_metadata/resource_external_metadat
 internal/providers/pluginfw/products/feature_engineering_feature/data_feature_engineering_feature.go linguist-generated=true
 internal/providers/pluginfw/products/feature_engineering_feature/data_feature_engineering_features.go linguist-generated=true
 internal/providers/pluginfw/products/feature_engineering_feature/resource_feature_engineering_feature.go linguist-generated=true
+internal/providers/pluginfw/products/feature_engineering_kafka_config/data_feature_engineering_kafka_config.go linguist-generated=true
+internal/providers/pluginfw/products/feature_engineering_kafka_config/data_feature_engineering_kafka_configs.go linguist-generated=true
+internal/providers/pluginfw/products/feature_engineering_kafka_config/resource_feature_engineering_kafka_config.go linguist-generated=true
 internal/providers/pluginfw/products/feature_engineering_materialized_feature/data_feature_engineering_materialized_feature.go linguist-generated=true
 internal/providers/pluginfw/products/feature_engineering_materialized_feature/data_feature_engineering_materialized_features.go linguist-generated=true
 internal/providers/pluginfw/products/feature_engineering_materialized_feature/resource_feature_engineering_materialized_feature.go linguist-generated=true
@@ -150,6 +159,9 @@ internal/providers/pluginfw/products/service_principal_federation_policy/resourc
 internal/providers/pluginfw/products/tag_policy/data_tag_policies.go linguist-generated=true
 internal/providers/pluginfw/products/tag_policy/data_tag_policy.go linguist-generated=true
 internal/providers/pluginfw/products/tag_policy/resource_tag_policy.go linguist-generated=true
+internal/providers/pluginfw/products/workspace_entity_tag_assignment/data_workspace_entity_tag_assignment.go linguist-generated=true
+internal/providers/pluginfw/products/workspace_entity_tag_assignment/data_workspace_entity_tag_assignments.go linguist-generated=true
+internal/providers/pluginfw/products/workspace_entity_tag_assignment/resource_workspace_entity_tag_assignment.go linguist-generated=true
 internal/providers/pluginfw/products/workspace_network_option/data_workspace_network_option.go linguist-generated=true
 internal/providers/pluginfw/products/workspace_network_option/resource_workspace_network_option.go linguist-generated=true
 internal/providers/pluginfw/products/workspace_setting_v2/data_workspace_setting_v2.go linguist-generated=true

.github/workflows/integration-tests.yml

@@ -20,14 +20,14 @@ jobs:
     outputs:
       has_token: ${{ steps.set-token-status.outputs.has_token }}
     steps:
-      - name: Check if DECO_WORKFLOW_TRIGGER_APP_ID is set
+      - name: Check if required secrets are set
         id: set-token-status
         run: |
-            if [ -z "${{ secrets.DECO_WORKFLOW_TRIGGER_APP_ID }}" ]; then
-              echo "DECO_WORKFLOW_TRIGGER_APP_ID is empty. User has no access to secrets."
+            if [ -z "${{ secrets.DECO_WORKFLOW_TRIGGER_APP_ID }}" ] || [ -z "${{ secrets.DECO_TEST_APPROVAL_APP_ID }}" ]; then
+              echo "Required secrets are missing. User has no access to secrets."
               echo "::set-output name=has_token::false"
             else
-              echo "DECO_WORKFLOW_TRIGGER_APP_ID is set. User has access to secrets."
+              echo "All required secrets are set. User has access to secrets."
               echo "::set-output name=has_token::true"
             fi
 
@@ -45,7 +45,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Generate GitHub App Token
+    - name: Generate GitHub App Token for Workflow Trigger
       id: generate-token
       uses: actions/create-github-app-token@v1
       with:
@@ -79,14 +79,24 @@ jobs:
       group: databricks-deco-testing-runner-group
       labels: ubuntu-latest-deco
 
+    permissions:
+      checks: write
+      contents: read
+
     steps:
-      - name: Mark Check
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-            gh api -X POST -H "Accept: application/vnd.github+json" \
-              -H "X-GitHub-Api-Version: 2022-11-28" \
-              /repos/${{ github.repository }}/statuses/${{ github.sha }} \
-              -f 'state=success' \
-              -f 'context=Integration Tests Check'
+      - name: Auto-approve Check for Merge Queue
+        uses: actions/github-script@v7
+        with:
+          script: |
+            await github.rest.checks.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: 'Integration Tests',
+              head_sha: context.sha,
+              status: 'completed',
+              conclusion: 'success',
+              output: {
+                title: 'Integration Tests',
+                summary: 'Auto-approved for merge queue (tests already passed on PR)'
+              }
+            });

.release_metadata.json

@@ -1,3 +1,3 @@
 {
-    "timestamp": "2025-11-06 13:49:08+0000"
+    "timestamp": "2025-12-04 11:46:28+0000"
 }

CHANGELOG.md

@@ -1,5 +1,55 @@
 # Version changelog
 
+## Release v1.99.0 (2025-12-04)
+
+### New Features and Improvements
+* Added `databricks_workspace_entity_tag_assignment` resource and data source ([#5252](https://github.com/databricks/terraform-provider-databricks/pull/5252))
+
+### Internal Changes
+* Update Go SDK to v0.93.0 ([#5252](https://github.com/databricks/terraform-provider-databricks/pull/5252))
+* Bump github.com/hashicorp/terraform-plugin-testing from 1.13.3 to 1.14.0 ([#5254](https://github.com/databricks/terraform-provider-databricks/pull/5254))
+* Bump google.golang.org/api from 0.256.0 to 0.257.0 ([#5253](https://github.com/databricks/terraform-provider-databricks/pull/5253))
+
+
+## Release v1.98.0 (2025-12-03)
+
+### New Features and Improvements
+
+* Relaxed `force_new` constraint on `catalog` attribute in `databricks_pipeline` resource to allow changing the default catalog for existing pipelines ([#5180](https://github.com/databricks/terraform-provider-databricks/issues/5180)).
+* Add `databricks_users` data source ([#4028](https://github.com/databricks/terraform-provider-databricks/pull/4028))
+* Improve `databricks_service_principals` data source ([#5164](https://github.com/databricks/terraform-provider-databricks/pull/5164))
+* Add `feature_engineering_kafka_config` resource and data source ([#5240](https://github.com/databricks/terraform-provider-databricks/pull/5240))
+
+### Bug Fixes
+
+* Fix spurious plan diffs in `databricks_model_serving` and `databricks_model_serving_provisioned_throughput` resources due to tag reordering ([#5120](https://github.com/databricks/terraform-provider-databricks/pull/5120))
+* Move Spark Version selector defaults to Terraform ([#5219](https://github.com/databricks/terraform-provider-databricks/pull/5219)).
+
+### Documentation
+
+* Document tag policies in `databricks_access_control_rule_set` ([#5209](https://github.com/databricks/terraform-provider-databricks/pull/5209)).
+* Document missing `aws_attributes.ebs_*` properties in `databricks_cluster` ([#5196](https://github.com/databricks/terraform-provider-databricks/pull/5196)).
+* Document support for serverless workspaces on GCP ([#5124](https://github.com/databricks/terraform-provider-databricks/pull/5124))
+* Document data object types for share resource ([#5244](https://github.com/databricks/terraform-provider-databricks/pull/5244))
+
+### Exporter
+
+* Added support for `databricks_data_quality_monitor` resource ([#5193](https://github.com/databricks/terraform-provider-databricks/pull/5193)).
+* Added support for `databricks_account_federation_policy`, `databricks_custom_app_integration`, `databricks_quality_monitor_v2`, `databricks_service_principal_federation_policy` resources ([#5237](https://github.com/databricks/terraform-provider-databricks/pull/5237)).
+* Added support for `databricks_budget_policy` resource ([#5217](https://github.com/databricks/terraform-provider-databricks/pull/5217)).
+* Fix typo in the name of environment variable ([#5158](https://github.com/databricks/terraform-provider-databricks/pull/5158)).
+* Export permission assignments on workspace level ([#5169](https://github.com/databricks/terraform-provider-databricks/pull/5169)).
+* Added support for UC Tag policies ([#5213](https://github.com/databricks/terraform-provider-databricks/pull/5213)).
+* Added support for Databricks Apps resources ([#5208](https://github.com/databricks/terraform-provider-databricks/pull/5208)).
+* Added support for Database Instance resource (aka Lakebase) ([#5212](https://github.com/databricks/terraform-provider-databricks/pull/5212)).
+* Added support for workspace and account settings v2 ([#5230](https://github.com/databricks/terraform-provider-databricks/pull/5230)).
+
+### Internal Changes
+
+* Update Go SDK to v0.92.0 ([#5240](https://github.com/databricks/terraform-provider-databricks/pull/5240))
+* Bump github.com/hashicorp/terraform-plugin-framework from 1.16.1 to 1.17.0 ([#5247](https://github.com/databricks/terraform-provider-databricks/pull/5247))
+
+
 ## Release v1.97.0 (2025-11-06)
 
 ### Bug Fixes

NEXT_CHANGELOG.md

@@ -1,25 +1,19 @@
 # NEXT CHANGELOG
 
-## Release v1.98.0
+## Release v1.100.0
 
 ### Breaking Changes
 
 ### New Features and Improvements
 
-* Add `databricks_users` data source ([#4028](https://github.com/databricks/terraform-provider-databricks/pull/4028))
-* Improve `databricks_service_principals` data source ([#5164](https://github.com/databricks/terraform-provider-databricks/pull/5164))
+* Recreate `databricks_credential` on the `name` change ([#5248](https://github.com/databricks/terraform-provider-databricks/pull/5248)).
 
 ### Bug Fixes
 
-* Fix spurious plan diffs in `databricks_model_serving` and `databricks_model_serving_provisioned_throughput` resources due to tag reordering ([#5120](https://github.com/databricks/terraform-provider-databricks/pull/5120))
+* Fix retrieving of latest DBR versions in `databricks_spark_version` ([#5255](https://github.com/databricks/terraform-provider-databricks/pull/5255))
 
 ### Documentation
 
 ### Exporter
 
-* Added support for `databricks_data_quality_monitor` resource ([#5193](https://github.com/databricks/terraform-provider-databricks/pull/5193)).
-* Fix typo in the name of environment variable ([#5158](https://github.com/databricks/terraform-provider-databricks/pull/5158)).
-* Export permission assignments on workspace level ([#5169](https://github.com/databricks/terraform-provider-databricks/pull/5169)).
-* Added support for Databricks Apps resources ([#5208](https://github.com/databricks/terraform-provider-databricks/pull/5208)).
-
 ### Internal Changes

catalog/resource_catalog.go

@@ -116,6 +116,12 @@ func ResourceCatalog() common.Resource {
 			if err != nil {
 				return err
 			}
+			var origCatalogData catalog.CatalogInfo
+			common.DataToStructPointer(d, catalogSchema, &origCatalogData)
+			if (origCatalogData.ShareName != "" || origCatalogData.ConnectionName != "" || origCatalogData.ProviderName != "") &&
+				string(origCatalogData.EnablePredictiveOptimization) == "" {
+				ci.EnablePredictiveOptimization = origCatalogData.EnablePredictiveOptimization
+			}
 			return common.StructToData(ci, catalogSchema, d)
 		},
 		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {

catalog/resource_credential.go

@@ -26,6 +26,7 @@ var credentialSchema = common.StructToSchema(catalog.CredentialInfo{},
 			common.CustomizeSchemaPath(m, computed).SetComputed()
 		}
 
+		common.CustomizeSchemaPath(m, "name").SetForceNew()
 		common.CustomizeSchemaPath(m, "databricks_gcp_service_account").SetComputed()
 		common.CustomizeSchemaPath(m, "databricks_gcp_service_account", "email").SetComputed()
 		common.CustomizeSchemaPath(m, "databricks_gcp_service_account", "credential_id").SetComputed()

catalog/resource_credential_test.go

@@ -157,3 +157,53 @@ func TestCreateIsolatedCredential(t *testing.T) {
 		"isolation_mode":             "ISOLATION_MODE_ISOLATED",
 	})
 }
+
+func TestUpdateCredentialSchemaForceNew(t *testing.T) {
+	qa.ResourceFixture{
+		MockWorkspaceClientFunc: func(w *mocks.MockWorkspaceClient) {
+			e := w.GetMockCredentialsAPI().EXPECT()
+			e.UpdateCredential(mock.Anything, catalog.UpdateCredentialRequest{
+				NameArg: "name",
+				AwsIamRole: &catalog.AwsIamRole{
+					RoleArn: "arn:aws:iam::account:role/role",
+				},
+				Comment: "comment",
+			}).Return(&catalog.CredentialInfo{
+				Id:   "1234-5678",
+				Name: "name",
+				AwsIamRole: &catalog.AwsIamRole{
+					RoleArn: "arn:aws:iam::account:role/role",
+				},
+				Comment: "comment",
+			}, nil)
+			e.GetCredentialByNameArg(mock.Anything, "name").Return(&catalog.CredentialInfo{
+				Id:      "1234-5678",
+				Name:    "name",
+				Purpose: "SERVICE",
+				AwsIamRole: &catalog.AwsIamRole{
+					RoleArn: "arn:aws:iam::account:role/role",
+				},
+				Comment: "comment",
+			}, nil)
+		},
+		RequiresNew: true,
+		Resource:    ResourceCredential(),
+		Update:      true,
+		ID:          "name",
+		InstanceState: map[string]string{
+			"name":                    "name",
+			"purpose":                 "SERVICE",
+			"aws_iam_role.#":          "1",
+			"aws_iam_role.0.role_arn": "arn:aws:iam::account:role/role",
+			"comment":                 "comment",
+		},
+		HCL: `
+		name    = "rename"
+		purpose = "SERVICE"
+		aws_iam_role {
+		    role_arn = "arn:aws:iam::account:role/role"
+		}
+		comment = "comment"
+		`,
+	}.ApplyNoError(t)
+}

clusters/data_spark_version.go

@@ -27,6 +27,9 @@ func DataSourceSparkVersion() common.Resource {
 	}, func(s map[string]*schema.Schema) map[string]*schema.Schema {
 		common.CustomizeSchemaPath(s, "photon").SetDeprecated("Specify runtime_engine=\"PHOTON\" in the cluster configuration")
 		common.CustomizeSchemaPath(s, "graviton").SetDeprecated("Not required anymore - it's automatically enabled on the Graviton-based node types")
+		common.CustomizeSchemaPath(s, "scala").SetDefault("2.1")
+		common.CustomizeSchemaPath(s, "latest").SetDefault(true)
+
 		common.NamespaceCustomizeSchemaMap(s)
 		return s
 	})