Skip to content

Commit 4d9b14d

Browse files
[deps]: Update splunk-add-on-ucc-framework to v6 (#118)
* [deps]: Update splunk-add-on-ucc-framework to v6 * Remove os-DependentLibraries and use arm64 runner instead to produce required binaries due to upstream bug: splunk/addonfactory-ucc-generator#1972 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
1 parent e2dee3b commit 4d9b14d

File tree

6 files changed

+27
-36
lines changed

6 files changed

+27
-36
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions: {}
1212
jobs:
1313
cloc:
1414
name: CLOC
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-22.04-arm
1616
permissions:
1717
contents: read
1818
steps:
@@ -31,7 +31,7 @@ jobs:
3131

3232
build-ui:
3333
name: Build UI
34-
runs-on: ubuntu-22.04
34+
runs-on: ubuntu-22.04-arm
3535
defaults:
3636
run:
3737
working-directory: ./ui
@@ -70,7 +70,9 @@ jobs:
7070

7171
build-artifacts:
7272
name: Build artifacts
73-
runs-on: ubuntu-22.04
73+
# Splunk AppInspect requires aarch64/arm64 binaries, the easiest way to comply with this is to build on an arm64 runner.
74+
# This is most important here, but we use it in all jobs in this workflow for consistency.
75+
runs-on: ubuntu-22.04-arm
7476
needs: build-ui
7577
permissions:
7678
contents: read
@@ -129,8 +131,6 @@ jobs:
129131
rm -rf output/bitwarden_event_logs/appserver/templates/base.html
130132
rm -rf output/bitwarden_event_logs/default/{restmap.conf,web.conf,bitwarden_event_logs_settings.conf}
131133
rm -rf output/bitwarden_event_logs/README/bitwarden_event_logs_settings.conf.spec
132-
rm -rf output/bitwarden_event_logs/lib/charset_normalizer
133-
mv output/bitwarden_event_logs/lib/linux/charset_normalizer output/bitwarden_event_logs/lib/charset_normalizer
134134
poetry run ucc-gen package --path output/bitwarden_event_logs -o output/
135135
mv output/bitwarden_event_logs*.tar.gz output/bitwarden_event_logs.tar.gz
136136
@@ -162,7 +162,7 @@ jobs:
162162
check-failures:
163163
name: Check for failures
164164
if: always()
165-
runs-on: ubuntu-22.04
165+
runs-on: ubuntu-22.04-arm
166166
needs:
167167
- cloc
168168
- build-artifacts

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ The app consists of two main components:
1515
- **Event Collection**: Fetches event logs from the Bitwarden API at scheduled intervals
1616
- **Splunk Integration**: Indexes events into Splunk using the Splunk SDK
1717
- **Configuration Management**: Handles authentication and connection settings
18-
- Built using the Splunk UCC (Universal Configuration Console) framework
18+
- Built using the Splunk UCC (Universal Configuration Console) framework: https://splunk.github.io/addonfactory-ucc-generator/
19+
- Uses the Splunk AppInspect CLI to validate compliance with Splunk requirements:
20+
- Overview: https://dev.splunk.com/enterprise/docs/developapps/testvalidate/appinspect/
21+
- Check criteria: https://dev.splunk.com/enterprise/reference/appinspect/appinspectcheck/
22+
1923
- Dependencies are managed by poetry
2024

2125
### Angular Frontend (`ui/`)

globalConfig.json

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@
2525
"restRoot": "bitwarden_event_logs",
2626
"version": "2.0.0",
2727
"displayName": "Bitwarden Event Logs",
28-
"schemaVersion": "0.0.9",
29-
"os-dependentLibraries": [
30-
{
31-
"name": "charset-normalizer",
32-
"version": "3.4.1",
33-
"dependencies": true,
34-
"platform": "none",
35-
"python_version": "3.9",
36-
"os": "linux",
37-
"target": "linux"
38-
}
39-
]
28+
"schemaVersion": "0.0.10"
4029
}
4130
}

package.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ rm -rf output/$APP_NAME/appserver/static/{css,js,openapi.json}
3434
rm -rf output/$APP_NAME/appserver/templates/base.html
3535
rm -rf output/$APP_NAME/default/{restmap.conf,web.conf,bitwarden_event_logs_settings.conf}
3636
rm -rf output/$APP_NAME/README/bitwarden_event_logs_settings.conf.spec
37-
rm -rf output/$APP_NAME/lib/charset_normalizer
38-
mv output/$APP_NAME/lib/linux/charset_normalizer output/$APP_NAME/lib/charset_normalizer
3937
poetry run ucc-gen package --path output/$APP_NAME/ -o output/
4038

4139
mv "output/${APP_NAME}-${VERSION}.tar.gz" output/bitwarden_event_logs.tar.gz

poetry.lock

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ optional = true
2424
[tool.poetry.group.dev.dependencies]
2525
python = ">=3.9, <3.11"
2626
types-requests = "2.31.0.6"
27-
splunk-add-on-ucc-framework = "5.69.1"
27+
splunk-add-on-ucc-framework = "6.1.0"
2828
splunk-appinspect = "4.1.2"
2929

3030
[tool.poetry.group.splunkslim]

0 commit comments

Comments
 (0)