Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ client/python/poetry.lock
/pyproject.toml
client/python/.openapi-generator/
client/python/docs/
client/python/polaris/
client/python/apache_polaris/sdk/
client/python/test/
!client/python/test/test_cli_parsing.py

Expand Down
19 changes: 19 additions & 0 deletions client/python/apache_polaris/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from functools import cached_property
from typing import Optional, Dict

from cli.constants import (
from apache_polaris.cli.constants import (
CONFIG_FILE,
CLIENT_PROFILE_ENV,
CLIENT_ID_ENV,
Expand All @@ -33,8 +33,8 @@
DEFAULT_HOSTNAME,
DEFAULT_PORT
)
from cli.options.option_tree import Argument
from polaris.management import ApiClient, Configuration
from apache_polaris.cli.options.option_tree import Argument
from apache_polaris.sdk.management import ApiClient, Configuration


def _load_profiles() -> Dict[str, str]:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import argparse
from abc import ABC

from cli.constants import Commands, Arguments
from cli.options.parser import Parser
from polaris.management import PolarisDefaultApi
from apache_polaris.cli.constants import Commands, Arguments
from apache_polaris.cli.options.parser import Parser
from apache_polaris.sdk.management import PolarisDefaultApi


class Command(ABC):
Expand All @@ -44,7 +44,7 @@ def options_get(key, f=lambda x: x):

command = None
if options.command == Commands.CATALOGS:
from cli.command.catalogs import CatalogsCommand
from apache_polaris.cli.command.catalogs import CatalogsCommand

command = CatalogsCommand(
options_get(f"{Commands.CATALOGS}_subcommand"),
Expand Down Expand Up @@ -88,7 +88,7 @@ def options_get(key, f=lambda x: x):
catalog_signing_name=options_get(Arguments.CATALOG_SIGNING_NAME)
)
elif options.command == Commands.PRINCIPALS:
from cli.command.principals import PrincipalsCommand
from apache_polaris.cli.command.principals import PrincipalsCommand

command = PrincipalsCommand(
options_get(f"{Commands.PRINCIPALS}_subcommand"),
Expand All @@ -105,7 +105,7 @@ def options_get(key, f=lambda x: x):
new_client_secret=options_get(Arguments.NEW_CLIENT_SECRET),
)
elif options.command == Commands.PRINCIPAL_ROLES:
from cli.command.principal_roles import PrincipalRolesCommand
from apache_polaris.cli.command.principal_roles import PrincipalRolesCommand

command = PrincipalRolesCommand(
options_get(f"{Commands.PRINCIPAL_ROLES}_subcommand"),
Expand All @@ -120,7 +120,7 @@ def options_get(key, f=lambda x: x):
else remove_properties,
)
elif options.command == Commands.CATALOG_ROLES:
from cli.command.catalog_roles import CatalogRolesCommand
from apache_polaris.cli.command.catalog_roles import CatalogRolesCommand

command = CatalogRolesCommand(
options_get(f"{Commands.CATALOG_ROLES}_subcommand"),
Expand All @@ -134,7 +134,7 @@ def options_get(key, f=lambda x: x):
else remove_properties,
)
elif options.command == Commands.PRIVILEGES:
from cli.command.privileges import PrivilegesCommand
from apache_polaris.cli.command.privileges import PrivilegesCommand

subcommand = options_get(f"{Commands.PRIVILEGES}_subcommand")
command = PrivilegesCommand(
Expand All @@ -151,7 +151,7 @@ def options_get(key, f=lambda x: x):
cascade=options_get(Arguments.CASCADE),
)
elif options.command == Commands.NAMESPACES:
from cli.command.namespaces import NamespacesCommand
from apache_polaris.cli.command.namespaces import NamespacesCommand

subcommand = options_get(f"{Commands.NAMESPACES}_subcommand")
command = NamespacesCommand(
Expand All @@ -165,14 +165,14 @@ def options_get(key, f=lambda x: x):
properties=properties,
)
elif options.command == Commands.PROFILES:
from cli.command.profiles import ProfilesCommand
from apache_polaris.cli.command.profiles import ProfilesCommand

subcommand = options_get(f"{Commands.PROFILES}_subcommand")
command = ProfilesCommand(
subcommand, profile_name=options_get(Arguments.PROFILE)
)
elif options.command == Commands.POLICIES:
from cli.command.policies import PoliciesCommand
from apache_polaris.cli.command.policies import PoliciesCommand

subcommand = options_get(f"{Commands.POLICIES}_subcommand")
command = PoliciesCommand(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

from pydantic import StrictStr

from cli.command import Command
from cli.constants import Subcommands, Arguments
from cli.options.option_tree import Argument
from polaris.management import (
from apache_polaris.cli.command import Command
from apache_polaris.cli.constants import Subcommands, Arguments
from apache_polaris.cli.options.option_tree import Argument
from apache_polaris.sdk.management import (
PolarisDefaultApi,
CreateCatalogRoleRequest,
CatalogRole,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,27 @@
# specific language governing permissions and limitations
# under the License.
#
from dataclasses import dataclass
from typing import Dict, List

from apache_polaris.cli.command import Command
from apache_polaris.cli.constants import StorageType, CatalogType, \
CatalogConnectionType, Subcommands, Arguments, AuthenticationType, \
ServiceIdentityType
from apache_polaris.cli.options.option_tree import Argument

from dataclasses import dataclass
from pydantic import StrictStr, SecretStr
from typing import Dict, List

from cli.command import Command
from cli.constants import StorageType, CatalogType, CatalogConnectionType, Subcommands, Arguments, AuthenticationType, \
ServiceIdentityType
from cli.options.option_tree import Argument
from polaris.management import PolarisDefaultApi, CreateCatalogRequest, UpdateCatalogRequest, \
StorageConfigInfo, ExternalCatalog, AwsStorageConfigInfo, AzureStorageConfigInfo, GcpStorageConfigInfo, \
PolarisCatalog, CatalogProperties, BearerAuthenticationParameters, ImplicitAuthenticationParameters, \
OAuthClientCredentialsParameters, SigV4AuthenticationParameters, HadoopConnectionConfigInfo, \
IcebergRestConnectionConfigInfo, AwsIamServiceIdentityInfo
from apache_polaris.sdk.management import PolarisDefaultApi, \
CreateCatalogRequest, \
UpdateCatalogRequest, \
StorageConfigInfo, ExternalCatalog, AwsStorageConfigInfo, \
AzureStorageConfigInfo, GcpStorageConfigInfo, \
PolarisCatalog, CatalogProperties, BearerAuthenticationParameters, \
ImplicitAuthenticationParameters, \
OAuthClientCredentialsParameters, SigV4AuthenticationParameters, \
HadoopConnectionConfigInfo, \
IcebergRestConnectionConfigInfo, AwsIamServiceIdentityInfo


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@
#
import json
from dataclasses import dataclass
from typing import Dict, Optional, List

from pydantic import StrictStr
from typing import Dict, Optional, List

from cli.command import Command
from cli.command.utils import get_catalog_api_client
from cli.constants import Subcommands, Arguments, UNIT_SEPARATOR
from cli.options.option_tree import Argument
from polaris.catalog import IcebergCatalogAPI, CreateNamespaceRequest
from polaris.management import PolarisDefaultApi
from apache_polaris.cli.command import Command
from apache_polaris.cli.command.utils import get_catalog_api_client
from apache_polaris.cli.constants import Subcommands, Arguments, UNIT_SEPARATOR
from apache_polaris.cli.options.option_tree import Argument
from apache_polaris.sdk.catalog import IcebergCatalogAPI, CreateNamespaceRequest
from apache_polaris.sdk.management import PolarisDefaultApi


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,29 @@
# specific language governing permissions and limitations
# under the License.
#
import os

import json

import os
from dataclasses import dataclass
from typing import Optional, Dict
from cli.command import Command
from cli.command.utils import get_catalog_api_client
from cli.constants import Subcommands, Arguments, UNIT_SEPARATOR
from cli.options.option_tree import Argument
from polaris.management import PolarisDefaultApi
from polaris.catalog.api.policy_api import PolicyAPI
from polaris.catalog.models.create_policy_request import CreatePolicyRequest
from polaris.catalog.models.update_policy_request import UpdatePolicyRequest
from polaris.catalog.models.policy_attachment_target import PolicyAttachmentTarget
from polaris.catalog.models.attach_policy_request import AttachPolicyRequest
from polaris.catalog.models.detach_policy_request import DetachPolicyRequest

from apache_polaris.cli.command import Command
from apache_polaris.cli.command.utils import get_catalog_api_client
from apache_polaris.cli.constants import Subcommands, Arguments, UNIT_SEPARATOR
from apache_polaris.cli.options.option_tree import Argument
from apache_polaris.sdk.catalog.api.policy_api import PolicyAPI
from apache_polaris.sdk.catalog.models.attach_policy_request import \
AttachPolicyRequest
from apache_polaris.sdk.catalog.models.create_policy_request import \
CreatePolicyRequest
from apache_polaris.sdk.catalog.models.detach_policy_request import \
DetachPolicyRequest
from apache_polaris.sdk.catalog.models.policy_attachment_target import \
PolicyAttachmentTarget
from apache_polaris.sdk.catalog.models.update_policy_request import \
UpdatePolicyRequest
from apache_polaris.sdk.management import PolarisDefaultApi


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
# under the License.
#
from dataclasses import dataclass
from typing import Dict, Optional, List

from pydantic import StrictStr
from typing import Dict, Optional, List

from cli.command import Command
from cli.constants import Subcommands, Arguments
from cli.options.option_tree import Argument
from polaris.management import PolarisDefaultApi, CreatePrincipalRoleRequest, PrincipalRole, UpdatePrincipalRoleRequest, \
GrantPrincipalRoleRequest
from apache_polaris.cli.command import Command
from apache_polaris.cli.constants import Subcommands, Arguments
from apache_polaris.cli.options.option_tree import Argument
from apache_polaris.sdk.management import PolarisDefaultApi, \
CreatePrincipalRoleRequest, PrincipalRole, UpdatePrincipalRoleRequest, \
GrantPrincipalRoleRequest


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

from pydantic import StrictStr

from cli.command import Command
from cli.constants import Subcommands
from polaris.management import (
from apache_polaris.cli.command import Command
from apache_polaris.cli.constants import Subcommands
from apache_polaris.sdk.management import (
PolarisDefaultApi,
CreatePrincipalRequest,
Principal,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

from pydantic import StrictStr

from cli.command import Command
from cli.constants import Subcommands, Actions, Arguments
from cli.options.option_tree import Argument
from polaris.management import (
from apache_polaris.cli.command import Command
from apache_polaris.cli.constants import Subcommands, Actions, Arguments
from apache_polaris.cli.options.option_tree import Argument
from apache_polaris.sdk.management import (
PolarisDefaultApi,
AddGrantRequest,
NamespaceGrant,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
# specific language governing permissions and limitations
# under the License.
#

import json

import os
import sys
import json
from dataclasses import dataclass
from typing import Dict, Optional, List


from cli.command import Command
from cli.constants import (
from apache_polaris.cli.command import Command
from apache_polaris.cli.constants import (
Subcommands,
Arguments,
DEFAULT_HEADER,
Expand All @@ -33,7 +34,7 @@
CONFIG_DIR,
CONFIG_FILE,
)
from polaris.management import PolarisDefaultApi
from apache_polaris.sdk.management import PolarisDefaultApi


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#
import re

from polaris.catalog.api_client import ApiClient
from polaris.catalog.configuration import Configuration
from polaris.management import PolarisDefaultApi
from apache_polaris.sdk.catalog.api_client import ApiClient
from apache_polaris.sdk.catalog.configuration import Configuration
from apache_polaris.sdk.management import PolarisDefaultApi


def get_catalog_api_client(api: PolarisDefaultApi) -> ApiClient:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
from dataclasses import dataclass, field
from typing import List

from cli.constants import StorageType, CatalogType, PrincipalType, Hints, Commands, Arguments, Subcommands, Actions, \
CatalogConnectionType, AuthenticationType, ServiceIdentityType
from apache_polaris.cli.constants import StorageType, CatalogType, \
PrincipalType, Hints, Commands, Arguments, Subcommands, Actions, \
CatalogConnectionType, AuthenticationType, ServiceIdentityType


@dataclass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import sys
from typing import List, Optional, Dict

from cli.constants import Arguments, DEFAULT_HEADER
from cli.options.option_tree import OptionTree, Option, Argument
from apache_polaris.cli.constants import Arguments, DEFAULT_HEADER
from apache_polaris.cli.options.option_tree import OptionTree, Option, Argument


class Parser(object):
Expand Down
Loading