Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Overview

This document contains a list of maintainers in this repo. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
This document contains a list of maintainers in this repo.

## Current Maintainers

Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ Read more about how `contentctl` can help test and validate your content in a re
## Sample CICD Workflows
Already using `contentctl`, or looking to get started with it already configured in GitHub Actions? [Our guide](docs/Sample_CICD_Templates.md) includes workflows to help you build and test your app.

## Contribution Guide
Read [the Contribution Guidelines](CONTRIBUTING.md) for this project before opening a Pull Request.

## Ecosystem
| Project | Description |
| --------------------- | ------------------------------------------------------- |
Expand Down
2 changes: 0 additions & 2 deletions contentctl/actions/inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ def inspectAppCLI(self, config: inspect) -> None:
# "\n\tpython3 -m pip install splunk-appinspect"
# f"\n\tsplunk-appinspect inspect {self.getPackagePath(include_version=False).relative_to(pathlib.Path('.').absolute())} --mode precert")

# else:
# print("splunk-appinspect is only compatable with Python3.9 at this time. Please see the following open issue here: https://github.com/splunk/contentctl/issues/28")
# print("******WARNING******")
return

Expand Down
3 changes: 1 addition & 2 deletions contentctl/output/conf_output.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,7 @@ def packageAppTar(self) -> None:

def packageAppSlim(self) -> None:
raise Exception(
"Packaging with splunk-packaging-toolkit not currently supported as slim only supports Python 3.7. "
"Please raise an issue in the contentctl GitHub if you encounter this exception."
"Packaging with splunk-packaging-toolkit not currently supported as slim only supports Python 3.7."
)
try:
import logging
Expand Down
8 changes: 1 addition & 7 deletions docs/Sample_CICD_Templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,13 @@ jobs:
python -m pip install --upgrade pip
pip install contentctl==5.0.0

# Running contentctl test with a few arguments, before running the command make sure you checkout into the current branch of the pull request. This step only performs unit testing on all the changes against the target-branch. In most cases this target branch will be develop
# Make sure we check out the PR, even if it actually lives in a fork
# Instructions for pulling a PR were taken from:
# https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
- name: Run ContentCTL test for changes against target branch
run: |

echo "Current Branch (Head Ref): ${{ github.head_ref }}"
echo "Target Branch (Base Ref): ${{ github.base_ref }}"
git pull > /dev/null 2>&1
#We checkout into a new branch - new_branch_for_testing to avoid name collisions with develop incase the forked PR is from develop
git fetch origin pull/${{ github.event.pull_request.number }}/head:new_branch_for_testing
#We must specifically get the PR's target branch from security_content, not the one that resides in the fork PR's forked repo
git switch new_branch_for_testing
contentctl test --disable-tqdm --no-enable-integration-testing --container-settings.num-containers 2 --post-test-behavior never_pause mode:changes --mode.target-branch ${{ github.base_ref }}
echo "contentctl test - COMPLETED"
Expand Down Expand Up @@ -117,4 +111,4 @@ jobs:
echo "The Unit testing is completed. See details in the unit-testing job summary UI "
```

The Testing workflow again has some things that are particular to the setup required for [splunk/security_content](https://github.com/splunk/security_content). Notably, the repository being checked out is hardcoded and should be updated to your repo. There is some additional behavior present related to our repository recieving PRs from forks and ensuring the right jobs are run in the right environment that are also potentially not necessary for your own private repository. Also, there are still hardcoded references to `DA-ESS-ContentUpdate-latest.tar.gz` that should be updated. Additionally, this job relies on [an additional script](https://github.com/splunk/security_content/blob/develop/.github/workflows/format_test_results.py) in its last step to format the results nicely for Github Actions.
The Testing workflow again has some things that are particular to the setup required for [splunk/security_content](https://github.com/splunk/security_content). Notably, the repository being checked out is hardcoded and should be updated to your repo. There are still hardcoded references to `DA-ESS-ContentUpdate-latest.tar.gz` that should be updated. Additionally, this job relies on [an additional script](https://github.com/splunk/security_content/blob/develop/.github/workflows/format_test_results.py) in its last step to format the results nicely for Github Actions.
Loading