Skip to content

fix(make_warehouse): accept custom tags #220 #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
b0lle wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(make_warehouse): accept custom tags #220 #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a57eb02
fix(make_warehouse): accept custom tags #220
b0lle Jan 6, 2026
8ae06aa
Try to trigger internal build
alexott Feb 4, 2026
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
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ dependencies = [
[project.entry-points.pytest11]
databricks-labs-pytester = "databricks.labs.pytester.fixtures.plugin"


[project.urls]
Issues = "https://github.com/databrickslabs/pytester/issues"
Source = "https://github.com/databrickslabs/pytester"
Expand Down
5 changes: 4 additions & 1 deletion src/databricks/labs/pytester/fixtures/compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ def create(
cluster_size: str | None = None,
max_num_clusters: int = 1,
enable_serverless_compute: bool = False,
tags: list[EndpointTagPair] = [],
**kwargs,
) -> Wait[GetWarehouseResponse]:
if warehouse_name is None:
Expand All @@ -348,7 +349,9 @@ def create(
if cluster_size is None:
cluster_size = "2X-Small"

remove_after_tags = EndpointTags(custom_tags=[EndpointTagPair(key="RemoveAfter", value=watchdog_remove_after)])
remove_after_tags = EndpointTags(
custom_tags=[EndpointTagPair(key="RemoveAfter", value=watchdog_remove_after)] + tags
)
return ws.warehouses.create(
name=warehouse_name,
cluster_size=cluster_size,
Expand Down
8 changes: 8 additions & 0 deletions tests/integration/fixtures/test_compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from databricks.sdk import WorkspaceClient
from databricks.sdk.service.iam import PermissionLevel
from databricks.sdk.service.jobs import RunResultState, SparkPythonTask
from databricks.sdk.service.sql import EndpointTagPair

from databricks.labs.pytester.fixtures.watchdog import TEST_RESOURCE_PURGE_TIMEOUT

Expand Down Expand Up @@ -55,6 +56,13 @@ def test_warehouse_has_remove_after_tag(ws, make_warehouse):
assert warehouse_tags["custom_tags"][0]["key"] == "RemoveAfter"


def test_warehouse_has_custom_tag(ws, make_warehouse):
new_warehouse = make_warehouse(tags=[EndpointTagPair(key="my-custom-tag", value="my-custom-tag-value")])
created_warehouse = ws.warehouses.get(new_warehouse.response.id)
warehouse_tags = created_warehouse.tags.as_dict()
assert warehouse_tags["custom_tags"][1]["key"] == "my-custom-tag"


def test_remove_after_tag_jobs(ws, env_or_skip, make_job):
new_job = make_job()
created_job = ws.jobs.get(new_job.job_id)
Expand Down
Loading