Skip to content
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

Plugin version comparison should work for all cases #599

Merged
merged 5 commits into from
Oct 16, 2020
Merged

Plugin version comparison should work for all cases #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a30714
Plugin version comparison should work for all cases
xen0l Oct 16, 2020
279b047
Plugin version comparison should work for all cases
xen0l Oct 16, 2020
5c254e0
Add dependency on packaging
xen0l Oct 16, 2020
a634bdd
Change version number
xen0l Oct 16, 2020
8e79d1c
Add more test version numbers
xen0l Oct 16, 2020
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
5 changes: 2 additions & 3 deletions aws_gate/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import os
from subprocess import PIPE

from packaging.version import parse as parse_version
from wrapt import decorator

from aws_gate.constants import PLUGIN_INSTALL_PATH, PLUGIN_NAME
Expand Down Expand Up @@ -43,9 +44,7 @@ def wrapper(
required_version,
)

if version and int(version.replace(".", "")) < int(
required_version.replace(".", "")
):
if version and parse_version(version) < parse_version(required_version):
raise ValueError("Invalid plugin version: {}".format(version))

return wrapped_function(*args, **kwargs)
Expand Down
5 changes: 3 additions & 2 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
boto3~=1.15.15
cryptography==3.1.1
marshmallow==3.8.0
packaging==20.4
PyYAML>=5.1,<5.4
requests==2.24.0
cryptography==3.1.1
wrapt==1.12.1
unix-ar==0.2.1
wrapt==1.12.1
10 changes: 6 additions & 4 deletions tests/unit/test_decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ def test_function():
test_function()


def test_plugin_version(mocker):
m = mocker.patch("aws_gate.decorators.execute_plugin", return_value="1.1.23.0")
@pytest.mark.parametrize("version", ["1.1.23.0", "1.2.7.0"])
def test_plugin_version(mocker, version):
m = mocker.patch("aws_gate.decorators.execute_plugin", return_value=version)

@plugin_version("1.1.23.0")
def test_function():
Expand All @@ -52,10 +53,11 @@ def test_function():
assert m.call_args == mocker.call(["--version"], stdout=PIPE, stderr=PIPE)


def test_plugin_version_bad_version(mocker):
@pytest.mark.parametrize("version", ["1.1.25.0", "1.2.7.0"])
def test_plugin_version_bad_version(mocker, version):
mocker.patch("aws_gate.decorators.execute_plugin", return_value="1.1.23.0")

@plugin_version("1.1.25.0")
@plugin_version(version)
def test_function():
return "executed"

Expand Down