From 2ac473ba4b4bb7a334994e11324fa86d8dccfc02 Mon Sep 17 00:00:00 2001
From: divious1 <josehelps@gmail.com>
Date: Mon, 17 Jun 2019 17:27:42 -0400
Subject: [PATCH] moving logic to ci to copy analyticstories.conf

---
 .circleci/config.yml | 3 ++-
 .gitignore           | 2 --
 bin/generate.py      | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index babd5f2d17..ee13101546 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,6 +83,8 @@ jobs:
             cd security-content
             source venv/bin/activate
             python bin/generate.py --path . --output package --storiesv1 --use_case_lib -v
+            # make a copy of use_case_lib in order to have ES work :-(
+            cp package/default/use_case_library.conf package/default/analyticstories.conf
       - run:
           name: update version and build number
           command: |
@@ -98,7 +100,6 @@ jobs:
             # update build number and version
             sed -i "s/build = .*$/build = $CIRCLE_BUILD_NUM/g" package/default/app.conf
             sed -i "s/^version = .*$/version = $CONTENT_VERSION/g" package/default/app.conf
-            #            sed -i "s/\"version\": .*$/ \"version\": \"$CONTENT_VERSION\"/g" package/app.manifest
             sed -i "s/version = .*$/version = $CONTENT_VERSION/g" package/default/content-version.conf
             tar -czf content-pack-build.tar.gz package/*
       - persist_to_workspace:
diff --git a/.gitignore b/.gitignore
index 19f0ec8748..31541b7252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,8 +17,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
-lib64/
 parts/
 sdist/
 var/
diff --git a/bin/generate.py b/bin/generate.py
index cd28b5ac85..0bd1598093 100644
--- a/bin/generate.py
+++ b/bin/generate.py
@@ -735,7 +735,7 @@ def write_analytics_story_confv1(stories, detections, investigations, baselines,
 def write_use_case_lib_conf(stories, detections, investigations, baselines, OUTPUT_DIR):
 
     # Create conf files from analytics stories files
-    use_case_lib_path = OUTPUT_DIR + "/default/analyticstories.conf"
+    use_case_lib_path = OUTPUT_DIR + "/default/use_case_library.conf"
     output_file = open(use_case_lib_path, 'w')
     output_file.write("#############\n")
     output_file.write("# Automatically generated by generator.py in splunk/security-content\n")
@@ -1101,14 +1101,14 @@ if __name__ == "__main__":
     # grab arguments
     parser = argparse.ArgumentParser(description="generates splunk conf files out of security-content manifests", epilog="""
     This tool converts manifests to the source files to be used by products like Splunk Enterprise.
-    It generates the savesearches.conf, analytic_stories.conf files for ES.""")
+    It generates the savesearches.conf, analytics_stories.conf files for ES.""")
     parser.add_argument("-p", "--path", required=True, help="path to security-content repo")
     parser.add_argument("-o", "--output", required=True, help="path to the output directory")
     parser.add_argument("-v", "--verbose", required=False, default=False, action='store_true', help="prints verbose output")
     parser.add_argument("-sv1", "--storiesv1", required=False, default=True, action='store_true',
-                        help="generates analytic_stories.conf in v1 format")
+                        help="generates analytics_stories.conf in v1 format")
     parser.add_argument("-u", "--use_case_lib", required=False, default=True, action='store_true',
-                        help="generates analyticstories.conf for ES Use Case Library")
+                        help="generates use_case_library.conf for ES")
 
     # parse them
     args = parser.parse_args()