From b91816653adb474bf2d2c60c57a5e1c2658b651c Mon Sep 17 00:00:00 2001
From: Andrew Nester <andrew.nester@databricks.com>
Date: Mon, 14 Oct 2024 11:05:16 +0200
Subject: [PATCH] fixes

---
 bundle/permissions/workspace_root.go | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bundle/permissions/workspace_root.go b/bundle/permissions/workspace_root.go
index 10e85c9b5..49cac6dd3 100644
--- a/bundle/permissions/workspace_root.go
+++ b/bundle/permissions/workspace_root.go
@@ -20,9 +20,13 @@ func ApplyWorkspaceRootPermissions() bundle.Mutator {
 // Apply implements bundle.Mutator.
 func (*workspaceRootPermissions) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
 
-	diags := checkWorkspaceRootPermissions(b)
-	if len(diags) > 0 {
-		return diags
+	if isWorkspaceSharedRoot(b.Config.Workspace.RootPath) {
+		diags := checkWorkspaceRootPermissions(b)
+		// If there are permissions warnings, return them and do not apply permissions
+		// because they are not set correctly for /Workspace/Shared root anyway
+		if len(diags) > 0 {
+			return diags
+		}
 	}
 
 	err := giveAccessForWorkspaceRoot(ctx, b)
@@ -85,14 +89,14 @@ func getWorkspaceObjectPermissionLevel(bundlePermission string) (workspace.Works
 	}
 }
 
+func isWorkspaceSharedRoot(path string) bool {
+	return strings.HasPrefix(path, "/Workspace/Shared/")
+}
+
 // checkWorkspaceRootPermissions checks that if permissions are set for the workspace root, and workspace root starts with /Workspace/Shared, then permissions should be set for group: users
 func checkWorkspaceRootPermissions(b *bundle.Bundle) diag.Diagnostics {
 	var diags diag.Diagnostics
 
-	if !strings.HasPrefix(b.Config.Workspace.RootPath, "/Workspace/Shared/") {
-		return nil
-	}
-
 	allUsers := false
 	for _, p := range b.Config.Permissions {
 		if p.GroupName == "users" && p.Level == CAN_MANAGE {