Skip to content

fix(cloud): Preserve the stored draft envelope when renaming builder definitions #1391

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

Merged
Aaron ("AJ") Steers (aaronsteers) merged 2 commits into from
Oct 16, 2026
Merged

fix(cloud): Preserve the stored draft envelope when renaming builder definitions #1391

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
073a02e
fix(cloud): Preserve the stored draft envelope when renaming builder …
devin-ai-integration[bot] Oct 16, 2026
f1899a1
chore: Retrigger CI after transient Cloud API 502
devin-ai-integration[bot] Oct 16, 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
2 changes: 1 addition & 1 deletion airbyte/cloud/connectors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ def rename(self, name: str) -> CustomCloudSourceDefinition:
assert builder_project_id is not None
builder_project = project["builderProject"]
draft_manifest = (
_unwrap_builder_manifest(project["declarativeManifest"]["manifest"])
project["declarativeManifest"]["manifest"]
if builder_project.get("hasDraft")
else None
)
Expand Down
25 changes: 21 additions & 4 deletions tests/unit_tests/test_cloud_credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,15 +718,32 @@ def test_custom_cloud_source_definition_builder_url_uses_owner_workspace(


@pytest.mark.parametrize(
("has_draft", "expected_draft_manifest"),
("has_draft", "stored_manifest", "expected_draft_manifest"),
[
pytest.param(True, {"version": "0.1.0"}, id="preserves-draft"),
pytest.param(False, None, id="no-draft"),
pytest.param(
True, {"version": "0.1.0"}, {"version": "0.1.0"}, id="preserves-draft"
),
pytest.param(False, {"version": "0.1.0"}, None, id="no-draft"),
pytest.param(
True,
{
"manifest": {"version": "0.1.0", "streams": []},
"spec": {"connection_specification": {}},
"version": "0.1.0",
},
{
"manifest": {"version": "0.1.0", "streams": []},
"spec": {"connection_specification": {}},
"version": "0.1.0",
},
id="preserves-envelope-draft",
),
],
)
def test_custom_cloud_source_definition_rename_preserves_builder_data(
monkeypatch: pytest.MonkeyPatch,
has_draft: bool,
stored_manifest: dict[str, object],
expected_draft_manifest: dict[str, object] | None,
) -> None:
workspace = CloudWorkspace(
Expand All @@ -739,7 +756,7 @@ def test_custom_cloud_source_definition_rename_preserves_builder_data(
"hasDraft": has_draft,
"componentsFileContent": "components: []",
},
"declarativeManifest": {"manifest": {"version": "0.1.0"}},
"declarativeManifest": {"manifest": stored_manifest},
}
builder_lookup = MagicMock(
return_value={
Expand Down
Loading