Remove beta (#77)

* Remove beta

* Remove matrix leftovers from build

.github/workflows/build.yml

@@ -26,22 +26,10 @@ jobs:
   build-artifacts:
     name: Build artifacts
     runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        app:
-          - id: "bitwarden_event_logs"
-            name: "Bitwarden Event Logs"
-          - id: "bitwarden_event_logs_beta"
-            name: "Bitwarden Event Logs (beta)"
     steps:
       - name: Checkout repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - name: Change app name
-        run: |
-          find . -type f -exec sed -i 's/bitwarden_event_logs_beta/${{ matrix.app.id }}/g' {} \;
-          find . -type f -exec sed -i 's/Bitwarden Event Logs (beta)/${{ matrix.app.name }}/g' {} \;
-
       - name: Install poetry
         run: pipx install poetry
 
@@ -75,25 +63,25 @@ jobs:
           export APP_VERSION=$(poetry version | awk -F ' ' '{print $2}')
           poetry run ucc-gen build --ta-version ${APP_VERSION}
           # cleanup python files
-          rm -rf output/${{ matrix.app.id }}/{bin,lib}/__pycache__
-          rm -rf output/${{ matrix.app.id }}/bin/{bitwarden_event_logs_rh_settings.py,import_declare_test.py}
+          rm -rf output/bitwarden_event_logs/{bin,lib}/__pycache__
+          rm -rf output/bitwarden_event_logs/bin/{bitwarden_event_logs_rh_settings.py,import_declare_test.py}
           # remove ucc-gen not used files
-          rm -rf output/${{ matrix.app.id }}/appserver/static/{css,js,openapi.json}
-          rm -rf output/${{ matrix.app.id }}/appserver/templates/base.html
-          rm -rf output/${{ matrix.app.id }}/default/{restmap.conf,web.conf,bitwarden_event_logs_settings.conf}
-          rm -rf output/${{ matrix.app.id }}/README/bitwarden_event_logs_settings.conf.spec
-          poetry run ucc-gen package --path output/${{ matrix.app.id }} -o output/
-          mv output/bitwarden_event_logs*.tar.gz output/${{ matrix.app.id }}.tar.gz
+          rm -rf output/bitwarden_event_logs/appserver/static/{css,js,openapi.json}
+          rm -rf output/bitwarden_event_logs/appserver/templates/base.html
+          rm -rf output/bitwarden_event_logs/default/{restmap.conf,web.conf,bitwarden_event_logs_settings.conf}
+          rm -rf output/bitwarden_event_logs/README/bitwarden_event_logs_settings.conf.spec
+          poetry run ucc-gen package --path output/bitwarden_event_logs -o output/
+          mv output/bitwarden_event_logs*.tar.gz output/bitwarden_event_logs.tar.gz
 
       - name: Validate artifact
         run: |
-          poetry run slim validate output/${{ matrix.app.id }}.tar.gz 2>&1 | tee output.txt
+          poetry run slim validate output/bitwarden_event_logs.tar.gz 2>&1 | tee output.txt
           if grep -q "\[ERROR\]" "output.txt"; then
             echo "ERROR(s) found."
             exit 1
           fi
           rm -f output.txt
-          poetry run splunk-appinspect inspect --mode precert output/${{ matrix.app.id }}.tar.gz 2>&1 | tee output.txt
+          poetry run splunk-appinspect inspect --mode precert output/bitwarden_event_logs.tar.gz 2>&1 | tee output.txt
           if ! grep -q -E "error:[ \t]+0" "output.txt"; then
             echo "ERRORS(s) found."
             exit 1
@@ -106,8 +94,8 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
-          name: ${{ matrix.app.id }}.tar.gz
-          path: output/${{ matrix.app.id }}.tar.gz
+          name: bitwarden_event_logs.tar.gz
+          path: output/bitwarden_event_logs.tar.gz
           if-no-files-found: error
 
   check-failures:

README.md

@@ -14,17 +14,5 @@ Please refer to [Bitwarden Contributing Docs - Splunk app][contributingdocs].
 
 Modify the version in the [pyproject.toml](pyproject.toml)
 
-## Preparing for prod (non-beta) release
-
-Remove the `_beta` suffix from:
-
-- `app_name` variable in [utils.py](src%2Futils.py)
-- `app_name` variable in [setup_page.js](package%2Fappserver%2Fstatic%2Fjavascript%2Fviews%2Fsetup_page.js)
-- `app_name` variable in [setup_page.js](package%2Fappserver%2Fstatic%2Fjavascript%2Fsetup_page.js)
-- `info/id/name` variable in [app.manifest](package%2Fapp.manifest)
-- from first line `[script://` in [inputs.conf](package%2Fdefault%2Finputs.conf)
-- `id.name` and `package.id` in [app.conf](package%2Fdefault%2Fapp.conf)
-
 [Bitwarden Splunk SIEM]: https://bitwarden.com/help/splunk-siem/
-[poetry]: https://python-poetry.org/docs/#installation
 [contributingdocs]: https://contributing.bitwarden.com/getting-started/business/splunk-app

deploy.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# docker exec -u splunk splunk bash -c "/opt/splunk/bin/splunk remove app bitwarden_event_logs_beta -auth admin:password"
+# docker exec -u splunk splunk bash -c "/opt/splunk/bin/splunk remove app bitwarden_event_logs -auth admin:password"
 
 # Upload
 docker cp output/bitwarden_event_logs.tar.gz splunk:/opt/splunk/bitwarden_event_logs.tar.gz
 docker exec -u root splunk bash -c "chown -R splunk:splunk /opt/splunk/bitwarden_event_logs.tar.gz"
 docker exec -u splunk splunk bash -c "/opt/splunk/bin/splunk install app bitwarden_event_logs.tar.gz -update 1 -auth admin:password"
 docker exec -u splunk splunk bash -c "rm -f /opt/splunk/bitwarden_event_logs.tar.gz"
-docker exec -u splunk splunk bash -c "/opt/splunk/bin/splunk restart"
+docker exec -u splunk splunk bash -c "/opt/splunk/bin/splunk restart"

globalConfig.json

@@ -21,10 +21,10 @@
         }
     },
     "meta": {
-        "name": "bitwarden_event_logs_beta",
+        "name": "bitwarden_event_logs",
         "restRoot": "bitwarden_event_logs",
         "version": "1.2.2",
-        "displayName": "Bitwarden Event Logs (beta)",
+        "displayName": "Bitwarden Event Logs",
         "schemaVersion": "0.0.7",
         "_uccVersion": "5.46.0"
     }

package.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 VERSION=$(poetry version | awk -F ' ' '{print $2}')
-APP_NAME="bitwarden_event_logs_beta"
+APP_NAME="bitwarden_event_logs"
 
 mkdir -p package/bin
 mkdir -p package/lib

package/app.manifest

@@ -1,10 +1,10 @@
 {
   "schemaVersion": "2.0.0",
   "info": {
-    "title": "Bitwarden Event Logs (beta)",
+    "title": "Bitwarden Event Logs",
     "id": {
       "group": null,
-      "name": "bitwarden_event_logs_beta",
+      "name": "bitwarden_event_logs",
       "version": "2.0.0"
     },
     "author": [

package/appserver/static/javascript/setup_page.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const app_name = "bitwarden_event_logs_beta";
+const app_name = "bitwarden_event_logs";
 
 require.config({
     paths: {
@@ -12,7 +12,7 @@ require.config({
 });
 
 require([
-    "react", 
+    "react",
     "ReactDOM",
     "myApp",
 ], function(react, ReactDOM, myApp) {

package/appserver/static/javascript/views/setup_page.js

@@ -4,7 +4,7 @@ import * as Splunk from './splunk_helpers.js';
 import * as Config from './setup_configuration.js';
 import * as StoragePasswords from './storage_passwords.js';
 
-const app_name = "bitwarden_event_logs_beta";
+const app_name = "bitwarden_event_logs";
 
 export async function getIndexes(splunk_js_sdk) {
     // Create the Splunk JS SDK Service object
@@ -72,7 +72,7 @@ export async function perform(splunk_js_sdk, setup_options) {
                 startDate: startDate
             },
         );
-        
+
         // Complete setup
         await Config.complete_setup(service);
         await Config.reload_splunk_app(service, app_name);

package/default/app.conf

@@ -3,14 +3,14 @@ is_configured = false
 
 [ui]
 is_visible = true
-label = Bitwarden Event Logs (beta)
+label = Bitwarden Event Logs
 setup_view = setup_page_dashboard
 
 [id]
-name = bitwarden_event_logs_beta
+name = bitwarden_event_logs
 
 [triggers]
 reload.script = simple
 
 [package]
-id = bitwarden_event_logs_beta
+id = bitwarden_event_logs

package/default/inputs.conf

@@ -1,4 +1,4 @@
-[script://$SPLUNK_HOME/etc/apps/bitwarden_event_logs_beta/bin/bitwarden_event_logs.py]
+[script://$SPLUNK_HOME/etc/apps/bitwarden_event_logs/bin/bitwarden_event_logs.py]
 interval = 60
 sourcetype = bitwarden:events
 index = main

src/utils.py

@@ -11,7 +11,7 @@
 
 from urllib.parse import urlparse
 
-app_name = "bitwarden_event_logs_beta"
+app_name = "bitwarden_event_logs"
 
 
 def read_session_token() -> str: