Skip to content

Commit 206c7d1

Browse files
author
Artem Rys
authored
feat: remove splunk-appinspect dependency (#464)
* ci: apply concurrency for build-test-release job * refactor: use conf-parser in EventtypeParser instead of splunk-appinspect * refactor: use conf-parser in SavedsearchesParser instead of splunk-appinspect * refactor: use conf-parser in TransformsParser instead of splunk-appinspect * refactor: use conf-parser in PropsParser instead of splunk-appinspect * refactor: remove splunk-appinspect from AddonParser * docs: remove splunk-appinspect mentions from PropsParser * test: empty stanza in savedsearches.conf * refactor: use new EventtypeParser in cim_field_report * refactor: use conf-parser in eventgen.conf parser * chore: remove create_new_eventgen * feat: remove splunk_appinspect dependency * chore: rename to pytest_splunk_addon_data * chore: style the docs pagee * ci: restructure tests * ci: not run tests with Splunk 8.0 * refactor: move some public methods to be private * ci: add debug-statements to pre-commit configuration
1 parent 18c73e6 commit 206c7d1

40 files changed

+934
-2769
lines changed

.github/workflows/build-test-release.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
pull_request:
1111
branches: [main, develop]
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
15+
cancel-in-progress: true
16+
1317
jobs:
1418
compliance-dependencies:
1519
name: Compliance Dependencies
@@ -121,7 +125,7 @@ jobs:
121125
strategy:
122126
fail-fast: false
123127
matrix:
124-
splunk-version: ["8.0","8.1","8.2"]
128+
splunk-version: ["8.1","8.2"]
125129
steps:
126130
- uses: actions/checkout@v2
127131
with:
@@ -195,13 +199,22 @@ jobs:
195199
196200
test-splunk-matrix:
197201
name: Test Matrix
202+
needs:
203+
- pre-commit
204+
- compliance-dependencies
205+
- compliance-copyrights
206+
- test-splunk-external
207+
- test-splunk-doc
208+
- test-splunk-unit
209+
- review_secrets
210+
- review-dog-misspell
198211
runs-on: ubuntu-latest
199212
strategy:
200213
fail-fast: false
201214
matrix:
202215
os: [ubuntu-latest, macos-latest, windows-latest]
203216
python-version: [3.7]
204-
splunk-version: [8.0, 8.1, 8.2]
217+
splunk-version: [8.1, 8.2]
205218
steps:
206219
- uses: actions/checkout@v2
207220
with:
@@ -267,15 +280,7 @@ jobs:
267280
publish:
268281
name: publish
269282
needs:
270-
- pre-commit
271-
- compliance-dependencies
272-
- compliance-copyrights
273-
- test-splunk-external
274-
- test-splunk-doc
275283
- test-splunk-matrix
276-
- test-splunk-unit
277-
- review_secrets
278-
- review-dog-misspell
279284
runs-on: ubuntu-latest
280285
env:
281286
NEEDS: ${{ toJson(needs) }}

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ repos:
1818
rev: v4.0.1
1919
hooks:
2020
- id: check-merge-conflict
21+
- id: debug-statements
2122
- repo: https://github.com/psf/black
2223
rev: 21.9b0
2324
hooks:

README.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ Developing
4242

4343
Note: Must install docker desktop, vscode or pycharm pro optional
4444

45-
Note2: Appinspect requires libmagic verify this has been installed correctly each time a new workstation/vm is used https://dev.splunk.com/enterprise/docs/releaseapps/appinspect/splunkappinspectclitool/installappinspect
46-
4745
.. code:: bash
4846
4947
$ git clone --recurse-submodules -j8 [email protected]:splunk/pytest-splunk-addon.git
5048
51-
$ #setup python venv must be 3.7
49+
$ #setup python venv must be 3.7
5250
$ /Library/Frameworks/Python.framework/Versions/3.7/bin/python3 -m venv .venv
5351
5452
$ source .venv/bin/activate
@@ -57,8 +55,6 @@ Note2: Appinspect requires libmagic verify this has been installed correctly eac
5755
5856
$ pip3 install -r requirements.txt
5957
60-
$ pip3 install https://download.splunk.com/misc/appinspect/splunk-appinspect-latest.tar.gz
61-
6258
$ python setup.py develop
6359
6460

docs/api_reference/sample_generation.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
DataGenerator
22
------------------
33

4-
EventgenParser
5-
~~~~~~~~~~~~~~~~~~
6-
.. automodule:: standard_lib.sample_generation.eventgen_parser
4+
PytestSplunkAddonDataParser
5+
~~~~~~~~~~~~~~~~~~~~~~~~~~~
6+
.. automodule:: standard_lib.sample_generation.pytest_splunk_addon_data_parser
77
:members:
88
:show-inheritance:
99

0 commit comments

Comments
 (0)