chore: merge develop into main (#1357)

splunk · Oct 4, 2024 · 6237866 · 6237866
2 parents 3b4256d + adfd987
commit 6237866
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/splunk_add_on_ucc_framework/generators/conf_files/create_app_conf.py b/splunk_add_on_ucc_framework/generators/conf_files/create_app_conf.py
@@ -47,6 +47,7 @@ def _set_attributes(self, **kwargs: Any) -> None:
         self.addon_version = kwargs["addon_version"]
         self.is_visible = str(kwargs["has_ui"]).lower()
         self.description = kwargs["app_manifest"].get_description()
+        self.title = kwargs["app_manifest"].get_title()
         self.author = kwargs["app_manifest"].get_authors()[0]["name"]
         self.build = str(int(time()))
 
@@ -65,7 +66,7 @@ def generate_conf(self) -> Dict[str, str]:
             name=self.name,
             build=self.build,
             id=self.id,
-            label=self.description,
+            label=self.title,
             is_visible=self.is_visible,
         )
         self.writer(

diff --git a/...ted_addons/expected_output_global_config_everything/Splunk_TA_UCCExample/default/app.conf b/...ted_addons/expected_output_global_config_everything/Splunk_TA_UCCExample/default/app.conf
@@ -6,11 +6,11 @@ state = enabled
 [launcher]
 author = Splunk Inc.
 version = 5.5.8R5fd76615
-description = Splunk Add-on for UCC Example
+description = Some description of Splunk Add-on for UCC Example
 
 [ui]
 is_visible = true
-label = Splunk Add-on for UCC Example
+label = Title of Splunk Add-on for UCC Example
 supported_themes = light, dark
 
 [package]

diff --git a/tests/testdata/test_addons/package_global_config_everything/globalConfig.json b/tests/testdata/test_addons/package_global_config_everything/globalConfig.json
@@ -1622,10 +1622,10 @@
     "meta": {
         "name": "Splunk_TA_UCCExample",
         "restRoot": "splunk_ta_uccexample",
-        "version": "5.49.0Rcc63ee532",
+        "version": "5.50.0R6465f0b6a",
         "displayName": "Splunk UCC test Add-on",
         "schemaVersion": "0.0.8",
-        "_uccVersion": "5.49.0",
+        "_uccVersion": "5.50.0",
         "supportedThemes": [
             "light",
             "dark"

diff --git a/tests/testdata/test_addons/package_global_config_everything/package/app.manifest b/tests/testdata/test_addons/package_global_config_everything/package/app.manifest
@@ -1,7 +1,7 @@
 {
   "schemaVersion": "2.0.0",
   "info": {
-    "title": "Splunk Add-on for UCC Example",
+    "title": "Title of Splunk Add-on for UCC Example",
     "id": {
       "group": null,
       "name": "Splunk_TA_UCCExample",
@@ -15,7 +15,7 @@
       }
     ],
     "releaseDate": null,
-    "description": "Splunk Add-on for UCC Example",
+    "description": "Some description of Splunk Add-on for UCC Example",
     "classification": {
       "intendedAudience": null,
       "categories": [],