Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge develop into main #1357

Merged
merged 2 commits into from
Oct 4, 2024
Merged

chore: merge develop into main #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2c34d2
chore: merge main into develop (#1354)
soleksy-splunk Oct 2, 2024
adfd987
fix: use title for app conf (#1356)
soleksy-splunk Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion splunk_add_on_ucc_framework/generators/conf_files/create_app_conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))

Expand All @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions ...ted_addons/expected_output_global_config_everything/Splunk_TA_UCCExample/default/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions tests/testdata/test_addons/package_global_config_everything/globalConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tests/testdata/test_addons/package_global_config_everything/package/app.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": [],
Expand Down
Loading