From 3debbeb71e420c4750c695bcaa6d17c1fa4ca715 Mon Sep 17 00:00:00 2001 From: bdebek-splunk Date: Tue, 14 Jan 2025 11:49:23 +0100 Subject: [PATCH 1/2] fix: standardize app naming and update deployment path source --- apps/Splunk_TA_app1/default/app.conf | 4 ++-- deploy.py | 3 ++- environments/uat/es/deployment.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/Splunk_TA_app1/default/app.conf b/apps/Splunk_TA_app1/default/app.conf index 0fca27d..2430e13 100644 --- a/apps/Splunk_TA_app1/default/app.conf +++ b/apps/Splunk_TA_app1/default/app.conf @@ -11,11 +11,11 @@ version = 1.0.8 [ui] is_visible = 0 -label = app1 +label = App1 docs_section_override = AddOns:released [package] -id = Splunk_TA_app1 +id = Splunk_TA_App1 [triggers] reload.addon_builder = simple diff --git a/deploy.py b/deploy.py index f9b9836..d0d65f0 100644 --- a/deploy.py +++ b/deploy.py @@ -45,7 +45,8 @@ def main(): ### 2. Upload_local_configuration ### # Check if the configuration exists for the app - path = check_all_letter_cases(sys.argv[1], app) + path = os.path.join("environments", sys.argv[1], app) + print(path) if path: unpack_merge_conf_and_meta_repack(app, path) else: diff --git a/environments/uat/es/deployment.yml b/environments/uat/es/deployment.yml index 522eaf8..4bc094e 100644 --- a/environments/uat/es/deployment.yml +++ b/environments/uat/es/deployment.yml @@ -1,7 +1,7 @@ target: url: https://staging.admin.splunk.com/scv-shw-217bd09bcbf264/adminconfig/v2/apps/victoria apps: - Splunk_TA_app1: + Splunk_TA_App1: s3-bucket: splunk-apps-deployment source: apps/Splunk_TA_app1.tgz config: From fe9781d2f441005cac5ba93c3ef696a8f4eb24af Mon Sep 17 00:00:00 2001 From: bdebek-splunk Date: Tue, 14 Jan 2025 11:50:24 +0100 Subject: [PATCH 2/2] refactor: comment out dotenv loading for local testing --- deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy.py b/deploy.py index d0d65f0..f6ba729 100644 --- a/deploy.py +++ b/deploy.py @@ -7,8 +7,8 @@ from utils import * # FOR LOCAL TESTING -from dotenv import load_dotenv -load_dotenv(dotenv_path="local.env") +# from dotenv import load_dotenv +# load_dotenv(dotenv_path="local.env") def main(): if len(sys.argv) != 2: