Merge pull request #194 from dbt-labs/fix/single-tenant-base-url

Author: b-per

src/dbt_jobs_as_code/client/__init__.py

@@ -42,7 +42,7 @@ def __init__(
             int, Dict[str, CustomEnvironmentVariablePayload]
         ] = {}
 
-        self.base_url = base_url
+        self.base_url = base_url.rstrip("/")
         self._headers = {
             "Authorization": f"Bearer {self._api_key}",
             "Content-Type": "application/json",
@@ -250,7 +250,7 @@ def _make_request(self, parameters: dict[str, Any]):
                     "401 Unauthorized -- Check your API key and dbt Cloud parameters"
                 )
 
-            return None
+            raise DBTCloudException(f"Error fetching jobs (HTTP {response.status_code})")
 
         return response.json()
 

tests/client/test_trailing_slash.py

@@ -0,0 +1,157 @@
+from unittest.mock import MagicMock
+
+import pytest
+
+from dbt_jobs_as_code.client import DBTCloud, DBTCloudException
+
+
+@pytest.fixture
+def job_api_response():
+    """Minimal valid job response from dbt Cloud API."""
+    return {
+        "data": {
+            "id": 123,
+            "account_id": 1,
+            "project_id": 1,
+            "environment_id": 1,
+            "name": "Test Job",
+            "execute_steps": ["dbt run"],
+            "settings": {"threads": 4, "target_name": "prod"},
+            "triggers": {"github_webhook": False, "schedule": True},
+            "schedule": {"cron": "0 0 * * *"},
+            "state": 1,
+            "generate_docs": False,
+            "run_generate_sources": False,
+        }
+    }
+
+
+@pytest.fixture
+def jobs_list_api_response(job_api_response):
+    """Minimal valid jobs list response from dbt Cloud API."""
+    return {
+        "data": [job_api_response["data"]],
+        "extra": {
+            "filters": {"limit": 100, "offset": 0},
+            "pagination": {"total_count": 1},
+        },
+    }
+
+
+@pytest.mark.parametrize(
+    "base_url",
+    [
+        "https://cloud.getdbt.com/",
+        "https://custom.us1.dbt.com/",
+        "https://cloud.getdbt.com///",
+    ],
+)
+class TestTrailingSlashInBaseUrl:
+    def test_get_job_url_has_no_double_slash(self, base_url, job_api_response):
+        client = DBTCloud(account_id=1, api_key="test", base_url=base_url)
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = job_api_response
+        client._session.get = MagicMock(return_value=mock_response)
+
+        client.get_job(job_id=456)
+
+        called_url = client._session.get.call_args[1].get(
+            "url",
+            client._session.get.call_args[0][0] if client._session.get.call_args[0] else None,
+        )
+        assert "//" not in called_url.split("://")[1], f"Double slash in URL: {called_url}"
+
+    def test_get_jobs_url_has_no_double_slash(self, base_url, jobs_list_api_response):
+        client = DBTCloud(account_id=1, api_key="test", base_url=base_url)
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = jobs_list_api_response
+        client._session.get = MagicMock(return_value=mock_response)
+
+        client.get_jobs(project_ids=[1])
+
+        called_url = client._session.get.call_args[1].get(
+            "url",
+            client._session.get.call_args[0][0] if client._session.get.call_args[0] else None,
+        )
+        assert "//" not in called_url.split("://")[1], f"Double slash in URL: {called_url}"
+
+    def test_update_job_url_has_no_double_slash(self, base_url, job_api_response):
+        client = DBTCloud(account_id=1, api_key="test", base_url=base_url)
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = job_api_response
+        client._session.post = MagicMock(return_value=mock_response)
+
+        from dbt_jobs_as_code.schemas.job import JobDefinition
+
+        job = JobDefinition(**job_api_response["data"])
+        job.identifier = "test_job"
+        client.update_job(job=job)
+
+        called_url = client._session.post.call_args[1].get(
+            "url",
+            client._session.post.call_args[0][0] if client._session.post.call_args[0] else None,
+        )
+        assert "//" not in called_url.split("://")[1], f"Double slash in URL: {called_url}"
+
+    def test_delete_job_url_has_no_double_slash(self, base_url, job_api_response):
+        client = DBTCloud(account_id=1, api_key="test", base_url=base_url)
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        client._session.delete = MagicMock(return_value=mock_response)
+
+        from dbt_jobs_as_code.schemas.job import JobDefinition
+
+        job = JobDefinition(**job_api_response["data"])
+        client.delete_job(job=job)
+
+        called_url = client._session.delete.call_args[1].get(
+            "url",
+            client._session.delete.call_args[0][0]
+            if client._session.delete.call_args[0]
+            else None,
+        )
+        assert "//" not in called_url.split("://")[1], f"Double slash in URL: {called_url}"
+
+    def test_create_job_url_has_no_double_slash(self, base_url, job_api_response):
+        client = DBTCloud(account_id=1, api_key="test", base_url=base_url)
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = job_api_response
+        client._session.post = MagicMock(return_value=mock_response)
+
+        from dbt_jobs_as_code.schemas.job import JobDefinition
+
+        job = JobDefinition(**job_api_response["data"])
+        job.identifier = "test_job"
+        client.create_job(job=job)
+
+        called_url = client._session.post.call_args[1].get(
+            "url",
+            client._session.post.call_args[0][0] if client._session.post.call_args[0] else None,
+        )
+        assert "//" not in called_url.split("://")[1], f"Double slash in URL: {called_url}"
+
+
+class TestGetJobsErrorHandling:
+    """get_jobs silently swallows non-401 errors, returning an empty list.
+
+    If a malformed URL (e.g. double-slash from trailing slash in base_url)
+    causes the API to return 404, the tool silently proceeds with zero cloud
+    jobs, treating every YAML job as new (CREATE instead of UPDATE).
+    """
+
+    @pytest.mark.parametrize("status_code", [401, 403, 404, 500, 502])
+    def test_get_jobs_raises_on_api_error(self, status_code):
+        client = DBTCloud(account_id=1, api_key="test", base_url="https://cloud.getdbt.com")
+        mock_response = MagicMock()
+        mock_response.status_code = status_code
+        mock_response.json.return_value = {
+            "status": {"code": status_code, "user_message": "error"}
+        }
+        client._session.get = MagicMock(return_value=mock_response)
+
+        with pytest.raises(DBTCloudException):
+            client.get_jobs(project_ids=[1])