Merge branch 'develop' into renovate/npm

splunk · Oct 8, 2024 · 0608821 · 0608821
2 parents c48e596 + 199c05e
commit 0608821
Show file tree

Hide file tree

Showing 15 changed files with 1,214 additions and 1,597 deletions.
diff --git a/NOTICE b/NOTICE
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,29 @@
+## [5.50.1](https://github.com/splunk/addonfactory-ucc-generator/compare/v5.50.0...v5.50.1) (2024-10-04)
+
+
+### Bug Fixes
+
+* use title for app conf ([#1356](https://github.com/splunk/addonfactory-ucc-generator/issues/1356)) ([adfd987](https://github.com/splunk/addonfactory-ucc-generator/commit/adfd9879832b66cd6749fb530bf575ad1a18d053))
+
+# [5.50.0](https://github.com/splunk/addonfactory-ucc-generator/compare/v5.49.0...v5.50.0) (2024-10-02)
+
+
+### Bug Fixes
+
+* boolean values are converted to 1 and 0 only on configuration page ([#1347](https://github.com/splunk/addonfactory-ucc-generator/issues/1347)) ([d0d0c11](https://github.com/splunk/addonfactory-ucc-generator/commit/d0d0c113f959e11b52573a5105d2bb51d6410165))
+* custom row loading on many tabs ([#1336](https://github.com/splunk/addonfactory-ucc-generator/issues/1336)) ([f124b5e](https://github.com/splunk/addonfactory-ucc-generator/commit/f124b5e91cfd3690ab1869895f38a7cb9a217120))
+* **globalConfig:** update name and rest root convention ([#1335](https://github.com/splunk/addonfactory-ucc-generator/issues/1335)) ([bdfa8c3](https://github.com/splunk/addonfactory-ucc-generator/commit/bdfa8c3131e2971100de9f61e8567620ae796db9)), closes [#1333](https://github.com/splunk/addonfactory-ucc-generator/issues/1333)
+
+
+### Features
+
+* **dashboard:** add possibility to display CRITICAL log lvl in dashboard ([#1337](https://github.com/splunk/addonfactory-ucc-generator/issues/1337)) ([d937986](https://github.com/splunk/addonfactory-ucc-generator/commit/d93798623302a444cf4aa333397324ed80e6d5b9))
+* option for configuring is_visible from globalConfig.json ([#1345](https://github.com/splunk/addonfactory-ucc-generator/issues/1345)) ([04c80e3](https://github.com/splunk/addonfactory-ucc-generator/commit/04c80e35488301522e19735fb06168160a8b0b86)), closes [#1334](https://github.com/splunk/addonfactory-ucc-generator/issues/1334)
+* provide support for Python 3.9 for OS-dependent libraries ([#1338](https://github.com/splunk/addonfactory-ucc-generator/issues/1338)) ([5cfc889](https://github.com/splunk/addonfactory-ucc-generator/commit/5cfc889357a8a19695b7e43cf07a327b00ed600d))
+* restructure conf and spec file generation ([#1328](https://github.com/splunk/addonfactory-ucc-generator/issues/1328)) ([bc6a36b](https://github.com/splunk/addonfactory-ucc-generator/commit/bc6a36bd323a31ac2284f0a621caa2bfaa4c93ac))
+* restructure html file generation ([#1311](https://github.com/splunk/addonfactory-ucc-generator/issues/1311)) ([ed2c2bd](https://github.com/splunk/addonfactory-ucc-generator/commit/ed2c2bd66c5c62fbd09fc1ed28dfaa2fc49a05fa))
+* restructure xml file generation ([#1312](https://github.com/splunk/addonfactory-ucc-generator/issues/1312)) ([a171c8d](https://github.com/splunk/addonfactory-ucc-generator/commit/a171c8dc74d01268f4a4cb50df2d0e5b6956d883))
+
 # [5.49.0](https://github.com/splunk/addonfactory-ucc-generator/compare/v5.48.2...v5.49.0) (2024-08-21)
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@
 
 [tool.poetry]
 name = "splunk_add_on_ucc_framework"
-version = "5.49.0"
+version = "5.50.1"
 description = "Splunk Add-on SDK formerly UCC is a build and code generation framework"
 license = "Apache-2.0"
 authors = ["Splunk <[email protected]>"]

diff --git a/splunk_add_on_ucc_framework/__init__.py b/splunk_add_on_ucc_framework/__init__.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "5.49.0"
+__version__ = "5.50.1"
 
 import logging
 

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/splunk_add_on_ucc_framework/utils.py b/splunk_add_on_ucc_framework/utils.py
@@ -98,7 +98,7 @@ def get_version_from_git() -> str:
     except RuntimeError:
         raise exceptions.IsNotAGitRepo()
     if not version.stage:
-        stage = "R"
+        stage = "+"
     else:
         stage = version.stage[:1]
     try:

diff --git a/...global_config_everything/Splunk_TA_UCCExample/appserver/static/js/build/globalConfig.json b/...global_config_everything/Splunk_TA_UCCExample/appserver/static/js/build/globalConfig.json
@@ -1032,7 +1032,7 @@
         "apiVersion": "3.2.0",
         "name": "Splunk_TA_UCCExample",
         "restRoot": "splunk_ta_uccexample",
-        "version": "5.5.8R5fd76615",
+        "version": "5.5.8+5fd76615",
         "displayName": "Splunk UCC test Add-on",
         "schemaVersion": "0.0.2"
     }

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_files_conflict_test/globalConfig.json b/tests/testdata/test_addons/package_files_conflict_test/globalConfig.json
@@ -200,7 +200,7 @@
     "meta": {
         "name": "test_addon",
         "restRoot": "test_addon",
-        "version": "5.47.0Ra2b585f01",
+        "version": "5.47.0+a2b585f01",
         "displayName": "This is my add-on",
         "schemaVersion": "0.0.7",
         "_uccVersion": "5.47.0"

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.49.0+cc63ee532",
         "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": [],

diff --git a/tests/testdata/test_addons/package_global_config_everything_uccignore/globalConfig.json b/tests/testdata/test_addons/package_global_config_everything_uccignore/globalConfig.json
@@ -1172,7 +1172,7 @@
     "meta": {
         "name": "Splunk_TA_UCCExample",
         "restRoot": "splunk_ta_uccexample",
-        "version": "5.47.0Ra2b585f01",
+        "version": "5.47.0+a2b585f01",
         "displayName": "Splunk UCC test Add-on",
         "schemaVersion": "0.0.7",
         "_uccVersion": "5.47.0"

diff --git a/tests/testdata/test_addons/package_global_config_multi_input/globalConfig.json b/tests/testdata/test_addons/package_global_config_multi_input/globalConfig.json
@@ -431,7 +431,7 @@
     "meta": {
         "name": "Splunk_TA_UCCExample",
         "restRoot": "splunk_ta_uccexample",
-        "version": "5.47.0Ra2b585f01",
+        "version": "5.47.0+a2b585f01",
         "displayName": "Splunk UCC test Add-on",
         "schemaVersion": "0.0.7",
         "_uccVersion": "5.47.0"

diff --git a/tests/testdata/test_addons/package_global_config_only_one_tab/globalConfig.json b/tests/testdata/test_addons/package_global_config_only_one_tab/globalConfig.json
@@ -36,7 +36,7 @@
     "meta": {
         "name": "Splunk_TA_UCCExample",
         "restRoot": "splunk_ta_uccexample",
-        "version": "5.47.0Ra2b585f01",
+        "version": "5.47.0+a2b585f01",
         "displayName": "Splunk UCC test Add-on",
         "schemaVersion": "0.0.7",
         "_uccVersion": "5.47.0"

diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
@@ -79,7 +79,7 @@ def test_get_version_from_git_when_stage_is_none(mock_version_from_git):
     )
     mock_version_from_git.return_value = version
 
-    expected_result = "5.25.0R391ec865"
+    expected_result = "5.25.0+391ec865"
     assert expected_result == utils.get_version_from_git()