mirror of
https://github.com/open-metadata/OpenMetadata
synced 2026-05-24 09:39:11 +00:00
e9c87c6adb
* chore(ingestion): drop pylint, expand ruff to Stage 2c
Replace pylint with a coherent ruff-only stack (Stage 2c of the modernize
roadmap). Pylint is dropped from dev deps and CI workflows; ruff selected
ruleset expanded to ~22 families covering style, bug catchers, hygiene,
and the pylint port (PLE/PLC/PLW/PLR with the noisy "too-many-X"
complexity caps + magic-value disabled).
What's selected (with rationale in pyproject.toml):
E, W, F, I, N — style + correctness baseline + naming
UP — pyupgrade (py>=3.10 modernizations)
B, C4, C90, RET, SIM, TRY — bug catchers
PIE, ICN, T20, TC, TID, PTH, PERF — hygiene
PLE, PLC, PLW, PLR — pylint port (PLR complexity caps ignored)
RUF — ruff-native (incl. RUF100 unused-noqa)
What's removed:
- .pylintrc (root) — duplicate of the ingestion pylint config
- [tool.pylint.*] block in ingestion/pyproject.toml (~140 lines)
- ingestion/plugins/{print_checker,import_checker}.py + tests + README
(replaced by built-in T20 + TID251 banned-api respectively)
- pylint dep from ingestion/setup.py and openmetadata-airflow-apis/pyproject.toml
- `make lint` Makefile target + the pylint invocation in py_format_check
- dead pylint TODO comment + ignored test entry in noxfile.py
Cwd-stable config: ruff is invoked both from the repo root (pre-commit,
CI) and from ingestion/ (`make py_format_check`). The `src`,
`extend-exclude`, and per-file-ignores entries are listed twice — once
relative to ingestion/ and once with the `ingestion/` prefix — so
first-party isort detection and exclusions match in both invocations.
Grandfathering: ran `ruff check --add-noqa` once + format-stable
iteration. ~12,130 noqa directives across ~1,400 files. Cleanup is
deferred to follow-up PRs that drop noqas one rule at a time.
Documentation sweep: replaced `make lint` references in CLAUDE.md,
AGENTS.md, DEVELOPER.md, copilot-instructions, and 6 SKILL files with
the apply+verify shape `make py_format && make py_format_check`.
`make py_format` is NOT a strict superset of pylint — it only applies
auto-fixable violations; `make py_format_check` catches the rest.
Basedpyright baseline regenerated: ruff format reflowed multi-line
signatures in ~70 files, shifting type-error column positions. The
basedpyright baseline matches by (file path, error code, range), so
column shifts caused 19 entries to mis-align. Net diff is small
(154 lines in/out of the 13MB baseline.json) — purely positional.
Verified locally:
- make py_format_check → All checks passed
- nox --no-venv -s static-checks → 0 errors, 0 warnings, 0 notes
* chore(ingestion): finish ruff swap — nox lint session + skill docs
Three remaining stale-tooling references after Stage 2c:
- `ingestion/noxfile.py` `lint` session was still calling `black --check`,
`isort --check-only`, `pycln --diff`. Those tools aren't installed
anywhere (we dropped them from dev deps). Replace with the ruff
equivalents that mirror `make py_format_check`.
- `skills/standards/code_style.md`: stack listed as `black + isort +
pycln`; line length claimed 88 (black default). Both wrong: stack is
ruff, line length is 120.
- `skills/connector-building/SKILL.md`: `make py_format` comment said
`# black + isort + pycln`. Same swap.
* chore(ingestion): keep main's baseline + globally ignore TRY400
Per gitar-bot's review on PR #27774:
1. Main's PR #27728 promoted ~60 `logger.warning()` → `logger.error()`
inside `except` blocks. Those changes landed on main with their own
baseline updates. Our PR doesn't promote anything — the merge from
origin/main brought those `error` calls along with their baseline
entries.
The bot interpreted the `# noqa: TRY400` we added next to those lines
as us silencing the rule case-by-case. Cleaner: globally ignore
TRY400 in pyproject.toml, with a comment explaining why the codebase's
`logger.error(...)` + separate `logger.debug(traceback.format_exc())`
pattern is intentional. Strip ~430 per-line `# noqa: TRY400` markers
from source.
2. Document that `S101` in `per-file-ignores` is a forward-looking
entry — flake8-bandit (`S`) is not yet selected, so the rule is
no-op today; the entry stays so when `S` lands later, tests don't
immediately error.
Reverts the platform pin and Linux Docker–generated baseline. Keep
main's baseline intact and let CI surface the exact column-shifted
entries; the team will decide whether to fix in-place (revert format
on affected files) or add per-line `# pyright: ignore` markers.
* chore(ingestion): regen baseline for new connector type debt
Main's baseline was stale relative to recently-added connectors
(McpConnection, CustomDriveConnection) that lack common attributes
like `hostPort`, `database`, `catalog` etc. — all sites that access
those attributes via the union-typed `serviceConnection.root.config`
fire `reportAttributeAccessIssue` errors that aren't baselined.
71 errors + 58 warnings absorbed. Local macOS regen; pushing to see
CI's drift count. Per the basedpyright-baseline-and-ci PR experience,
macOS↔Linux column drift on this size of regen has historically been
1-7 residuals.
83 lines
3.3 KiB
Python
83 lines
3.3 KiB
Python
# Copyright 2022 Collate
|
|
# Licensed under the Collate Community License, Version 1.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
# https://github.com/open-metadata/OpenMetadata/blob/main/ingestion/LICENSE
|
|
# 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.
|
|
|
|
"""
|
|
Test Redshift connector with CLI
|
|
"""
|
|
|
|
from pathlib import Path
|
|
from typing import List # noqa: UP035
|
|
|
|
import pytest
|
|
from sqlalchemy.engine import Engine
|
|
|
|
from metadata.ingestion.api.status import Status
|
|
from metadata.workflow.metadata import MetadataWorkflow # noqa: TC001
|
|
|
|
from .base.test_cli import PATH_TO_RESOURCES # noqa: TID252
|
|
from .base.test_cli_dbt import CliDBTBase # noqa: TID252
|
|
|
|
|
|
class DbtCliTest(CliDBTBase.TestSuite):
|
|
engine: Engine
|
|
|
|
@classmethod
|
|
def setUpClass(cls) -> None:
|
|
connector = cls.get_connector_name()
|
|
workflow: MetadataWorkflow = cls.get_workflow(test_type=cls.get_test_type(), connector=connector)
|
|
cls.engine = workflow.source.engine
|
|
cls.openmetadata = workflow.source.metadata
|
|
cls.config_file_path = str(Path(PATH_TO_RESOURCES + f"/dbt/{connector}/{connector}.yaml"))
|
|
cls.dbt_file_path = str(Path(PATH_TO_RESOURCES + f"/dbt/{connector}/dbt.yaml"))
|
|
|
|
def tearDown(self) -> None:
|
|
self.engine.dispose()
|
|
|
|
@staticmethod
|
|
def get_connector_name() -> str:
|
|
return "redshift"
|
|
|
|
@staticmethod
|
|
def expected_tables() -> int:
|
|
return 9
|
|
|
|
@staticmethod
|
|
def expected_records() -> int:
|
|
return 72
|
|
|
|
@staticmethod
|
|
def fqn_dbt_tables() -> List[str]: # noqa: UP006
|
|
return [
|
|
"local_redshift.dev.dbt_cli_e2e.customers",
|
|
"local_redshift.dev.dbt_cli_e2e.orders",
|
|
]
|
|
|
|
@pytest.mark.order(11)
|
|
def test_lineage(self) -> None:
|
|
pytest.skip("Lineage not configured. Skipping Test")
|
|
|
|
def assert_for_vanilla_ingestion(self, source_status: Status, sink_status: Status) -> None:
|
|
self.assertTrue(len(source_status.failures) == 0)
|
|
self.assertTrue(len(source_status.warnings) == 0)
|
|
self.assertTrue(len(source_status.filtered) >= 10)
|
|
self.assertTrue((len(source_status.records) + len(source_status.updated_records)) >= self.expected_tables())
|
|
self.assertTrue(len(sink_status.failures) == 0)
|
|
self.assertTrue(len(sink_status.warnings) == 0)
|
|
self.assertTrue((len(sink_status.records) + len(sink_status.updated_records)) > self.expected_tables())
|
|
|
|
def assert_for_dbt_ingestion(self, source_status: Status, sink_status: Status) -> None:
|
|
self.assertTrue(len(source_status.failures) == 0)
|
|
self.assertLessEqual(len(source_status.warnings), 10)
|
|
self.assertTrue(len(source_status.filtered) == 0)
|
|
self.assertTrue((len(source_status.records) + len(source_status.updated_records)) >= 0)
|
|
self.assertTrue(len(sink_status.failures) == 0)
|
|
self.assertLessEqual(len(sink_status.warnings), 10)
|
|
self.assertTrue((len(sink_status.records) + len(sink_status.updated_records)) >= self.expected_records())
|