Subnet - (SDK Automation prep) (#3273) (#3274)

rmurray-r7 · web-flow · commit ab33927933c3 · 2025-03-06T16:02:07.000Z
* Subnet - (SDK Automation prep)

* Fix HelpValidator
diff --git a/plugins/subnet/.CHECKSUM b/plugins/subnet/.CHECKSUM
@@ -1,15 +1,15 @@
 {
-	"spec": "f73e684f15095a178d94c8fe8845adcc",
-	"manifest": "de8e1fab8541c0af02f166138f01c74f",
-	"setup": "488c85f865c046294bb203623a68c8db",
+	"spec": "ac704038478670ceb0369abbe42aa4cf",
+	"manifest": "c41546592ab30b9f259d6b056f484bfb",
+	"setup": "08117154aef8ff2e244100b046854e91",
 	"schemas": [
 		{
 			"identifier": "calculate/schema.py",
-			"hash": "379cf1d7ae32806000cbad209eba9e40"
+			"hash": "a17426ab91580ae07df6b6a5f45637bf"
 		},
 		{
 			"identifier": "check_address_in_subnet/schema.py",
-			"hash": "d52a07aad372013e2f755cd785f85140"
+			"hash": "19a1dabe7fa1a9ff3abe613089169ffa"
 		},
 		{
 			"identifier": "connection/schema.py",
diff --git a/plugins/subnet/Dockerfile b/plugins/subnet/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 rapid7/insightconnect-python-3-slim-plugin:6.1.3
+FROM --platform=linux/amd64 rapid7/insightconnect-python-3-slim-plugin:6.2.5
 
 LABEL organization=rapid7
 LABEL sdk=python
@@ -12,7 +12,7 @@ RUN if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
 ADD . /python/src
 
-RUN python setup.py build && python setup.py install
+RUN pip install .
 
 # User to run plugin code. The two supported users are: root, nobody
 USER nobody
diff --git a/plugins/subnet/bin/komand_subnet b/plugins/subnet/bin/komand_subnet
@@ -6,7 +6,7 @@ from sys import argv
 
 Name = "Subnet"
 Vendor = "rapid7"
-Version = "2.0.1"
+Version = "2.0.2"
 Description = "The Subnet plugin takes input as a network in CIDR notation and returns useful information, such as the number of hosts, the ID, host address range, and broadcast address"
 
 
diff --git a/plugins/subnet/help.md b/plugins/subnet/help.md
@@ -27,7 +27,7 @@ The Subnet plugin takes input as a network in CIDR notation and returns useful i
 
 #### Calculate
 
-This action is used to return subnet information for IP and Netmask
+This action is used to return Subnet information for IP and Netmask
 
 ##### Input
 
@@ -79,14 +79,14 @@ Example output:
 
 #### Check Address in Subnet
 
-This action is used to determine if the provided IP address is in the subnet
+This action is used to determine if the provided IP address is in the Subnet
 
 ##### Input
 
 |Name|Type|Default|Required|Description|Enum|Example|Placeholder|Tooltip|
 | :--- | :--- | :--- | :--- | :--- | :--- | :--- | :--- | :--- |
 |ip_address|string|None|True|The IP address|None|198.51.100.100|None|None|
-|subnet|string|None|True|The subnet in CIDR notation or Netmask|None|198.51.100.0/24|None|None|
+|subnet|string|None|True|The Subnet in CIDR notation or Netmask|None|198.51.100.0/24|None|None|
   
 Example input:
 
@@ -123,10 +123,11 @@ Example output:
 
 ## Troubleshooting
 
-The number of hosts per network does not include the ID and broadcast address. However, the number of network does include the all-ones and all-zeros network.
+* The number of hosts per network does not include the ID and broadcast address. However, the number of network does include the all-ones and all-zeros network.
 
 # Version History
 
+* 2.0.2 - Updated SDK to the latest version (6.2.5)
 * 2.0.1 - Initial updates for fedramp compliance | Updated SDK to the latest version
 * 2.0.0 - Add new action Check Address in Subnet | Code refactor
 * 1.0.2 - New spec and help.md format for the Extension Library
diff --git a/plugins/subnet/komand_subnet/actions/calculate/schema.py b/plugins/subnet/komand_subnet/actions/calculate/schema.py
@@ -4,7 +4,7 @@
 
 
 class Component:
-    DESCRIPTION = "Return subnet information for IP and Netmask"
+    DESCRIPTION = "Return Subnet information for IP and Netmask"
 
 
 class Input:
diff --git a/plugins/subnet/komand_subnet/actions/check_address_in_subnet/schema.py b/plugins/subnet/komand_subnet/actions/check_address_in_subnet/schema.py
@@ -4,7 +4,7 @@
 
 
 class Component:
-    DESCRIPTION = "Determine if the provided IP address is in the subnet"
+    DESCRIPTION = "Determine if the provided IP address is in the Subnet"
 
 
 class Input:
@@ -31,7 +31,7 @@ class CheckAddressInSubnetInput(insightconnect_plugin_runtime.Input):
     "subnet": {
       "type": "string",
       "title": "Subnet",
-      "description": "The subnet in CIDR notation or Netmask",
+      "description": "The Subnet in CIDR notation or Netmask",
       "order": 2
     }
   },
diff --git a/plugins/subnet/plugin.spec.yaml b/plugins/subnet/plugin.spec.yaml
@@ -3,52 +3,57 @@ extension: plugin
 products: [insightconnect]
 name: subnet
 title: Subnet
-description: The Subnet plugin takes input as a network in CIDR notation and returns useful information, such as the number of hosts, the ID, host address range, and broadcast address
-version: 2.0.1
+description: The Subnet plugin takes input as a network in CIDR notation and returns
+  useful information, such as the number of hosts, the ID, host address range, and
+  broadcast address
+version: 2.0.2
 connection_version: 2
 fedramp_ready: true
 vendor: rapid7
 support: community
-supported_versions: ["2024-10-09"]
+supported_versions: ['2024-10-09']
 status: []
 resources:
   source_url: https://github.com/rapid7/insightconnect-plugins/tree/master/plugins/subnet
   license_url: https://github.com/rapid7/insightconnect-plugins/blob/master/LICENSE
 tags:
-  - subnet
-  - ip
-  - netmask
-  - network
-  - utilities
+- subnet
+- ip
+- netmask
+- network
+- utilities
 hub_tags:
   use_cases: [data_utility, threat_detection_and_response]
   keywords: [subnet, ip_address]
   features: []
 sdk:
   type: slim
-  version: 6.1.3
+  version: 6.2.5
   user: nobody
 key_features:
-  - "Returns network information about CIDR"
-troubleshooting: The number of hosts per network does not include the ID and broadcast address. However, the number of network does include the all-ones and all-zeros network.
+- Returns network information about CIDR
+troubleshooting:
+- The number of hosts per network does not include the ID and broadcast address. However,
+  the number of network does include the all-ones and all-zeros network.
 version_history:
-  - "2.0.1 - Initial updates for fedramp compliance | Updated SDK to the latest version"
-  - "2.0.0 - Add new action Check Address in Subnet | Code refactor"
-  - "1.0.2 - New spec and help.md format for the Extension Library"
-  - "1.0.1 - Add `utilities` plugin tag for Marketplace searchability"
-  - "1.0.0 - Update to v2 Python plugin architecture | Support web server mode"
-  - "0.1.1 - SSL bug fix in SDK"
-  - "0.1.0 - Initial plugin"
+- 2.0.2 - Updated SDK to the latest version (6.2.5)
+- 2.0.1 - Initial updates for fedramp compliance | Updated SDK to the latest version
+- 2.0.0 - Add new action Check Address in Subnet | Code refactor
+- 1.0.2 - New spec and help.md format for the Extension Library
+- 1.0.1 - Add `utilities` plugin tag for Marketplace searchability
+- 1.0.0 - Update to v2 Python plugin architecture | Support web server mode
+- 0.1.1 - SSL bug fix in SDK
+- 0.1.0 - Initial plugin
 links:
-  - "[Subnetwork](https://en.wikipedia.org/wiki/Subnetwork)"
-  - "[Python IPCalc](https://github.com/tehmaze/ipcalc)"
+- '[Subnetwork](https://en.wikipedia.org/wiki/Subnetwork)'
+- '[Python IPCalc](https://github.com/tehmaze/ipcalc)'
 references:
-  - "[Subnetwork](https://en.wikipedia.org/wiki/Subnetwork)"
-  - "[Python IPCalc](https://github.com/tehmaze/ipcalc)"
+- '[Subnetwork](https://en.wikipedia.org/wiki/Subnetwork)'
+- '[Python IPCalc](https://github.com/tehmaze/ipcalc)'
 actions:
   calculate:
     title: Calculate
-    description: Return subnet information for IP and Netmask
+    description: Return Subnet information for IP and Netmask
     input:
       cidr:
         title: Network
@@ -125,7 +130,7 @@ actions:
         example: 192.168.1.255
   check_address_in_subnet:
     title: Check Address in Subnet
-    description: Determine if the provided IP address is in the subnet
+    description: Determine if the provided IP address is in the Subnet
     input:
       ip_address:
         title: IP Address
@@ -135,7 +140,7 @@ actions:
         example: 198.51.100.100
       subnet:
         title: Subnet
-        description: The subnet in CIDR notation or Netmask
+        description: The Subnet in CIDR notation or Netmask
         type: string
         required: true
         example: 198.51.100.0/24
diff --git a/plugins/subnet/setup.py b/plugins/subnet/setup.py
@@ -3,7 +3,7 @@
 
 
 setup(name="subnet-rapid7-plugin",
-      version="2.0.1",
+      version="2.0.2",
       description="The Subnet plugin takes input as a network in CIDR notation and returns useful information, such as the number of hosts, the ID, host address range, and broadcast address",
       author="rapid7",
       author_email="",

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,15 @@`
`1`	`1`	`{`
`2`		`- "spec": "f73e684f15095a178d94c8fe8845adcc",`
`3`		`- "manifest": "de8e1fab8541c0af02f166138f01c74f",`
`4`		`- "setup": "488c85f865c046294bb203623a68c8db",`
	`2`	`+ "spec": "ac704038478670ceb0369abbe42aa4cf",`
	`3`	`+ "manifest": "c41546592ab30b9f259d6b056f484bfb",`
	`4`	`+ "setup": "08117154aef8ff2e244100b046854e91",`
`5`	`5`	`"schemas": [`
`6`	`6`	`{`
`7`	`7`	`"identifier": "calculate/schema.py",`
`8`		`- "hash": "379cf1d7ae32806000cbad209eba9e40"`
	`8`	`+ "hash": "a17426ab91580ae07df6b6a5f45637bf"`
`9`	`9`	`},`
`10`	`10`	`{`
`11`	`11`	`"identifier": "check_address_in_subnet/schema.py",`
`12`		`- "hash": "d52a07aad372013e2f755cd785f85140"`
	`12`	`+ "hash": "19a1dabe7fa1a9ff3abe613089169ffa"`
`13`	`13`	`},`
`14`	`14`	`{`
`15`	`15`	`"identifier": "connection/schema.py",`