Skip to content

Fix setup command default issue #4172

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

Merged
MonkeyCanCode merged 2 commits into from
Apr 14, 2026
Merged

Fix setup command default issue #4172

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
cea0e37
Fix setup command default issue
MonkeyCanCode Apr 12, 2026
4e431b3
Fix accidently removal of empty default for allowed_locations
MonkeyCanCode Apr 13, 2026
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
80 changes: 49 additions & 31 deletions client/python/apache_polaris/cli/command/catalog_roles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
from dataclasses import dataclass
from typing import Dict, Optional, List
from dataclasses import dataclass, field
from typing import Dict, Optional, List, cast

from pydantic import StrictStr

Expand Down Expand Up @@ -48,53 +48,71 @@ class CatalogRolesCommand(Command):
"""

catalog_roles_subcommand: str
catalog_name: str
catalog_role_name: str
principal_role_name: str
properties: Optional[Dict[str, StrictStr]]
set_properties: Dict[str, StrictStr]
remove_properties: List[str]
catalog_name: Optional[str] = None
catalog_role_name: Optional[str] = None
principal_role_name: Optional[str] = None
properties: Optional[Dict[str, StrictStr]] = field(default_factory=dict)
set_properties: Optional[Dict[str, StrictStr]] = field(default_factory=dict)
remove_properties: Optional[List[str]] = None

def __post_init__(self) -> None:
if self.properties is None:
self.properties = {}
if self.set_properties is None:
self.set_properties = {}

def validate(self) -> None:
if not self.catalog_name:
raise Exception(
f"Missing required argument: {Argument.to_flag_name(Arguments.CATALOG)}"
)

if self.catalog_roles_subcommand in {
Subcommands.CREATE,
Subcommands.DELETE,
Subcommands.GET,
Subcommands.UPDATE,
Subcommands.GRANT,
Subcommands.REVOKE,
Subcommands.SUMMARIZE,
}:
if not self.catalog_role_name:
raise Exception(
f"Missing required argument: {Argument.to_flag_name(Arguments.CATALOG_ROLE)}"
)

if self.catalog_roles_subcommand in {Subcommands.GRANT, Subcommands.REVOKE}:
if not self.principal_role_name:
raise Exception(
f"Missing required argument: {Argument.to_flag_name(Arguments.PRINCIPAL_ROLE)}"
)

def execute(self, api: PolarisDefaultApi) -> None:
catalog_name = cast(str, self.catalog_name)
catalog_role_name = cast(str, self.catalog_role_name)

if self.catalog_roles_subcommand == Subcommands.CREATE:
request = CreateCatalogRoleRequest(
catalog_role=CatalogRole(
name=self.catalog_role_name, properties=self.properties
name=catalog_role_name, properties=self.properties
)
)
api.create_catalog_role(self.catalog_name, request)
api.create_catalog_role(catalog_name, request)
elif self.catalog_roles_subcommand == Subcommands.DELETE:
api.delete_catalog_role(self.catalog_name, self.catalog_role_name)
api.delete_catalog_role(catalog_name, catalog_role_name)
elif self.catalog_roles_subcommand == Subcommands.GET:
print(
api.get_catalog_role(
self.catalog_name, self.catalog_role_name
).to_json()
)
print(api.get_catalog_role(catalog_name, catalog_role_name).to_json())
elif self.catalog_roles_subcommand == Subcommands.LIST:
if self.principal_role_name:
for catalog_role in api.list_catalog_roles_for_principal_role(
self.principal_role_name, self.catalog_name
cast(str, self.principal_role_name), catalog_name
).roles:
print(catalog_role.to_json())
else:
for catalog_role in api.list_catalog_roles(self.catalog_name).roles:
for catalog_role in api.list_catalog_roles(catalog_name).roles:
print(catalog_role.to_json())
elif self.catalog_roles_subcommand == Subcommands.UPDATE:
catalog_role = api.get_catalog_role(
self.catalog_name, self.catalog_role_name
)
catalog_role = api.get_catalog_role(catalog_name, catalog_role_name)
new_properties = catalog_role.properties or {}

# Add or update all entries specified in set_properties
Expand All @@ -110,18 +128,18 @@ def execute(self, api: PolarisDefaultApi) -> None:
current_entity_version=catalog_role.entity_version,
properties=new_properties,
)
api.update_catalog_role(self.catalog_name, self.catalog_role_name, request)
api.update_catalog_role(catalog_name, catalog_role_name, request)
elif self.catalog_roles_subcommand == Subcommands.GRANT:
request = GrantCatalogRoleRequest(
catalog_role=CatalogRole(name=self.catalog_role_name),
catalog_role=CatalogRole(name=catalog_role_name),
properties=self.properties,
)
api.assign_catalog_role_to_principal_role(
self.principal_role_name, self.catalog_name, request
cast(str, self.principal_role_name), catalog_name, request
)
elif self.catalog_roles_subcommand == Subcommands.REVOKE:
api.revoke_catalog_role_from_principal_role(
self.principal_role_name, self.catalog_name, self.catalog_role_name
cast(str, self.principal_role_name), catalog_name, catalog_role_name
)
elif self.catalog_roles_subcommand == Subcommands.SUMMARIZE:
self._generate_summary(api)
Expand All @@ -131,16 +149,16 @@ def execute(self, api: PolarisDefaultApi) -> None:
)

def _generate_summary(self, api: PolarisDefaultApi) -> None:
catalog_name = cast(str, self.catalog_name)
catalog_role_name = cast(str, self.catalog_role_name)
grants = (
api.list_grants_for_catalog_role(
self.catalog_name, self.catalog_role_name
).grants
api.list_grants_for_catalog_role(catalog_name, catalog_role_name).grants
or []
)
print(f"Catalog Role: {self.catalog_role_name} [Catalog: {self.catalog_name}]")
print(f"Catalog Role: {catalog_role_name} [Catalog: {catalog_name}]")
print("-" * 80)
# Metadata
role = api.get_catalog_role(self.catalog_name, self.catalog_role_name)
role = api.get_catalog_role(catalog_name, catalog_role_name)
print("Metadata")
print(f" {'Created:':<30} {format_timestamp(role.create_timestamp)}")
print(f" {'Modified:':<30} {format_timestamp(role.last_update_timestamp)}")
Expand All @@ -149,7 +167,7 @@ def _generate_summary(self, api: PolarisDefaultApi) -> None:
# Assignments
principal_roles = (
api.list_assignee_principal_roles_for_catalog_role(
self.catalog_name, self.catalog_role_name
catalog_name, catalog_role_name
).roles
or []
)
Expand Down
Loading
Loading