yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-09 07:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): fix quickstart command with pydantic v2 (#9806)

Browse Source
This commit is contained in:
Harshal Sheth 2024-02-10 13:15:48 -05:00 committed by GitHub
parent 5793467e29
commit 71c966bb13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
metadata-ingestion/src/datahub/cli/docker_cli.py
View File

@ -16,7 +16,6 @@ from typing import Dict, List, Optional
import click import click
import click_spinner import click_spinner
import pydantic
import requests import requests
from expandvars import expandvars from expandvars import expandvars
from requests_file import FileAdapter from requests_file import FileAdapter
@ -40,6 +39,7 @@ from datahub.utilities.perf_timer import PerfTimer
from datahub.utilities.sample_data import BOOTSTRAP_MCES_FILE, download_sample_data from datahub.utilities.sample_data import BOOTSTRAP_MCES_FILE, download_sample_data
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
_ClickPositiveInt = click.IntRange(min=1)
NEO4J_AND_ELASTIC_QUICKSTART_COMPOSE_FILE = ( NEO4J_AND_ELASTIC_QUICKSTART_COMPOSE_FILE = (
"docker/quickstart/docker-compose.quickstart.yml" "docker/quickstart/docker-compose.quickstart.yml"
@ -160,11 +160,11 @@ def should_use_neo4j_for_graph_service(graph_service_override: Optional[str]) ->
def _set_environment_variables( def _set_environment_variables(
version: Optional[str], version: Optional[str],
mysql_version: Optional[str], mysql_version: Optional[str],
mysql_port: Optional[pydantic.PositiveInt], mysql_port: Optional[int],
zk_port: Optional[pydantic.PositiveInt], zk_port: Optional[int],
kafka_broker_port: Optional[pydantic.PositiveInt], kafka_broker_port: Optional[int],
schema_registry_port: Optional[pydantic.PositiveInt], schema_registry_port: Optional[int],
elastic_port: Optional[pydantic.PositiveInt], elastic_port: Optional[int],
kafka_setup: Optional[bool], kafka_setup: Optional[bool],
) -> None: ) -> None:
if version is not None: if version is not None:
@ -476,35 +476,35 @@ def detect_quickstart_arch(arch: Optional[str]) -> Architectures:
) )
@click.option( @click.option(
"--mysql-port", "--mysql-port",
type=pydantic.PositiveInt, type=_ClickPositiveInt,
is_flag=False, is_flag=False,
default=None, default=None,
help="If there is an existing mysql instance running on port 3306, set this to a free port to avoid port conflicts on startup", help="If there is an existing mysql instance running on port 3306, set this to a free port to avoid port conflicts on startup",
) )
@click.option( @click.option(
"--zk-port", "--zk-port",
type=pydantic.PositiveInt, type=_ClickPositiveInt,
is_flag=False, is_flag=False,
default=None, default=None,
help="If there is an existing zookeeper instance running on port 2181, set this to a free port to avoid port conflicts on startup", help="If there is an existing zookeeper instance running on port 2181, set this to a free port to avoid port conflicts on startup",
) )
@click.option( @click.option(
"--kafka-broker-port", "--kafka-broker-port",
type=pydantic.PositiveInt, type=_ClickPositiveInt,
is_flag=False, is_flag=False,
default=None, default=None,
help="If there is an existing Kafka broker running on port 9092, set this to a free port to avoid port conflicts on startup", help="If there is an existing Kafka broker running on port 9092, set this to a free port to avoid port conflicts on startup",
) )
@click.option( @click.option(
"--schema-registry-port", "--schema-registry-port",
type=pydantic.PositiveInt, type=_ClickPositiveInt,
is_flag=False, is_flag=False,
default=None, default=None,
help="If there is an existing process running on port 8081, set this to a free port to avoid port conflicts with Kafka schema registry on startup", help="If there is an existing process running on port 8081, set this to a free port to avoid port conflicts with Kafka schema registry on startup",
) )
@click.option( @click.option(
"--elastic-port", "--elastic-port",
type=pydantic.PositiveInt, type=_ClickPositiveInt,
is_flag=False, is_flag=False,
default=None, default=None,
help="If there is an existing Elasticsearch instance running on port 9092, set this to a free port to avoid port conflicts on startup", help="If there is an existing Elasticsearch instance running on port 9092, set this to a free port to avoid port conflicts on startup",
@ -600,11 +600,11 @@ def quickstart( # noqa: C901
quickstart_compose_file: List[pathlib.Path], quickstart_compose_file: List[pathlib.Path],
dump_logs_on_failure: bool, dump_logs_on_failure: bool,
graph_service_impl: Optional[str], graph_service_impl: Optional[str],
mysql_port: Optional[pydantic.PositiveInt], mysql_port: Optional[int],
zk_port: Optional[pydantic.PositiveInt], zk_port: Optional[int],
kafka_broker_port: Optional[pydantic.PositiveInt], kafka_broker_port: Optional[int],
schema_registry_port: Optional[pydantic.PositiveInt], schema_registry_port: Optional[int],
elastic_port: Optional[pydantic.PositiveInt], elastic_port: Optional[int],
stop: bool, stop: bool,
backup: bool, backup: bool,
backup_file: str, backup_file: str,