Skip to content

fix(cloud): push project libraries when using --push in cloud commands #725

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
pcbeingused333 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(cloud): push project libraries when using --push in cloud commands #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions lean/components/cloud/cloud_project_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ def get_cloud_project(self, input: str, push: bool) -> QCProject:
local_path = Path.cwd() / input
if self._project_config_manager.try_get_project_config(local_path):
if push:
if not self._push_manager.push_projects([local_path]):
libraries = self._project_manager.get_project_libraries(local_path)
if not self._push_manager.push_projects([local_path], libraries):
raise PushFailedError(input)

cloud_id = self._project_config_manager.get_project_config(local_path).get("cloud-id")
Expand All @@ -94,7 +95,8 @@ def get_cloud_project(self, input: str, push: bool) -> QCProject:
if push:
local_path = self._project_manager.get_local_project_path(cloud_project.name, cloud_project.projectId)
if local_path.exists():
if not self._push_manager.push_projects([local_path]):
libraries = self._project_manager.get_project_libraries(local_path)
if not self._push_manager.push_projects([local_path], libraries):
raise PushFailedError(input)
return self._api_client.projects.get(cloud_project.projectId, organization_id)

Expand Down
31 changes: 27 additions & 4 deletions tests/components/cloud/test_cloud_project_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def test_get_cloud_project_pushing_new_project():
push_manager.push_projects = mock.Mock()

project_config = mock.Mock()
project_config.get = mock.MagicMock(return_value=cloud_project.projectId)
project_config.get = mock.MagicMock(side_effect=lambda key, default=None: cloud_project.projectId if key == "cloud-id" else default)
project_config.is_empty = mock.MagicMock(return_value=False)
project_config_manager = mock.Mock()
project_config_manager.try_get_project_config = mock.MagicMock(return_value=None)
Expand All @@ -51,7 +51,7 @@ def test_get_cloud_project_pushing_new_project():
assert created_cloud_project == cloud_project

api_client.projects.get.assert_called_with(cloud_project.projectId, "abc")
push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"])
push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"], [])


def test_get_cloud_project_raises_when_push_of_project_with_cloud_id_fails() -> None:
Expand All @@ -71,7 +71,7 @@ def test_get_cloud_project_raises_when_push_of_project_with_cloud_id_fails() ->
with pytest.raises(PushFailedError):
container.cloud_project_manager.get_cloud_project("Python Project", push=True)

push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"])
push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"], [])
api_client.projects.get.assert_not_called()


Expand All @@ -92,5 +92,28 @@ def test_get_cloud_project_raises_when_push_of_project_given_by_id_fails() -> No
with pytest.raises(PushFailedError):
container.cloud_project_manager.get_cloud_project(str(cloud_project.projectId), push=True)

push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"])
push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"], [])
api_client.projects.get.assert_not_called()


def test_get_cloud_project_pushing_project_also_pushes_its_libraries() -> None:
create_fake_lean_cli_directory()

cloud_project = create_api_project(1, "Python Project")
api_client = mock.Mock()
api_client.projects.get_all.return_value = [cloud_project]
api_client.projects.get.return_value = cloud_project

push_manager = mock.Mock()
push_manager.push_projects = mock.Mock(return_value=True)

initialize_container(api_client_to_use=api_client, push_manager_to_use=push_manager)

library_path = Path.cwd() / "Library" / "Python Library"
container.project_config_manager.get_project_config(Path.cwd() / "Python Project").set("cloud-id", cloud_project.projectId)
container.project_config_manager.get_project_config(Path.cwd() / "Python Project").set(
"libraries", [{"name": "Python Library", "path": str(library_path)}])

container.cloud_project_manager.get_cloud_project("Python Project", push=True)

push_manager.push_projects.assert_called_once_with([Path.cwd() / "Python Project"], [library_path.resolve()])
Loading