Skip to content

Commit aff8185

Browse files
feat: sample unification (#693)
BREAKING CHANGE: sample and test unification
1 parent 50b681b commit aff8185

147 files changed

Lines changed: 8325 additions & 11275 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ on:
88
tags:
99
- "v[0-9]+.[0-9]+.[0-9]+"
1010
pull_request:
11-
branches: [main, develop]
11+
branches:
12+
- "**"
1213

1314
concurrency:
1415
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -146,7 +147,7 @@ jobs:
146147
strategy:
147148
fail-fast: false
148149
matrix:
149-
splunk-version: ["8.1","8.2"]
150+
splunk-version: ["8.1", "9.0"]
150151
steps:
151152
- uses: actions/checkout@v3
152153
with:
@@ -198,7 +199,7 @@ jobs:
198199
strategy:
199200
fail-fast: false
200201
matrix:
201-
splunk-version: [8.1, 8.2]
202+
splunk-version: ["8.1", "9.0"]
202203
test-marker: [
203204
"splunk_connection_docker",
204205
"splunk_app_fiction",
@@ -208,10 +209,8 @@ jobs:
208209
"splunk_fiction_indextime",
209210
"splunk_fiction_indextime_broken",
210211
"splunk_setup_fixture",
211-
"splunk_app_requirements",
212-
"splunk_app_requirements_modinput",
213-
"splunk_app_requirements_uf",
214-
"splunk_app_requirements_scripted"
212+
"splunk_app_req",
213+
"splunk_app_req_broken",
215214
]
216215
steps:
217216
- uses: actions/checkout@v3

.github/workflows/exclude-patterns.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
.circleci/
33
deps/.*
44
.*\.lock
5-
tests/
5+
tests/
6+
NOTICE
7+
pytest_splunk_addon/standard_lib/CIM_Models/5.0.0/Ticket_Management.json

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ docs/_build/
3030
!deps/build
3131
.vscode
3232
test_report.md
33-
.idea/
33+
.idea/
34+
.python-version

.licenserc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ header:
3131
- "tests/**"
3232
- ".*"
3333
- "pytest_splunk_addon/standard_lib/**/*.json"
34+
- "pytest_splunk_addon/standard_lib/**/*.xsd"
3435
- "MANIFEST.in"
3536
- "entrypoint.sh"
3637
- "pytest_splunk_addon/.ignore_splunk_internal_errors"

Dockerfile.uf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
ARG SPLUNK_VERSION=latest
17-
FROM splunk/universalforwarder:$SPLUNK_VERSION
18-
ARG SPLUNK_VERSION=latest
16+
# TODO: go back to latest version when fixed
17+
ARG SPLUNK_VERSION=8.2.6
18+
FROM splunk/universalforwarder:8.2.6
19+
ARG SPLUNK_VERSION=8.2.6
1920
ARG SPLUNK_APP_ID=TA_UNKNOWN
2021
ARG SPLUNK_APP_PACKAGE=package
2122
RUN echo ${SPLUNK_VERSION} $SPLUNK_APP_PACKAGE
22-
COPY ${SPLUNK_APP_PACKAGE} /opt/splunkforwarder/etc/apps/${SPLUNK_APP_ID}
23+
COPY ${SPLUNK_APP_PACKAGE} /opt/splunkforwarder/etc/apps/${SPLUNK_APP_ID}

NOTICE

Lines changed: 4162 additions & 2492 deletions
Large diffs are not rendered by default.

entrypoint.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ export PATH="~/.pyenv/bin:$PATH"
66
eval "$(pyenv init -)"
77
pyenv install 3.7.8
88
pyenv local 3.7.8
9-
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
9+
curl -sSL https://install.python-poetry.org | python
10+
export PATH="/root/.local/bin:$PATH"
1011
source ~/.poetry/env
1112
sleep 15
1213
poetry install -E docker

poetry.lock

Lines changed: 44 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ junitparser = "^2.2.0"
4646
addonfactory-splunk-conf-parser-lib = "^0.3.3"
4747
defusedxml = "^0.7.1"
4848
Faker = "^13.12.0"
49+
xmltodict = "^0.13.0"
50+
xmlschema = "^1.11.3"
4951

5052
[tool.poetry.extras]
5153
docker = ['lovely-pytest-docker']

0 commit comments

Comments
 (0)