more fixes for tests

Author: alexott

internal/providers/pluginfw/products/permissions/resource_permission.go

@@ -565,10 +565,24 @@ func (r *PermissionResource) ImportState(ctx context.Context, req resource.Impor
 	configuredValue := permID
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root(mapping.GetField()), types.StringValue(configuredValue))...)
 
-	// Set principal fields
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_name"), types.StringValue(userName))...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("group_name"), types.StringValue(groupName))...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("service_principal_name"), types.StringValue(servicePrincipalName))...)
+	// Set principal fields - use null for empty strings to avoid ImportStateVerify failures
+	if userName != "" {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_name"), types.StringValue(userName))...)
+	} else {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("user_name"), types.StringNull())...)
+	}
+
+	if groupName != "" {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("group_name"), types.StringValue(groupName))...)
+	} else {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("group_name"), types.StringNull())...)
+	}
+
+	if servicePrincipalName != "" {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("service_principal_name"), types.StringValue(servicePrincipalName))...)
+	} else {
+		resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("service_principal_name"), types.StringNull())...)
+	}
 
 	// Set permission level
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("permission_level"), types.StringValue(permissionLevel))...)

permissions/resource_permission_acc_test.go

@@ -175,15 +175,15 @@ func TestAccPermission_Authorization_Tokens(t *testing.T) {
 	acceptance.LoadDebugEnvIfRunsFromIDE(t, "workspace")
 	template := `
 resource "databricks_group" "team_a" {
-	display_name = "permission-team-a-{var.RANDOM}"
+	display_name = "permission-team-a-{var.STICKY_RANDOM}"
 }
 
 resource "databricks_group" "team_b" {
-	display_name = "permission-team-b-{var.RANDOM}"
+	display_name = "permission-team-b-{var.STICKY_RANDOM}"
 }
 
 resource "databricks_group" "team_c" {
-	display_name = "permission-team-c-{var.RANDOM}"
+	display_name = "permission-team-c-{var.STICKY_RANDOM}"
 }
 
 # This demonstrates the key benefit: each team's token permissions
@@ -245,15 +245,15 @@ resource "databricks_permission" "tokens_team_c" {
 		// Update one permission independently - remove team_b
 		Template: `
 resource "databricks_group" "team_a" {
-	display_name = "permission-team-a-{var.RANDOM}"
+	display_name = "permission-team-a-{var.STICKY_RANDOM}"
 }
 
 resource "databricks_group" "team_b" {
-	display_name = "permission-team-b-{var.RANDOM}"
+	display_name = "permission-team-b-{var.STICKY_RANDOM}"
 }
 
 resource "databricks_group" "team_c" {
-	display_name = "permission-team-c-{var.RANDOM}"
+	display_name = "permission-team-c-{var.STICKY_RANDOM}"
 }
 
 resource "databricks_permission" "tokens_team_a" {