Skip to content

Commit 9bd5fc5

Browse files
authored
Removed use of "Default" database (#898)
## Changes <!-- Summary of your changes that are easy to understand. Add screenshots when necessary --> ### Linked issues <!-- DOC: Link issue with a keyword: close, closes, closed, fix, fixes, fixed, resolve, resolves, resolved. See https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword --> Relates to #894 Resolves #.. ### Functionality Removed use of "default" HMS database in integration tests. ### Tests <!-- How is this tested? Please see the checklist below and also describe any other relevant tests --> - [X] manually tested - [ ] added unit tests - [ ] added integration tests - [ ] verified on staging environment (screenshot attached)
1 parent c99708c commit 9bd5fc5

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

tests/integration/hive_metastore/test_grants.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@ def test_all_grants_in_databases(sql_backend, inventory_schema, make_schema, mak
1818
group_b = make_group()
1919
schema_a = make_schema()
2020
schema_b = make_schema()
21+
schema_c = make_schema()
2122
empty_schema = make_schema()
2223
table_a = make_table(schema_name=schema_a.name)
2324
table_b = make_table(schema_name=schema_b.name)
2425
view_c = make_table(schema_name=schema_a.name, view=True, ctas="SELECT id FROM range(10)")
2526
view_d = make_table(schema_name=schema_a.name, view=True, ctas="SELECT id FROM range(10)")
26-
table_e = make_table(schema_name="default")
27+
table_e = make_table(schema_name=schema_c.name)
2728

28-
sql_backend.execute(f"GRANT USAGE ON SCHEMA default TO `{group_a.display_name}`")
29-
sql_backend.execute(f"GRANT USAGE ON SCHEMA default TO `{group_b.display_name}`")
29+
sql_backend.execute(f"GRANT USAGE ON SCHEMA {schema_c.name} TO `{group_a.display_name}`")
30+
sql_backend.execute(f"GRANT USAGE ON SCHEMA {schema_c.name} TO `{group_b.display_name}`")
3031
sql_backend.execute(f"GRANT MODIFY ON TABLE {table_e.full_name} TO `{group_b.display_name}`")
3132
sql_backend.execute(f"GRANT SELECT ON TABLE {table_a.full_name} TO `{group_a.display_name}`")
3233
sql_backend.execute(f"GRANT SELECT ON TABLE {table_b.full_name} TO `{group_b.display_name}`")
@@ -46,8 +47,8 @@ def test_all_grants_in_databases(sql_backend, inventory_schema, make_schema, mak
4647
all_grants[f"{grant.principal}.{grant.object_key}"] = grant.action_type
4748

4849
assert len(all_grants) >= 8, "must have at least three grants"
49-
assert all_grants[f"{group_a.display_name}.hive_metastore.default"] == "USAGE"
50-
assert all_grants[f"{group_b.display_name}.hive_metastore.default"] == "USAGE"
50+
assert all_grants[f"{group_a.display_name}.hive_metastore.{schema_c.name}"] == "USAGE"
51+
assert all_grants[f"{group_b.display_name}.hive_metastore.{schema_c.name}"] == "USAGE"
5152
assert all_grants[f"{group_a.display_name}.{table_a.full_name}"] == "SELECT"
5253
assert all_grants[f"{group_b.display_name}.{table_b.full_name}"] == "SELECT"
5354
assert all_grants[f"{group_b.display_name}.{schema_b.full_name}"] == "MODIFY"

tests/integration/workspace_access/test_tacl.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def test_hms2hms_owner_permissions(sql_backend, inventory_schema, make_schema, m
5353

5454
schema_a = make_schema()
5555
schema_b = make_schema()
56+
schema_c = make_schema()
5657
table_a = make_table(schema_name=schema_a.name)
5758
table_b = make_table(schema_name=schema_b.name)
5859
table_c = make_table(schema_name=schema_b.name, external=True)
@@ -61,7 +62,7 @@ def test_hms2hms_owner_permissions(sql_backend, inventory_schema, make_schema, m
6162
sql_backend.execute(f"ALTER SCHEMA {schema_a.name} OWNER TO `{first.name_in_workspace}`")
6263
sql_backend.execute(f"GRANT ALL PRIVILEGES ON SCHEMA {schema_b.name} TO `{second.name_in_workspace}`")
6364
sql_backend.execute(
64-
f"GRANT USAGE, SELECT, MODIFY, CREATE, READ_METADATA, CREATE_NAMED_FUNCTION ON SCHEMA default TO "
65+
f"GRANT USAGE, SELECT, MODIFY, CREATE, READ_METADATA, CREATE_NAMED_FUNCTION ON SCHEMA {schema_c.name} TO "
6566
f"`{third.name_in_workspace}`"
6667
)
6768
sql_backend.execute(f"GRANT SELECT ON TABLE {table_a.full_name} TO `{first.name_in_workspace}`")

0 commit comments

Comments
 (0)