diff --git a/.github/workflows/build-and-validate.yml b/.github/workflows/build-and-validate.yml index f1d869c931..74f20021f4 100644 --- a/.github/workflows/build-and-validate.yml +++ b/.github/workflows/build-and-validate.yml @@ -262,13 +262,17 @@ jobs: tar -zxf content-pack-build-escu.tar.gz tar -zxf content-pack-build-saaws.tar.gz tar -zxf content-pack-build-devsecops.tar.gz - mv dist/escu DA-ESS-ContentUpdate - mv dist/saaws DA-ESS_AmazonWebServices_Content + tar -zxf content-pack-build-ssa.tar.gz + + mv dist/escu DA-ESS-ContentUpdate + mv dist/saaws DA-ESS_AmazonWebServices_Content mv dist/devsecops dev_sec_ops_analytics + mv dist/ssa SSA_Content slim package -o upload DA-ESS-ContentUpdate slim package -o upload DA-ESS_AmazonWebServices_Content slim package -o upload dev_sec_ops_analytics + #slim package -o upload SSA_Content cp upload/DA-ESS-ContentUpdate-*.tar.gz DA-ESS-ContentUpdate-latest.tar.gz sha256sum DA-ESS-ContentUpdate-latest.tar.gz > checksum.txt @@ -277,11 +281,16 @@ jobs: sha256sum DA-ESS_AmazonWebServices_Content-latest.tar.gz >> checksum.txt cp upload/dev_sec_ops_analytics-*tar.gz dev_sec_ops_analytics-latest.tar.gz + sha256sum dev_sec_ops_analytics-latest.tar.gz >> checksum.txt - cp content-pack-build-ssa.tar.gz upload/SSA_Content-latest.tar.gz - sha256sum upload/SSA_Content-latest.tar.gz >> checksum.txt + #Do this copy so that we conform as much as possible, and have to make + #as few changes as possible, once we start generating this as a real, + #properly packaged app + tar -zcf upload/SSA_Content-NO_SLIM.tar.gz SSA_Content + cp upload/SSA_Content-*.tar.gz SSA_Content-latest.tar.gz + sha256sum SSA_Content-latest.tar.gz >> checksum.txt - touch tag-canary.txt + - name: store_artifacts uses: actions/upload-artifact@v2 @@ -331,7 +340,7 @@ jobs: - - name: Submit ESCU Package to AppInspect API + - name: Submit ESCU, SAAWS, dev_sec_ops_analytics, and SSA Packages to AppInspect API env: APPINSPECT_USERNAME: ${{ secrets.AppInspectUsername }} APPINSPECT_PASSWORD: ${{ secrets.AppInspectPassword }} @@ -340,14 +349,8 @@ jobs: #Enclose in quotes in case there are any special characters in the username/password #Better not to pass these arguments on the command line, if possible ./appinspect.sh ../ DA-ESS-ContentUpdate-latest.tar.gz "$APPINSPECT_USERNAME" "$APPINSPECT_PASSWORD" - - - name: Submit SAAWS Package to AppInspect API - env: - APPINSPECT_USERNAME: ${{ secrets.AppInspectUsername }} - APPINSPECT_PASSWORD: ${{ secrets.AppInspectPassword }} - run: | - cd bin ./appinspect.sh ../ DA-ESS_AmazonWebServices_Content-latest.tar.gz "$APPINSPECT_USERNAME" "$APPINSPECT_PASSWORD" + ./appinspect.sh ../ dev_sec_ops_analytics-latest.tar.gz "$APPINSPECT_USERNAME" "$APPINSPECT_PASSWORD" - name: Create report artifact if: always() diff --git a/dist/devsecops/default/app.conf b/dist/devsecops/default/app.conf index 66cd511ed6..4f7674528e 100644 --- a/dist/devsecops/default/app.conf +++ b/dist/devsecops/default/app.conf @@ -9,8 +9,16 @@ is_configured = 0 is_visible = 1 label = Dev Sec Ops Analytics +[triggers] +reload.analytic_stories = simple +reload.analyticstories = simple +reload.es_investigations = simple +reload.use_case_library = simple + [launcher] author = Splunk Threat Research Team description = version = 1.0.0 +[package] +check_for_updates = 0 \ No newline at end of file diff --git a/dist/devsecops/default/props.conf b/dist/devsecops/default/props.conf index a5803cae9f..788639b4c7 100644 --- a/dist/devsecops/default/props.conf +++ b/dist/devsecops/default/props.conf @@ -1,2 +1,2 @@ -[stash] +[MODIFIED-stash] lookup_image_to_repository = images_to_repository image OUTPUT repository \ No newline at end of file