Update connectors

canonical · Jan 8, 2025 · d97b412 · d97b412
1 parent 980ba73
commit d97b412
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 21 deletions.
diff --git a/connector-template/charmcraft.yaml.j2 b/connector-template/charmcraft.yaml.j2
@@ -2,7 +2,7 @@
 # See LICENSE file for licensing details.
 
 name: opencti-{{ name }}-connector
-title: OpenCTI {{ display_name }} Charm
+title: OpenCTI {{ display_name_short }} Charm
 summary: OpenCTI {{ display_name }} charm.
 links:
   documentation: https://discourse.charmhub.io

diff --git a/connectors/cisa_kve/charmcraft.yaml → connectors/cisa_kev/charmcraft.yaml b/connectors/cisa_kve/charmcraft.yaml → connectors/cisa_kev/charmcraft.yaml
@@ -1,8 +1,8 @@
 # Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
-name: opencti-cisa-kve-connector
-title: OpenCTI CISA Known Exploited Vulnerabilities Charm
+name: opencti-cisa-kev-connector
+title: OpenCTI CISA KEV Charm
 summary: OpenCTI CISA Known Exploited Vulnerabilities charm.
 links:
   documentation: https://discourse.charmhub.io
@@ -62,10 +62,10 @@ parts:
   charm: {}
 
 containers:
-  opencti-cisa-kve-connector:
-    resource: opencti-cisa-kve-connector-image
+  opencti-cisa-kev-connector:
+    resource: opencti-cisa-kev-connector-image
 resources:
-  opencti-cisa-kve-connector-image:
+  opencti-cisa-kev-connector-image:
     type: oci-image
     description: OCI image for the OpenCTI CISA Known Exploited Vulnerabilities connector.
 

diff --git a/...ib/charms/opencti/v0/opencti_connector.py → ...ib/charms/opencti/v0/opencti_connector.py b/...ib/charms/opencti/v0/opencti_connector.py → ...ib/charms/opencti/v0/opencti_connector.py
diff --git a/connectors/cisa_kve/requirements.txt → connectors/cisa_kev/requirements.txt b/connectors/cisa_kve/requirements.txt → connectors/cisa_kev/requirements.txt
diff --git a/connectors/cisa_kve/rock/rockcraft.yaml → connectors/cisa_kev/rock/rockcraft.yaml b/connectors/cisa_kve/rock/rockcraft.yaml → connectors/cisa_kev/rock/rockcraft.yaml
@@ -1,7 +1,7 @@
 # Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
-name: opencti-cisa-kve-connector
+name: opencti-cisa-kev-connector
 base: [email protected]
 version: &version '6.4.5'
 summary: OpenCTI CISA Known Exploited Vulnerabilities Connector
@@ -12,7 +12,7 @@ platforms:
   amd64:
 
 parts:
-  cisa-kve-connector:
+  cisa-kev-connector:
     source: https://github.com/OpenCTI-Platform/connectors.git
     source-type: git
     source-tag: *version
@@ -29,9 +29,9 @@ parts:
       ls -lah
       mkdir -p $CRAFT_PART_INSTALL/opt
       cd external-import/cisa-known-exploited-vulnerabilities
-      cp -rp src $CRAFT_PART_INSTALL/opt/opencti-connector-cisa-kve
+      cp -rp src $CRAFT_PART_INSTALL/opt/opencti-connector-cisa-kev
       
-      cat entrypoint.sh | grep opencti-connector-cisa-kve
+      cat entrypoint.sh | grep opencti-connector-cisa-kev
       mkdir -p $CRAFT_PART_INSTALL/usr/local/lib/python3.12/dist-packages
       pip install \
         --target $CRAFT_PART_INSTALL/usr/local/lib/python3.12/dist-packages \

diff --git a/connectors/cisa_kve/src/charm.py → connectors/cisa_kev/src/charm.py b/connectors/cisa_kve/src/charm.py → connectors/cisa_kev/src/charm.py
@@ -12,7 +12,7 @@
 from charms.opencti.v0.opencti_connector import OpenctiConnectorCharm
 
 
-class OpenctiCisaKveConnectorCharm(OpenctiConnectorCharm):
+class OpenctiCisaKevConnectorCharm(OpenctiConnectorCharm):
     connector_type = "EXTERNAL_IMPORT"
 
     @property
@@ -22,4 +22,4 @@ def charm_dir(self) -> pathlib.Path:
 
 
 if __name__ == "__main__":
-    ops.main(OpenctiCisaKveConnectorCharm)
+    ops.main(OpenctiCisaKevConnectorCharm)
diff --git a/connectors/cyber_campaign/charmcraft.yaml b/connectors/cyber_campaign/charmcraft.yaml
@@ -2,7 +2,7 @@
 # See LICENSE file for licensing details.
 
 name: opencti-cyber-campaign-connector
-title: OpenCTI APT & Cybercriminals Campaign Collection Charm
+title: OpenCTI APT & Cyber Campaign Charm
 summary: OpenCTI APT & Cybercriminals Campaign Collection charm.
 links:
   documentation: https://discourse.charmhub.io

diff --git a/connectors/malwarebazaar/charmcraft.yaml b/connectors/malwarebazaar/charmcraft.yaml
@@ -2,7 +2,7 @@
 # See LICENSE file for licensing details.
 
 name: opencti-malwarebazaar-connector
-title: OpenCTI MalwareBazaar Recent Additions Charm
+title: OpenCTI MalwareBazaar Charm
 summary: OpenCTI MalwareBazaar Recent Additions charm.
 links:
   documentation: https://discourse.charmhub.io

diff --git a/connectors/virustotal_livehunt/charmcraft.yaml b/connectors/virustotal_livehunt/charmcraft.yaml
@@ -2,7 +2,7 @@
 # See LICENSE file for licensing details.
 
 name: opencti-virustotal-livehunt-connector
-title: OpenCTI VirusTotal Livehunt Notifications Charm
+title: OpenCTI VirusTotal Livehunt Charm
 summary: OpenCTI VirusTotal Livehunt Notifications charm.
 links:
   documentation: https://discourse.charmhub.io

diff --git a/scripts/gen_connector_charm.py b/scripts/gen_connector_charm.py
@@ -132,6 +132,7 @@ def render_template(
     config,
     output_dir,
     connector_name: str | None = None,
+    display_name_short: str | None = None,
     charm_override: str = "",
     generate_entrypoint: str = "",
     install_location: str | None = None,
@@ -162,6 +163,9 @@ def render_template(
                 connector_type=connector_type,
                 version=version,
                 display_name=display_name,
+                display_name_short=(
+                    display_name if display_name_short is None else display_name_short
+                ),
                 config=yaml.safe_dump(
                     {"config": {"options": sort_config(config)}}, width=99999, sort_keys=False
                 ),
@@ -244,9 +248,9 @@ def generate_alienvault_connector(location: pathlib.Path, version: str):
     )
 
 
-@connector_generator("cisa-kve")
+@connector_generator("cisa-kev")
 def generate_cisa_known_exploited_vulnerabilities_connector(location: pathlib.Path, version: str):
-    """Generate opencti cisa-known-exploited-vulnerabilities (cisa-kve) connector.
+    """Generate opencti cisa-known-exploited-vulnerabilities (cisa-kev) connector.
 
     https://github.com/OpenCTI-Platform/connectors/tree/master/external-import/cisa-known-exploited-vulnerabilities
     """
@@ -256,11 +260,12 @@ def generate_cisa_known_exploited_vulnerabilities_connector(location: pathlib.Pa
     )
     config["cisa-create-infrastructures"]["type"] = "boolean"
     render_template(
-        name="cisa-kve",
+        name="cisa-kev",
         connector_name="cisa-known-exploited-vulnerabilities",
         connector_type="EXTERNAL_IMPORT",
         version=version,
         display_name="CISA Known Exploited Vulnerabilities",
+        display_name_short="CISA KEV",
         output_dir=location,
         config=config,
     )
@@ -330,6 +335,7 @@ def gen_cyber_campaign_collection_connector(location: pathlib.Path, version: str
         connector_type="EXTERNAL_IMPORT",
         version=version,
         display_name="APT & Cybercriminals Campaign Collection",
+        display_name_short="APT & Cyber Campaign",
         output_dir=location,
         config={
             "connector-scope": {
@@ -519,6 +525,7 @@ def gen_malwarebazaar_recent_additions_connector(location: pathlib.Path, version
         connector_type="EXTERNAL_IMPORT",
         version=version,
         display_name="MalwareBazaar Recent Additions",
+        display_name_short="MalwareBazaar",
         output_dir=location,
         config={
             "connector-log-level": {
@@ -779,6 +786,7 @@ def gen_virustotal_livehunt_notifications_connector(location: pathlib.Path, vers
         connector_type="EXTERNAL_IMPORT",
         version=version,
         display_name="VirusTotal Livehunt Notifications",
+        display_name_short="VirusTotal Livehunt",
         output_dir=location,
         config={
             **DEFAULT_CONFIG,

diff --git a/tests/unit/test_connectors.py b/tests/unit/test_connectors.py
@@ -130,8 +130,8 @@ def _add_connector_test_params(
 )
 
 _add_connector_test_params(
-    name="cisa-kve",
-    connector_name="cisa-kve",
+    name="cisa-kev",
+    connector_name="cisa-kev",
     charm_config={
         "connector-scope": "cisa",
         "connector-run-and-terminate": False,
@@ -147,7 +147,7 @@ def _add_connector_test_params(
     environment={
         "OPENCTI_URL": "http://opencti-endpoints.test-opencti-connector.svc:8080",
         "OPENCTI_TOKEN": "00000000-0000-0000-0000-000000000000",
-        "CONNECTOR_NAME": "opencti-cisa-kve-connector",
+        "CONNECTOR_NAME": "opencti-cisa-kev-connector",
         "CONNECTOR_SCOPE": "cisa",
         "CONNECTOR_RUN_AND_TERMINATE": "false",
         "CONNECTOR_LOG_LEVEL": "error",