datacontract-cli 1.0.16__tar.gz → 1.0.17__tar.gz

{datacontract_cli-1.0.16/datacontract_cli.egg-info → datacontract_cli-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacontract-cli
-Version: 1.0.16
+Version: 1.0.17
 Summary: The datacontract CLI is an open source command-line tool for working with Data Contracts. It uses data contract YAML files to lint the data contract, connect to data sources and execute schema and quality tests, detect breaking changes, and export to different formats. The tool is written in Python. It can be used as a standalone CLI tool, in a CI/CD pipeline, or directly as a Python library.
 Author-email: Jochen Christ <jochen.christ@innoq.com>, Stefan Negele <stefan.negele@innoq.com>, Simon Harrer <simon.harrer@innoq.com>
 License-Expression: MIT
@@ -14,6 +14,7 @@ License-File: LICENSE
 Requires-Dist: typer<0.28,>=0.18.0
 Requires-Dist: click<9.0.0,>=8.1.0
 Requires-Dist: pydantic<2.14.0,>=2.8.2
+Requires-Dist: pydantic-settings<3.0.0,>=2.5.0
 Requires-Dist: pyyaml~=6.0.1
 Requires-Dist: ruamel.yaml<0.20,>=0.17
 Requires-Dist: requests<2.35,>=2.31

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/__init__.py

@@ -11,3 +11,7 @@ def repr_str(dumper, data):
 
 
 yaml.add_representer(str, repr_str, Dumper=yaml.SafeDumper)
+
+from datacontract.config import Config  # noqa: E402
+
+__all__ = ["Config"]

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/api.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import os
 import tempfile
@@ -10,8 +11,9 @@ from fastapi import Body, Depends, FastAPI, HTTPException, Query, Request, statu
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import PlainTextResponse
 from fastapi.security.api_key import APIKeyHeader
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 
+from datacontract.config import Config, known_env_names
 from datacontract.data_contract import DataContract, ExportFormat
 from datacontract.model.exceptions import DataContractException
 from datacontract.model.run import Run
@@ -270,6 +272,58 @@ api_key_header = APIKeyHeader(
 )
 
 
+_CONFIG_HEADER_PREFIX = "datacontract-"
+
+
+def config_from_headers(headers) -> "Config | None":
+    """Build a per-request Config from configuration option headers.
+
+    Header names are matched case-insensitively and map mechanically to the env
+    var names: uppercase, dashes to underscores — ``datacontract-snowflake-password``
+    → ``DATACONTRACT_SNOWFLAKE_PASSWORD``, ``entropy-data-api-key`` →
+    ``ENTROPY_DATA_API_KEY``. Returns None when no config headers are present,
+    so env-var-configured deployments behave exactly as before. Unknown
+    ``datacontract-*`` option names are rejected with a 400.
+    """
+    known = known_env_names()
+    values = {}
+    for name, value in headers.items():
+        lowered = name.lower()
+        env = lowered.upper().replace("-", "_")
+        if lowered.startswith(_CONFIG_HEADER_PREFIX) or env in known:
+            values[env] = value
+    if not values:
+        return None
+    try:
+        return Config.resolve(values)
+    except (ValueError, ValidationError) as e:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Invalid datacontract-* configuration header: {e}",
+        )
+
+
+def _parse_filters_query(filters: str | None) -> dict[str, str] | None:
+    """Parse the `filters` query parameter (JSON object mapping schema name to predicate)."""
+    if filters is None:
+        return None
+    detail = (
+        "The filters parameter must be a JSON object mapping schema name to a SQL predicate, "
+        'e.g., {"orders": "ingested_at >= CURRENT_DATE - 1"}.'
+    )
+    try:
+        parsed = json.loads(filters)
+    except json.JSONDecodeError:
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=detail)
+    if (
+        not isinstance(parsed, dict)
+        or not parsed
+        or not all(isinstance(predicate, str) and predicate.strip() for predicate in parsed.values())
+    ):
+        raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY, detail=detail)
+    return {schema_name: predicate.strip() for schema_name, predicate in parsed.items()}
+
+
 def check_api_key(api_key_header: str | None):
     correct_api_key = os.getenv("DATACONTRACT_CLI_API_KEY")
     if correct_api_key is None or correct_api_key == "":
@@ -298,7 +352,9 @@ def check_api_key(api_key_header: str | None):
     description="""
               Run schema and quality tests. Data Contract CLI connects to the data sources configured in the server section.
               This usually requires credentials to access the data sources.
-              Credentials must be provided via environment variables when running the web server.
+              Credentials can be provided via environment variables when running the web server, or per request
+              via datacontract-* headers (case-insensitive), which map to the environment variable names
+              (e.g. datacontract-snowflake-password sets DATACONTRACT_SNOWFLAKE_PASSWORD for this request only).
               POST the data contract YAML as payload.
             """,
     responses={
@@ -348,12 +404,41 @@ async def test(
             examples=["https://api.datamesh-manager.com/api/test-results"],
         ),
     ] = None,
+    filter: Annotated[
+        str | None,
+        Query(
+            description="A SQL predicate to filter the rows under test, in the dialect of the server. "
+            "Only works if a single schema is tested; for contracts with multiple schemas, use filters. "
+            "Schema checks and custom SQL queries are not filtered.",
+            examples=["ingested_at >= CURRENT_DATE - 1"],
+        ),
+    ] = None,
+    filters: Annotated[
+        str | None,
+        Query(
+            description="Row filters per schema, as a JSON object mapping schema name to SQL predicate. "
+            "Schema checks and custom SQL queries are not filtered.",
+            examples=['{"orders": "ingested_at >= CURRENT_DATE - 1"}'],
+        ),
+    ] = None,
 ) -> Run:
     check_api_key(api_key)
+    parsed_filters = _parse_filters_query(filters)
+    if filter is not None and parsed_filters is not None:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail="Use either the filter or the filters parameter, not both.",
+        )
     logging.info("Testing data contract...")
     logging.info(body)
     return DataContract(
-        data_contract_str=body, server=server, publish_url=publish_url, fastapi_url=str(request.url)
+        data_contract_str=body,
+        server=server,
+        publish_url=publish_url,
+        fastapi_url=str(request.url),
+        config=config_from_headers(request.headers),
+        filter=filter,
+        filters=parsed_filters,
     ).test()
 
 

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/catalog/catalog.py

@@ -8,6 +8,7 @@ import pytz
 from jinja2 import Environment, PackageLoader, select_autoescape
 from open_data_contract_standard.model import OpenDataContractStandard
 
+from datacontract.config import cli_config
 from datacontract.data_contract import DataContract
 from datacontract.export.html_exporter import get_version
 
@@ -26,7 +27,7 @@ def _get_owner(odcs: OpenDataContractStandard) -> Optional[str]:
 def create_data_contract_html(contracts, file: Path, path: Path, schema: str):
     logging.debug(f"Creating data contract html for file {file} and schema {schema}")
     data_contract = DataContract(
-        data_contract_file=f"{file.absolute()}", inline_references=True, schema_location=schema
+        data_contract_file=f"{file.absolute()}", inline_references=True, schema_location=schema, config=cli_config()
     )
     html = data_contract.export(export_format="html")
     odcs = data_contract.get_data_contract()

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/cli.py

@@ -5,6 +5,7 @@ from importlib import metadata
 from pathlib import Path
 from typing import Iterable, Optional
 
+import pydantic
 import typer
 from click import Context
 from dotenv import find_dotenv, load_dotenv
@@ -13,6 +14,7 @@ from rich.markup import escape
 from typer.core import TyperGroup
 from typing_extensions import Annotated
 
+from datacontract.config import Config, set_cli_config
 from datacontract.output.output_format import OutputFormat
 
 console = Console()
@@ -151,6 +153,13 @@ def common(
         "instead of the bundled CA certificates (e.g. behind a corporate proxy or internal CA).",
         envvar="DATACONTRACT_SYSTEM_TRUSTSTORE",
     ),
+    config_file: Optional[Path] = typer.Option(
+        None,
+        "--config-file",
+        help="Path to a YAML file with credentials and connection options "
+        "(sections per data source, ${VAR} references resolve from the environment). "
+        "Defaults to ./datacontract-config.yaml or ~/.datacontract/config.yaml if present.",
+    ),
 ):
     """
     The datacontract CLI is an open source command-line tool for working with Data Contracts (https://datacontract.com).
@@ -164,10 +173,30 @@ def common(
     # Already-set environment variables take precedence.
     load_dotenv(dotenv_path=find_dotenv(usecwd=True), override=False)
 
+    set_cli_config(_load_config_file(config_file))
+
     if system_truststore:
         inject_system_truststore()
 
 
+def _load_config_file(config_file: "Optional[Path]"):
+    """Load the --config-file, or the first default location that exists."""
+    candidates = (
+        [config_file]
+        if config_file
+        else [Path("datacontract-config.yaml"), Path.home() / ".datacontract" / "config.yaml"]
+    )
+    for candidate in candidates:
+        if candidate.exists():
+            try:
+                return Config.from_yaml(candidate)
+            except (ValueError, pydantic.ValidationError) as e:
+                raise typer.BadParameter(str(e), param_hint="--config-file")
+    if config_file:
+        raise typer.BadParameter(f"Config file {config_file} does not exist.", param_hint="--config-file")
+    return None
+
+
 def enable_debug_logging(debug: bool, otherwise_disable_stderr: bool = False):
     if not debug and otherwise_disable_stderr:
         # some commands render run.logs to the console themselves; a NullHandler keeps

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_changelog.py

@@ -2,6 +2,7 @@ import typer
 from typing_extensions import Annotated
 
 from datacontract.cli import app, console, debug_option, enable_debug_logging
+from datacontract.config import cli_config
 from datacontract.data_contract import DataContract
 from datacontract.output.text_changelog_results import write_text_changelog_results
 
@@ -11,8 +12,14 @@ from datacontract.output.text_changelog_results import write_text_changelog_resu
     epilog="Example: datacontract changelog datacontract-v1.yaml datacontract-v2.yaml",
 )
 def changelog(
-    v1: Annotated[str, typer.Argument(help="The location (url or path) of the source (before) data contract YAML.")],
-    v2: Annotated[str, typer.Argument(help="The location (url or path) of the target (after) data contract YAML.")],
+    v1: Annotated[
+        str,
+        typer.Argument(help="The location (url, s3 url, or local path) of the source (before) data contract YAML."),
+    ],
+    v2: Annotated[
+        str,
+        typer.Argument(help="The location (url, s3 url, or local path) of the target (after) data contract YAML."),
+    ],
     inline_references: Annotated[
         bool,
         typer.Option(
@@ -24,7 +31,7 @@ def changelog(
 ):
     """Show a changelog between two data contracts."""
     enable_debug_logging(debug)
-    result = DataContract(data_contract_file=v1, inline_references=inline_references).changelog(
-        DataContract(data_contract_file=v2, inline_references=inline_references)
+    result = DataContract(config=cli_config(), data_contract_file=v1, inline_references=inline_references).changelog(
+        DataContract(config=cli_config(), data_contract_file=v2, inline_references=inline_references)
     )
     write_text_changelog_results(result, console)

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_ci.py

@@ -15,6 +15,7 @@ from datacontract.cli import (
     resolve_output_format,
     validate_publish_url,
 )
+from datacontract.config import cli_config
 from datacontract.data_contract import DataContract
 from datacontract.output.ci_output import write_ci_output, write_ci_summary, write_json_results
 from datacontract.output.output_format import OutputFormat
@@ -34,7 +35,7 @@ class FailOn(str, Enum):
 def ci(
     locations: Annotated[
         Optional[list[str]],
-        typer.Argument(help="The location(s) (url or path) of the data contract yaml file(s)."),
+        typer.Argument(help="The location(s) (url, s3 url, or local path) of the data contract yaml file(s)."),
     ] = None,
     schema: Annotated[
         str,
@@ -111,6 +112,7 @@ def ci(
     for location in locations:
         out.print(f"Testing {location}")
         run = DataContract(
+            config=cli_config(),
             data_contract_file=location,
             schema_location=schema,
             publish_url=publish,

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_dbt.py

@@ -14,6 +14,7 @@ from datacontract.cli import (
     enable_debug_logging,
     validate_publish_url,
 )
+from datacontract.config import cli_config
 from datacontract.integration.dbt_sync import (
     ModelResolution,
     _ensure_dbt_project,
@@ -120,7 +121,7 @@ def _maybe_publish(run: Run, odcs, publish: Optional[str], ssl_verification: boo
                 f"Pass --server to identify the run.[/yellow]"
             )
         return False
-    return not publish_test_results_to_entropy_data(run, publish, ssl_verification)
+    return not publish_test_results_to_entropy_data(run, publish, ssl_verification, config=cli_config())
 
 
 def _report_run(run: Run, *, run_only: bool, publish_failed: bool, ctx: _ContractCtx) -> bool:

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_edit.py

@@ -10,6 +10,7 @@ import typer
 from typing_extensions import Annotated
 
 from datacontract.cli import app, console, debug_option, enable_debug_logging
+from datacontract.config import cli_config
 from datacontract.init.init_template import get_init_template
 from datacontract.lint.urls import fetch_resource
 from datacontract.model.exceptions import DataContractException
@@ -56,7 +57,7 @@ def _download_local_copy(url: str) -> str:
         console.print("Aborted.")
         raise typer.Exit(code=1)
     try:
-        content = fetch_resource(url)
+        content = fetch_resource(url, cli_config())
     except DataContractException as e:
         console.print(f"[red]Error: {e.reason}[/red]")
         raise typer.Exit(code=1)

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_export.py

@@ -6,6 +6,7 @@ from rich.console import Console
 from typing_extensions import Annotated
 
 from datacontract.cli import OrderedCommandsWithMigrationHints, debug_option, enable_debug_logging
+from datacontract.config import cli_config
 from datacontract.data_contract import DataContract
 from datacontract.export.exporter import ExportFormat, SqlServerType
 from datacontract.export.great_expectations_exporter import GreatExpectationsEngine
@@ -17,7 +18,10 @@ export_app = typer.Typer(cls=OrderedCommandsWithMigrationHints, no_args_is_help=
 # ---------------------------------------------------------------------------
 # Shared option type aliases
 # ---------------------------------------------------------------------------
-location_arg = Annotated[str, typer.Argument(help="The location (url or path) of the data contract yaml.")]
+location_arg = Annotated[
+    str,
+    typer.Argument(help="The location (url, s3 url, or local path) of the data contract yaml."),
+]
 output_option = Annotated[
     Optional[Path],
     typer.Option(
@@ -64,6 +68,7 @@ def _export(
     clickhouse_order_by: Optional[str] = None,
 ):
     result = DataContract(
+        config=cli_config(),
         data_contract_file=location,
         schema_location=schema,
         server=server,

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_import.py

@@ -6,6 +6,7 @@ from rich.console import Console
 from typing_extensions import Annotated
 
 from datacontract.cli import OrderedCommandsWithMigrationHints, debug_option, enable_debug_logging
+from datacontract.config import cli_config
 from datacontract.data_contract import DataContract
 from datacontract.imports.sql_importer import SqlDialect
 
@@ -69,6 +70,7 @@ def import_sql(
     """Import a data contract from a SQL DDL file."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="sql",
         source=source,
         schema=schema,
@@ -93,7 +95,9 @@ def import_avro(
 ):
     """Import a data contract from an Avro schema file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="avro", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="avro", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -118,7 +122,7 @@ def import_dbt(
     """Import a data contract from a dbt manifest file."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="dbt", source=source, schema=schema, dbt_model=model, owner=owner, id=id
+        config=cli_config(), format="dbt", source=source, schema=schema, dbt_model=model, owner=owner, id=id
     )
     _write_result(result, output)
 
@@ -154,6 +158,7 @@ def import_dbml(
     """Import a data contract from a DBML file."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="dbml",
         source=source,
         schema=odcs_schema,
@@ -186,7 +191,7 @@ def import_glue(
     """Import a data contract from AWS Glue."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="glue", source=database, schema=schema, glue_table=table, owner=owner, id=id
+        config=cli_config(), format="glue", source=database, schema=schema, glue_table=table, owner=owner, id=id
     )
     _write_result(result, output)
 
@@ -219,6 +224,7 @@ def import_bigquery(
     """Import a data contract from BigQuery."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="bigquery",
         source=source,
         schema=schema,
@@ -259,7 +265,13 @@ def import_databricks(
     """Import a data contract from Databricks Unity Catalog."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="databricks", source=source, schema=schema, unity_table_full_name=table, owner=owner, id=id
+        config=cli_config(),
+        format="databricks",
+        source=source,
+        schema=schema,
+        unity_table_full_name=table,
+        owner=owner,
+        id=id,
     )
     _write_result(result, output)
 
@@ -298,7 +310,9 @@ def import_jsonschema(
 ):
     """Import a data contract from a JSON Schema file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="jsonschema", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="jsonschema", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -316,7 +330,9 @@ def import_json(
 ):
     """Import a data contract from a JSON file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="json", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="json", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -334,7 +350,9 @@ def import_odcs(
 ):
     """Import a data contract from an ODCS file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="odcs", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="odcs", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -352,7 +370,9 @@ def import_parquet(
 ):
     """Import a data contract from a Parquet file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="parquet", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="parquet", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -370,7 +390,9 @@ def import_csv(
 ):
     """Import a data contract from a CSV file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="csv", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="csv", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -388,7 +410,9 @@ def import_protobuf(
 ):
     """Import a data contract from a Protobuf schema file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="protobuf", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="protobuf", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -409,7 +433,9 @@ def import_spark(
 ):
     """Import a data contract from a Spark schema."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="spark", source=tables, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="spark", source=tables, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -432,7 +458,7 @@ def import_iceberg(
     """Import a data contract from an Iceberg schema."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="iceberg", source=source, schema=schema, iceberg_table=table, owner=owner, id=id
+        config=cli_config(), format="iceberg", source=source, schema=schema, iceberg_table=table, owner=owner, id=id
     )
     _write_result(result, output)
 
@@ -451,7 +477,9 @@ def import_excel(
 ):
     """Import a data contract from an Excel file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="excel", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="excel", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -471,7 +499,9 @@ def import_powerbi(
 ):
     """Import a data contract from a Power BI semantic model (.pbit, .bim, or .json) file."""
     enable_debug_logging(debug)
-    result = DataContract.import_from_source(format="powerbi", source=source, schema=schema, owner=owner, id=id)
+    result = DataContract.import_from_source(
+        config=cli_config(), format="powerbi", source=source, schema=schema, owner=owner, id=id
+    )
     _write_result(result, output)
 
 
@@ -491,7 +521,7 @@ def import_snowflake(
     """Import a data contract from a Snowflake workspace."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="snowflake", source=source, database=database, schema=schema, owner=owner, id=id
+        config=cli_config(), format="snowflake", source=source, database=database, schema=schema, owner=owner, id=id
     )
     _write_result(result, output)
 
@@ -519,6 +549,7 @@ def import_redshift(
     """Import a data contract from an Amazon Redshift schema."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="redshift",
         source=source,
         port=port,
@@ -554,6 +585,7 @@ def import_postgres(
     """Import a data contract from a Postgres schema."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="postgres",
         source=source,
         port=port,
@@ -589,7 +621,7 @@ def import_gcs(
     """Import a data contract from files in Google Cloud Storage."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="gcs", source=source, file_format=format, delimiter=delimiter, owner=owner, id=id
+        config=cli_config(), format="gcs", source=source, file_format=format, delimiter=delimiter, owner=owner, id=id
     )
     _write_result(result, output)
 
@@ -616,7 +648,7 @@ def import_adls(
     """Import a data contract from files in Azure Blob Storage / ADLS."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
-        format="adls", source=source, file_format=format, delimiter=delimiter, owner=owner, id=id
+        config=cli_config(), format="adls", source=source, file_format=format, delimiter=delimiter, owner=owner, id=id
     )
     _write_result(result, output)
 
@@ -642,6 +674,7 @@ def import_trino(
     """Import a data contract from a Trino catalog."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="trino",
         source=source,
         port=port,
@@ -677,6 +710,7 @@ def import_oracle(
     """Import a data contract from an Oracle database."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="oracle",
         source=source,
         port=port,
@@ -710,6 +744,7 @@ def import_sqlserver(
     """Import a data contract from a SQL Server database."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="sqlserver",
         source=source,
         port=port,
@@ -742,6 +777,7 @@ def import_mysql(
     """Import a data contract from a MySQL database."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="mysql",
         source=source,
         port=port,
@@ -778,6 +814,7 @@ def import_s3(
     """Import a data contract from files in S3."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="s3",
         source=source,
         file_format=format,
@@ -815,6 +852,7 @@ def import_athena(
     """Import a data contract from an Amazon Athena database."""
     enable_debug_logging(debug)
     result = DataContract.import_from_source(
+        config=cli_config(),
         format="athena",
         schema=schema,
         staging_dir=staging_dir,

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_lint.py

@@ -4,6 +4,7 @@ import typer
 from typing_extensions import Annotated
 
 from datacontract.cli import app, console, debug_option, enable_debug_logging, resolve_output_format
+from datacontract.config import cli_config
 from datacontract.data_contract import DataContract
 from datacontract.output.output_format import OutputFormat
 from datacontract.output.test_results_writer import write_test_result
@@ -16,7 +17,7 @@ from datacontract.output.test_results_writer import write_test_result
 def lint(
     location: Annotated[
         str,
-        typer.Argument(help="The location (url or path) of the data contract yaml."),
+        typer.Argument(help="The location (url, s3 url, or local path) of the data contract yaml."),
     ] = "datacontract.yaml",
     schema: Annotated[
         str,
@@ -55,6 +56,7 @@ def lint(
 
     output_format = resolve_output_format(output_format, output)
     run = DataContract(
+        config=cli_config(),
         data_contract_file=location,
         schema_location=schema,
         all_errors=all_errors,

{datacontract_cli-1.0.16 → datacontract_cli-1.0.17}/datacontract/command_publish.py

@@ -2,6 +2,7 @@ import typer
 from typing_extensions import Annotated
 
 from datacontract.cli import app, debug_option, enable_debug_logging
+from datacontract.config import cli_config
 from datacontract.integration.entropy_data import (
     publish_data_contract_to_entropy_data,
 )
@@ -15,7 +16,7 @@ from datacontract.lint.resolve import resolve_data_contract_dict
 def publish(
     location: Annotated[
         str,
-        typer.Argument(help="The location (url or path) of the data contract yaml."),
+        typer.Argument(help="The location (url, s3 url, or local path) of the data contract yaml."),
     ] = "datacontract.yaml",
     schema: Annotated[
         str,
@@ -33,6 +34,7 @@ def publish(
     enable_debug_logging(debug)
 
     publish_data_contract_to_entropy_data(
-        data_contract_dict=resolve_data_contract_dict(location),
+        config=cli_config(),
+        data_contract_dict=resolve_data_contract_dict(location, config=cli_config()),
         ssl_verification=ssl_verification,
     )