Skip to content

Use cloudformation-cli-python-lib from PyPi #104

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
wbingli merged 1 commit into from
Jun 29, 2020
Merged

Use cloudformation-cli-python-lib from PyPi #104

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
17 changes: 0 additions & 17 deletions python/rpdk/python/codegen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,6 @@ def _build(self, base_path):
self._pip_build(base_path)
LOG.debug("Dependencies build finished")

@staticmethod
def _check_for_support_lib_sdist(base_path):
# TODO: remove this check (and exception) when published to PyPI
sdist = base_path / f"{SUPPORT_LIB_NAME}-0.0.1.tar.gz"
try:
sdist.resolve(strict=True)
except FileNotFoundError:
raise StandardDistNotFoundError(
f"Could not find packaged CloudFormation support library: {sdist}\n"
)

@staticmethod
def _make_pip_command(base_path):
return [
Expand All @@ -224,9 +213,6 @@ def _make_pip_command(base_path):
"--no-color",
"--disable-pip-version-check",
"--upgrade",
# TODO: remove find-links when published to PyPI
"--find-links",
str(base_path),
"--requirement",
str(base_path / "requirements.txt"),
"--target",
Expand All @@ -235,8 +221,6 @@ def _make_pip_command(base_path):

@classmethod
def _docker_build(cls, external_path):
cls._check_for_support_lib_sdist(external_path)

internal_path = PurePosixPath("/project")
command = " ".join(cls._make_pip_command(internal_path))
LOG.debug("command is '%s'", command)
Expand Down Expand Up @@ -275,7 +259,6 @@ def _docker_build(cls, external_path):

@classmethod
def _pip_build(cls, base_path):
cls._check_for_support_lib_sdist(base_path)
command = cls._make_pip_command(base_path)
LOG.debug("command is '%s'", command)

Expand Down
23 changes: 4 additions & 19 deletions tests/plugin/codegen_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
SUPPORT_LIB_NAME,
SUPPORT_LIB_PKG,
Python36LanguagePlugin as PythonLanguagePlugin,
StandardDistNotFoundError,
validate_no,
)

Expand Down Expand Up @@ -71,12 +70,6 @@ def test_validate_no(value, result):
assert validate_no(value) is result


def test__check_for_support_lib_sdist(tmp_path):
with pytest.raises(StandardDistNotFoundError):
PythonLanguagePlugin._check_for_support_lib_sdist(tmp_path)
# good path tested in generate


def test__remove_build_artifacts_file_found(tmp_path):
deps_path = tmp_path / "build"
deps_path.mkdir()
Expand Down Expand Up @@ -172,32 +165,28 @@ def test_package_pip(project):

def test__pip_build_executable_not_found(tmp_path):
executable_name = str(uuid4())
patch_sdist = patch.object(PythonLanguagePlugin, "_check_for_support_lib_sdist")
patch_cmd = patch.object(
PythonLanguagePlugin, "_make_pip_command", return_value=[executable_name]
)

with patch_sdist as mock_sdist, patch_cmd as mock_cmd:
with patch_cmd as mock_cmd:
with pytest.raises(DownstreamError) as excinfo:
PythonLanguagePlugin._pip_build(tmp_path)

mock_sdist.assert_called_once_with(tmp_path)
mock_cmd.assert_called_once_with(tmp_path)

assert isinstance(excinfo.value.__cause__, FileNotFoundError)


def test__pip_build_called_process_error(tmp_path):
patch_sdist = patch.object(PythonLanguagePlugin, "_check_for_support_lib_sdist")
patch_cmd = patch.object(
PythonLanguagePlugin, "_make_pip_command", return_value=["false"]
)

with patch_sdist as mock_sdist, patch_cmd as mock_cmd:
with patch_cmd as mock_cmd:
with pytest.raises(DownstreamError) as excinfo:
PythonLanguagePlugin._pip_build(tmp_path)

mock_sdist.assert_called_once_with(tmp_path)
mock_cmd.assert_called_once_with(tmp_path)

assert isinstance(excinfo.value.__cause__, CalledProcessError)
Expand Down Expand Up @@ -228,15 +217,13 @@ def test__build_docker(plugin):


def test__docker_build_good_path(plugin, tmp_path):
patch_sdist = patch.object(PythonLanguagePlugin, "_check_for_support_lib_sdist")
patch_from_env = patch("rpdk.python.codegen.docker.from_env", autospec=True)

with patch_sdist as mock_sdist, patch_from_env as mock_from_env:
with patch_from_env as mock_from_env:
mock_run = mock_from_env.return_value.containers.run
mock_run.return_value = [b"output\n\n"]
plugin._docker_build(tmp_path)

mock_sdist.assert_called_once_with(tmp_path)
mock_from_env.assert_called_once_with()
mock_run.assert_called_once_with(
image=ANY,
Expand All @@ -260,17 +247,15 @@ def test__docker_build_good_path(plugin, tmp_path):
],
)
def test__docker_build_bad_path(plugin, tmp_path, exception):
patch_sdist = patch.object(PythonLanguagePlugin, "_check_for_support_lib_sdist")
patch_from_env = patch("rpdk.python.codegen.docker.from_env", autospec=True)

with patch_sdist as mock_sdist, patch_from_env as mock_from_env:
with patch_from_env as mock_from_env:
mock_run = mock_from_env.return_value.containers.run
mock_run.side_effect = exception()

with pytest.raises(DownstreamError):
plugin._docker_build(tmp_path)

mock_sdist.assert_called_once_with(tmp_path)
mock_from_env.assert_called_once_with()
mock_run.assert_called_once_with(
image=ANY,
Expand Down