Skip to content

Commit

Permalink
Merge pull request #189 from rapid7/soar_18028_snyk
Browse files Browse the repository at this point in the history
[SOAR-18028] Bumping both requirements.txt (Snyk)
  • Loading branch information
rmurray-r7 authored Nov 5, 2024
2 parents beba72e + 2846033 commit c30609a
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ be on your way to contributing!

## Changelog

* 2.47.20 - Bumping `requests` in requirements.txt and bumping `ldap` in the `version_pin_validator` requirements.txt
* 2.47.19 - `VersionBumpValidator` - Fixed issue where validator failed if plugin contained no actions or triggers
* 2.47.18 - `HelpInputOutputValidator` | `SpecPropertiesValidator` - Update to enable `placeholder` and `tooltip` validation | `RuntimeValidator` - Added SDK version validation
* 2.47.17 - `SpecPropertiesValidator` - Added new excludeProduct field validator
Expand Down
2 changes: 1 addition & 1 deletion icon_validator/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "2.47.19"
VERSION = "2.47.20"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ validators==0.22.0
filetype==1.0.5
insightconnect-integrations-plugin-spec-tooling==1.3.2
parameterized==0.8.1
requests==2.31.0
requests==2.32.2
urlextract==0.14.0
typing==3.7.4.1
PyYAML==6.0.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"validators==0.22.0",
"filetype==1.0.5",
"insightconnect-integrations-plugin-spec-tooling==1.3.2",
"requests==2.31.0",
"requests==2.32.2",
"urlextract==0.14.0",
"typing==3.7.4.1",
"PyYAML==6.0.1",
Expand Down
2 changes: 1 addition & 1 deletion unit_test/plugin_examples/good_plugin_with_task/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rapid7/insightconnect-python-3-plugin:5
FROM rapid7/insightconnect-python-3-plugin:latest
LABEL organization=komand
LABEL sdk=python
LABEL type=plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ldap3~=1.2.3
ldap3~=2.9.1
20 changes: 10 additions & 10 deletions unit_test/test_validate_plugin/test_validate_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def test_version_pin_validator_should_fail_when_no_version_pin(self):

def test_version_pin_validator_should_fail_when_no_version_pin_in_one_of_multiple_version_first_test(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt",
"ldap3===1.2.3,ldap3xxxx1.2.3")
"ldap3===2.9.1,ldap3xxxx2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
Expand All @@ -180,31 +180,31 @@ def test_version_pin_validator_should_fail_when_no_version_pin_in_one_of_multipl

def test_version_pin_validator_should_fail_when_no_version_pin_in_one_of_multiple_version_second_test(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt",
"ldap3xxxx1.2.3,ldap3===1.2.3")
"ldap3xxxx2.9.1,ldap3===2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 1)

def test_version_pin_validator_should_success_when_three_equal(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3===1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3===2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_minority_sign(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3<1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3<2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_minority_equal_sign(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3<=1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3<=2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
Expand All @@ -221,39 +221,39 @@ def test_version_pin_validator_should_success_when_git(self):
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_majority_sign(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3>1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3>2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_majority_equal_sign(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3>=1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3>=2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_not_equal_sign(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3!=1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3!=2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_tilda_equal_sign(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3~=1.2.3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3~=2.9.1")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
result = validate(directory_to_test, file_to_test, False, True, [VersionPinValidator()])
self.assertEqual(result, 0)

def test_version_pin_validator_should_success_when_many_versions(self):
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3<1.2.3,ldap3==1-2-3")
self.replace_requirements("./plugin_examples/version_pin_validator/requirements.txt", "ldap3<2.9.1,ldap3==1-2-3")
# example workflow in plugin_examples directory. Run tests with these files
directory_to_test = "plugin_examples/version_pin_validator"
file_to_test = "plugin.spec.yaml"
Expand Down

0 comments on commit c30609a

Please sign in to comment.