insight-plugin 1.7.0__tar.gz → 1.7.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (154) hide show
  1. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/PKG-INFO +3 -2
  2. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/README.md +2 -1
  3. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/__init__.py +1 -1
  4. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/__pycache__/__init__.cpython-39.pyc +0 -0
  5. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/help/help_util.py +10 -6
  6. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/refresh/controller.py +8 -0
  7. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/sdk_bump/controller.py +9 -0
  8. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/Dockerfile.jinja +21 -8
  9. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/setup.py.jinja +6 -2
  10. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin.egg-info/PKG-INFO +3 -2
  11. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/pyproject.toml +3 -1
  12. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/LICENSE +0 -0
  13. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/__main__.py +0 -0
  14. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/constants.py +0 -0
  15. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/__init__.py +0 -0
  16. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/analysis/__init__.py +0 -0
  17. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/analysis/controller.py +0 -0
  18. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/__init__.py +0 -0
  19. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/builder.py +0 -0
  20. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/checksum_util.py +0 -0
  21. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/command_line_util.py +0 -0
  22. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/common_feature.py +0 -0
  23. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/docker_util.py +0 -0
  24. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/dockerspec.py +0 -0
  25. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/exceptions.py +0 -0
  26. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/logging_util.py +0 -0
  27. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/plugin_spec_util.py +0 -0
  28. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/schema_util.py +0 -0
  29. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/temp_file_util.py +0 -0
  30. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/common/template_util.py +0 -0
  31. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/__init__.py +0 -0
  32. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/controller.py +0 -0
  33. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/help/__init__.py +0 -0
  34. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/help/constants.py +0 -0
  35. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/help/help_util.py +0 -0
  36. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/manifest_util.py +0 -0
  37. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/models/__init__.py +0 -0
  38. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/models/actions_schema.py +0 -0
  39. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/models/connection_schema.py +0 -0
  40. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/models/plugin_schem.py +0 -0
  41. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/models/util_schema.py +0 -0
  42. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/connector_to_plugin/util.py +0 -0
  43. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/__init__.py +0 -0
  44. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/controller.py +0 -0
  45. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/help/__init__.py +0 -0
  46. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/help/components.py +0 -0
  47. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/help/connection_help.py +0 -0
  48. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/help/constants.py +0 -0
  49. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/help/input_output_helpers.py +0 -0
  50. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/json_generation_util.py +0 -0
  51. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/plugin_to_helpmd.py +0 -0
  52. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/create/util.py +0 -0
  53. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/export/__init__.py +0 -0
  54. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/export/controller.py +0 -0
  55. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/export/util/__init__.py +0 -0
  56. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/export/util/util.py +0 -0
  57. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/linter/__init__.py +0 -0
  58. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/linter/controller.py +0 -0
  59. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/refresh/__init__.py +0 -0
  60. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/run/__init__.py +0 -0
  61. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/run/bash_controller.py +0 -0
  62. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/run/run_controller.py +0 -0
  63. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/run/server_controller.py +0 -0
  64. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/samples/__init__.py +0 -0
  65. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/samples/controller.py +0 -0
  66. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/samples/util/__init__.py +0 -0
  67. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/samples/util/constants.py +0 -0
  68. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/samples/util/util.py +0 -0
  69. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/sdk_bump/__init__.py +0 -0
  70. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/sdk_bump/util/__init__.py +0 -0
  71. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/sdk_bump/util/yaml_util.py +0 -0
  72. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/validate/__init__.py +0 -0
  73. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/features/validate/controller.py +0 -0
  74. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/.dockerignore.jinja +0 -0
  75. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/Makefile.jinja +0 -0
  76. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/__init__.py +0 -0
  77. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/assessment/assessment.jinja +0 -0
  78. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/bin/plugin.jinja +0 -0
  79. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/.dockerignore.jinja +0 -0
  80. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/Dockerfile.jinja +0 -0
  81. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/__init__.py.jinja +0 -0
  82. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/actions/__init__.py.jinja +0 -0
  83. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/actions/action/__init__.py.jinja +0 -0
  84. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/actions/action/action.py.jinja +0 -0
  85. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/actions/action/schema.py.jinja +0 -0
  86. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/connection/__init__.py.jinja +0 -0
  87. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/connection/connection.py.jinja +0 -0
  88. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/connection/schema.py.jinja +0 -0
  89. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/images/extension.png +0 -0
  90. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/images/icon.png +0 -0
  91. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/requirements.txt.jinja +0 -0
  92. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/setup.py.jinja +0 -0
  93. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/util/__init__.py.jinja +0 -0
  94. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/connector/util/icon_plugin_wrapper.py.jinja +0 -0
  95. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/__init__.py.jinja +0 -0
  96. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/actions/__init__.py.jinja +0 -0
  97. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/actions/action/__init__.py.jinja +0 -0
  98. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/actions/action/action.py.jinja +0 -0
  99. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/actions/action/schema.py.jinja +0 -0
  100. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/connection/__init__.py.jinja +0 -0
  101. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/connection/connection.py.jinja +0 -0
  102. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/connection/schema.py.jinja +0 -0
  103. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/tasks/__init__.py.jinja +0 -0
  104. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/tasks/task/__init__.py.jinja +0 -0
  105. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/tasks/task/schema.py.jinja +0 -0
  106. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/tasks/task/task.py.jinja +0 -0
  107. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/triggers/__init__.py.jinja +0 -0
  108. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/triggers/trigger/__init__.py.jinja +0 -0
  109. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/triggers/trigger/schema.py.jinja +0 -0
  110. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/triggers/trigger/trigger.py.jinja +0 -0
  111. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/plugin/util/__init__.py.jinja +0 -0
  112. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/requirements.txt.jinja +0 -0
  113. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/unit_test/__init__.py.jinja +0 -0
  114. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin/templates/unit_test/test_action.py.jinja +0 -0
  115. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin.egg-info/SOURCES.txt +0 -0
  116. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin.egg-info/dependency_links.txt +0 -0
  117. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin.egg-info/entry_points.txt +0 -0
  118. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin.egg-info/requires.txt +0 -0
  119. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/insight_plugin.egg-info/top_level.txt +0 -0
  120. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/setup.cfg +0 -0
  121. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/setup.py +0 -0
  122. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/__init__.py +0 -0
  123. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/__init__.py +0 -0
  124. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/__init__.py +0 -0
  125. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/__init__.py +0 -0
  126. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/__init__.py +0 -0
  127. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/decode/__init__.py +0 -0
  128. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/decode/action.py +0 -0
  129. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/decode/schema.py +0 -0
  130. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/encode/__init__.py +0 -0
  131. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/encode/action.py +0 -0
  132. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/actions/encode/schema.py +0 -0
  133. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/connection/__init__.py +0 -0
  134. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/connection/connection.py +0 -0
  135. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/connection/schema.py +0 -0
  136. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/triggers/__init__.py +0 -0
  137. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/komand_base64/util/__init__.py +0 -0
  138. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/setup.py +0 -0
  139. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/unit_test/__init__.py +0 -0
  140. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/resources/export_test_base64/unit_test/test_encode.py +0 -0
  141. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test.py +0 -0
  142. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_checksum.py +0 -0
  143. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_create.py +0 -0
  144. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_export.py +0 -0
  145. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_gen_samples.py +0 -0
  146. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_help_creation.py +0 -0
  147. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_json_generate.py +0 -0
  148. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_refresh.py +0 -0
  149. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_run.py +0 -0
  150. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_schema.py +0 -0
  151. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_spec_order.py +0 -0
  152. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_temp_file_util.py +0 -0
  153. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/test_validate.py +0 -0
  154. {insight_plugin-1.7.0 → insight_plugin-1.7.2}/tests/util.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: insight_plugin
3
- Version: 1.7.0
3
+ Version: 1.7.2
4
4
  Summary: Plugin tooling for the Rapid7 Insight platform
5
5
  Home-page: https://github.com/rapid7/insight-plugin
6
6
  Author: Rapid7 Integrations Alliance
@@ -47,7 +47,8 @@ via the import functionality in the InsightConnect UI.
47
47
  Refresh the plugin.
48
48
 
49
49
  This command will update the current plugin code,
50
- when updates are made in the plugin.spec.yaml file
50
+ when updates are made in the plugin.spec.yaml file,
51
+ and will also run 'black' to format the code.
51
52
 
52
53
  ### Validate
53
54
  Validate / Run checks against the plugin.
@@ -29,7 +29,8 @@ via the import functionality in the InsightConnect UI.
29
29
  Refresh the plugin.
30
30
 
31
31
  This command will update the current plugin code,
32
- when updates are made in the plugin.spec.yaml file
32
+ when updates are made in the plugin.spec.yaml file,
33
+ and will also run 'black' to format the code.
33
34
 
34
35
  ### Validate
35
36
  Validate / Run checks against the plugin.
@@ -1,7 +1,7 @@
1
1
  import os
2
2
  import sys
3
3
 
4
- VERSION = "1.7.0"
4
+ VERSION = "1.7.2"
5
5
  ROOT_DIR = os.path.dirname(
6
6
  os.path.abspath(__file__)
7
7
  ) # Python module root, ex. insight-plugin/insight_plugin/
@@ -1,15 +1,17 @@
1
1
  import copy
2
2
  import json
3
+ import re
3
4
 
4
5
  from insight_plugin.features.create.help.constants import TableHeaders
5
6
  from insight_plugin.features.common.plugin_spec_util import PluginSpecConstants
6
7
  from mdutils.mdutils import MdUtils
7
8
 
8
9
 
9
- class CustomJSONEncoder(json.JSONEncoder):
10
- def encode(self, obj): # pylint: disable=arguments-renamed
11
- json_string = super().encode(obj)
12
- return json_string.replace("true", "True").replace("false", "False")
10
+ def fix_json_bool(json_string):
11
+ # json_dumps converts uppercase booleans to lowercase during refresh, this reverts only whole words 'true' and 'false' back to what it was prior
12
+ json_string = re.sub(r'\btrue\b(?!\s\w)', 'True', json_string)
13
+ json_string = re.sub(r'\bfalse\b(?!\s\w)', 'False', json_string)
14
+ return json_string
13
15
 
14
16
 
15
17
  class HelpUtil:
@@ -80,8 +82,10 @@ class HelpUtil:
80
82
 
81
83
  for index, value in enumerate(next_row):
82
84
  if isinstance(value, list):
83
- # The CustomJSONEncoder class will convert all booleans back to what they were, prior to json.dumps (True and False stays True and False)
84
- next_row[index] = json.dumps(value, cls=CustomJSONEncoder)
85
+ json_encoded_value = json.dumps(value)
86
+ if isinstance(json_encoded_value, str):
87
+ # `fix_json_bool` will revert any booleans back to what they were prior to refresh
88
+ next_row[index] = fix_json_bool(json_encoded_value)
85
89
  starting_list.extend(next_row)
86
90
 
87
91
  return starting_list
@@ -1,4 +1,5 @@
1
1
  import os
2
+ from pathlib import Path
2
3
  from typing import Optional
3
4
  from insight_plugin import ROOT_DIR, FILE_ENCODING
4
5
  from insight_plugin.features.common.plugin_spec_util import (
@@ -66,6 +67,13 @@ class RefreshController(CommonFeature):
66
67
  )
67
68
 
68
69
  util.handle_refresh_create(spec, target_dir, is_create=False, ignore=ignore)
70
+
71
+ # Stores path of 'pyproject.toml' so it is runnable on any device
72
+ script_dir = Path(__file__).resolve().parent
73
+ project_root = script_dir.parents[2]
74
+ config_path = project_root / "pyproject.toml"
75
+ os.system(f"black --config {config_path} {self.target_dir} .") # nosec B605
76
+
69
77
  util.create_checksum(spec, target_dir)
70
78
 
71
79
  print("Refresh process complete!")
@@ -1,3 +1,5 @@
1
+ import os
2
+ from pathlib import Path
1
3
  from insight_plugin.features.common.common_feature import CommonFeature
2
4
  from insight_plugin.features.common.plugin_spec_util import PluginSpecUtil
3
5
  from insight_plugin.features.sdk_bump.util.yaml_util import YamlUtil
@@ -64,6 +66,13 @@ class SDKController(CommonFeature):
64
66
  util.handle_refresh_create(
65
67
  spec, self.target_dir, is_create=False, ignore=["unit_test"]
66
68
  )
69
+
70
+ # Stores path of 'pyproject.toml' so it is runnable on any device
71
+ script_dir = Path(__file__).resolve().parent
72
+ project_root = script_dir.parents[2]
73
+ config_path = project_root / "pyproject.toml"
74
+ os.system(f"black --config {config_path} {self.target_dir} .") # nosec B605
75
+
67
76
  util.create_checksum(spec, self.target_dir)
68
77
 
69
78
  print("SDK Bump complete!")
@@ -1,28 +1,41 @@
1
- FROM --platform=linux/amd64 {{ sdk_type }}:{{ sdk_version }}
1
+ FROM --platform=linux/amd64 {{ sdk_type }}:{{ sdk_version }} AS builder
2
+
3
+ WORKDIR /python/src
4
+
5
+ ADD ./plugin.spec.yaml /plugin.spec.yaml
6
+ ADD ./requirements.txt /python/src/requirements.txt
7
+ ADD . /python/src
2
8
 
3
- LABEL organization={{ vendor }}
4
- LABEL sdk=python
5
9
  {% if packages %}
6
10
  RUN {{ install_package_command }}{% for package in packages %} {{ package }}{% endfor %}{% if "slim" in sdk_type %} -y{% endif %}
7
11
  {% endif %}
12
+
13
+ RUN pip install .
14
+ RUN pip uninstall -y setuptools
15
+
16
+ FROM --platform=linux/amd64 {{ sdk_type }}:{{ sdk_version }}
17
+
18
+ LABEL organization={{ vendor }}
19
+ LABEL sdk=python
20
+
8
21
  WORKDIR /python/src
9
22
 
23
+ COPY --from=builder /python/src /python/src
24
+
10
25
  {%- if custom_cmd %}{{ "\n" }}
11
26
  {%- for cmd in custom_cmd %}
12
27
  {{ cmd }}
13
28
  {%- endfor %}
14
29
  {%- endif %}
15
30
 
16
- ADD ./plugin.spec.yaml /plugin.spec.yaml
17
- ADD ./requirements.txt /python/src/requirements.txt
18
31
 
19
32
  RUN if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
20
33
 
21
- ADD . /python/src
34
+ ENV PYTHONPATH="/python/src:${PYTHONPATH}"
22
35
 
23
- RUN pip install .
36
+ RUN rm -rf /root/.cache;
24
37
 
25
38
  # User to run plugin code. The two supported users are: root, nobody
26
39
  USER {{ user }}
27
40
 
28
- ENTRYPOINT ["/usr/local/bin/{{prefix}}_{{ plugin_name }}"]
41
+ ENTRYPOINT ["python", "/python/src/bin/{{prefix}}_{{ plugin_name }}"]
@@ -10,5 +10,9 @@ setup(name="{{ name }}-{{ vendor }}-plugin",
10
10
  url="",
11
11
  packages=find_packages(),
12
12
  install_requires=['{{ base_package }}'], # Add third-party dependencies to requirements.txt, not here!
13
- scripts=['bin/{{prefix}}_{{ name }}']
14
- )
13
+ entry_points={
14
+ "console_scripts": [
15
+ '{{prefix}}_{{ name }} = bin.{{prefix}}_{{ name }}:main'
16
+ ]
17
+ }
18
+ )
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: insight-plugin
3
- Version: 1.7.0
3
+ Version: 1.7.2
4
4
  Summary: Plugin tooling for the Rapid7 Insight platform
5
5
  Home-page: https://github.com/rapid7/insight-plugin
6
6
  Author: Rapid7 Integrations Alliance
@@ -47,7 +47,8 @@ via the import functionality in the InsightConnect UI.
47
47
  Refresh the plugin.
48
48
 
49
49
  This command will update the current plugin code,
50
- when updates are made in the plugin.spec.yaml file
50
+ when updates are made in the plugin.spec.yaml file,
51
+ and will also run 'black' to format the code.
51
52
 
52
53
  ### Validate
53
54
  Validate / Run checks against the plugin.
@@ -1,5 +1,7 @@
1
1
  [tool.black]
2
- exclude = '/(tests/resources)/'
2
+ line-length = 120
3
+ target-version = ['py36', 'py37', 'py38']
4
+ exclude = '(ec2_investigations)'
3
5
 
4
6
  [project]
5
7
  name = "insight-plugin"
File without changes
File without changes
File without changes