mirror of
https://github.com/open-metadata/OpenMetadata
synced 2026-05-24 09:39:11 +00:00
* 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.
168 lines
5.3 KiB
Python
168 lines
5.3 KiB
Python
import os
|
|
import shutil
|
|
import tempfile
|
|
import uuid
|
|
|
|
import pytest
|
|
from sqlalchemy import create_engine, text
|
|
from testcontainers.mssql import SqlServerContainer
|
|
|
|
from _openmetadata_testutils.helpers.docker import copy_dir_to_container, try_bind
|
|
from metadata.generated.schema.api.services.createDatabaseService import (
|
|
CreateDatabaseServiceRequest,
|
|
)
|
|
from metadata.generated.schema.entity.services.connections.database.mssqlConnection import (
|
|
MssqlConnection,
|
|
MssqlScheme,
|
|
)
|
|
from metadata.generated.schema.entity.services.databaseService import (
|
|
DatabaseConnection,
|
|
DatabaseService,
|
|
DatabaseServiceType,
|
|
)
|
|
|
|
from ..conftest import ingestion_config as base_ingestion_config # noqa: F401, TID252
|
|
|
|
|
|
@pytest.fixture(scope="package")
|
|
def db_name():
|
|
return "AdventureWorksLT2022"
|
|
|
|
|
|
class CustomSqlServerContainer(SqlServerContainer):
|
|
def start(self) -> "DbContainer": # noqa: F821
|
|
dockerfile = f"""
|
|
FROM {self.image}
|
|
USER root
|
|
RUN mkdir -p /data
|
|
RUN chown mssql /data
|
|
USER mssql
|
|
"""
|
|
temp_dir = os.path.join(tempfile.gettempdir(), "mssql") # noqa: PTH118
|
|
os.makedirs(temp_dir, exist_ok=True) # noqa: PTH103
|
|
temp_dockerfile_path = os.path.join(temp_dir, "Dockerfile") # noqa: PTH118
|
|
with open(temp_dockerfile_path, "w") as temp_dockerfile: # noqa: PTH123
|
|
temp_dockerfile.write(dockerfile)
|
|
self.get_docker_client().build(temp_dir, tag=self.image)
|
|
return super().start()
|
|
|
|
def _configure(self) -> None:
|
|
super()._configure()
|
|
self.with_env("SQL_SA_PASSWORD", self.password)
|
|
|
|
|
|
@pytest.fixture(scope="package")
|
|
def mssql_container(tmp_path_factory, db_name):
|
|
container = CustomSqlServerContainer("mcr.microsoft.com/mssql/server:2022-latest", dbname="master")
|
|
data_dir = tmp_path_factory.mktemp("data")
|
|
shutil.copy(
|
|
os.path.join(os.path.dirname(__file__), "data", f"{db_name}.bak"), # noqa: PTH118, PTH120
|
|
str(data_dir),
|
|
)
|
|
with open(data_dir / "install.sql", "w") as f: # noqa: PTH123
|
|
f.write(
|
|
f"""
|
|
USE [master]
|
|
RESTORE FILELISTONLY
|
|
FROM DISK = '/data/{db_name}.bak';
|
|
GO
|
|
|
|
RESTORE DATABASE [{db_name}]
|
|
FROM DISK = '/data/{db_name}.bak'
|
|
WITH MOVE '{db_name}_Data' TO '/var/opt/mssql/data/{db_name}.mdf',
|
|
MOVE '{db_name}_Log' TO '/var/opt/mssql/data/{db_name}.ldf';
|
|
GO
|
|
"""
|
|
)
|
|
|
|
with try_bind(container, 1433, 1433) as container:
|
|
docker_container = container.get_wrapped_container()
|
|
copy_dir_to_container(str(data_dir), docker_container, "/data")
|
|
res = docker_container.exec_run(
|
|
[
|
|
"bash",
|
|
"-c",
|
|
" ".join(
|
|
[
|
|
"/opt/mssql-tools*/bin/sqlcmd",
|
|
"-U",
|
|
container.username,
|
|
"-P",
|
|
f"'{container.password}'",
|
|
"-d",
|
|
"master",
|
|
"-i",
|
|
"/data/install.sql",
|
|
"-C",
|
|
]
|
|
),
|
|
]
|
|
)
|
|
if res[0] != 0:
|
|
raise Exception("Failed to create mssql database:" + res[1].decode("utf-8")) # noqa: TRY002
|
|
engine = create_engine(
|
|
"mssql+pytds://" + container.get_connection_url().split("://")[1],
|
|
connect_args={"autocommit": True},
|
|
)
|
|
with engine.connect() as conn:
|
|
transaciton = conn.begin()
|
|
conn.execute(text(f"SELECT * INTO {db_name}.SalesLT.CustomerCopy FROM {db_name}.SalesLT.Customer;"))
|
|
transaciton.commit()
|
|
yield container
|
|
|
|
|
|
@pytest.fixture(
|
|
scope="module",
|
|
params=[
|
|
MssqlScheme.mssql_pytds,
|
|
MssqlScheme.mssql_pyodbc,
|
|
],
|
|
)
|
|
def scheme(request):
|
|
return request.param
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def create_service_request(mssql_container, scheme, db_name):
|
|
return CreateDatabaseServiceRequest(
|
|
name=f"docker_test_mssql_{uuid.uuid4().hex[:8]}_{scheme.name}",
|
|
serviceType=DatabaseServiceType.Mssql,
|
|
connection=DatabaseConnection(
|
|
config=MssqlConnection(
|
|
username=mssql_container.username,
|
|
password=mssql_container.password,
|
|
hostPort="localhost:" + mssql_container.get_exposed_port(mssql_container.port),
|
|
database=db_name,
|
|
scheme=scheme,
|
|
ingestAllDatabases=True,
|
|
connectionOptions={
|
|
"TrustServerCertificate": "yes",
|
|
"MARS_Connection": "yes",
|
|
},
|
|
)
|
|
),
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def ingestion_config(
|
|
db_service,
|
|
tmp_path_factory,
|
|
workflow_config,
|
|
sink_config,
|
|
base_ingestion_config, # noqa: F811
|
|
db_name,
|
|
):
|
|
base_ingestion_config["source"]["sourceConfig"]["config"]["databaseFilterPattern"] = {
|
|
"includes": ["TestDB", db_name],
|
|
}
|
|
return base_ingestion_config
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def unmask_password(create_service_request):
|
|
def inner(service: DatabaseService):
|
|
service.connection.config.password = create_service_request.connection.config.password
|
|
return service
|
|
|
|
return inner
|