Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Table ACL migration logic #1149

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Fix Table ACL migration logic #1149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbca233
fix grant matching logic
nkvuong Mar 28, 2024
77af58a
Merge branch 'main' into fix/tacl_migration
nfx Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/databricks/labs/ucx/hive_metastore/table_migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,13 @@ def migrate_tables(self, *, what: What | None = None, acl_strategy: list[AclMigr
self._init_seen_tables()
tables_to_migrate = self._tm.get_tables_to_migrate(self._tc)
tasks = []
grants = []
if acl_strategy is not None:
grants_to_migrate = self._gc.snapshot()
migrated_groups = self._group.snapshot()
else:
acl_strategy = []
for table in tables_to_migrate:
grants = []
if what is not None and table.src.what != what:
continue
if AclMigrationWhat.LEGACY_TACL in acl_strategy:
Expand Down
6 changes: 6 additions & 0 deletions tests/unit/hive_metastore/test_table_migrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,14 @@ def test_migrate_acls_should_produce_proper_queries(ws, caplog):
table_migrate.migrate_tables(acl_strategy=[AclMigrationWhat.LEGACY_TACL])

assert "GRANT SELECT ON TABLE ucx_default.db1_dst.managed_dbfs TO `account group`" in backend.queries
assert "GRANT MODIFY ON TABLE ucx_default.db1_dst.managed_dbfs TO `account group`" not in backend.queries
assert "ALTER TABLE ucx_default.db1_dst.managed_dbfs OWNER TO `account group`" not in backend.queries
assert "GRANT MODIFY ON TABLE ucx_default.db1_dst.managed_mnt TO `account group`" in backend.queries
assert "GRANT SELECT ON TABLE ucx_default.db1_dst.managed_mnt TO `account group`" not in backend.queries
assert "ALTER TABLE ucx_default.db1_dst.managed_other OWNER TO `account group`" in backend.queries
assert "GRANT SELECT ON TABLE ucx_default.db1_dst.managed_other TO `account group`" not in backend.queries
assert "GRANT MODIFY ON TABLE ucx_default.db1_dst.managed_other TO `account group`" not in backend.queries
assert "GRANT SELECT ON VIEW ucx_default.db1_dst.view_dst TO `account group`" in backend.queries
assert "GRANT MODIFY ON VIEW ucx_default.db1_dst.view_dst TO `account group`" not in backend.queries

assert "Cannot identify UC grant" in caplog.text
Loading