Skip to content

Commit

Permalink
ci: bump repository configuration from template-refs/heads/test/pre-c…
Browse files Browse the repository at this point in the history
…ommit-linter (#218)

* ci: common template rollout changes

* style: pre-commit run --all-files
  • Loading branch information
srv-rr-github-token authored Aug 16, 2022
1 parent 33a0854 commit e1a86b0
Show file tree
Hide file tree
Showing 39 changed files with 146 additions and 122 deletions.
2 changes: 1 addition & 1 deletion .addonmatrix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--splunkfeatures METRICS_MULTI,PYTHON3
--splunkfeatures METRICS_MULTI,PYTHON3
19 changes: 19 additions & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
env:
browser: true
es6: true
jest: true

globals:
Atomics: readonly
SharedArrayBuffer: readonly

parser: '@typescript-eslint/parser'
parserOptions:
ecmaVersion: 2018
sourceType: module

plugins:
- '@typescript-eslint'

rules: { }
4 changes: 2 additions & 2 deletions .github/workflows/build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
tags:
- "v[0-9]+.[0-9]+.[0-9]+"
pull_request:
branches:
branches:
- "**"

jobs:
call-workflow:
uses: splunk/addonfactory-workflow-addon-release/.github/workflows/reusable-build-test-release.yml@v1.7
uses: splunk/addonfactory-workflow-addon-release/.github/workflows/reusable-build-test-release.yml@v2.0
secrets:
GH_TOKEN_ADMIN: ${{ secrets.GH_TOKEN_ADMIN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-manual.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: publish-untested
on:
on:
workflow_dispatch:
inputs:
tag:
description: 'Tag to release'
description: 'Tag to release'
required: true

jobs:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/review-secrets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ jobs:
uses: actions/checkout@v1
- name: Trufflehog Actions Scan
uses: edplato/[email protected]

28 changes: 28 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
hooks:
- id: check-merge-conflict
- id: debug-statements
- id: trailing-whitespace
- id: check-yaml
- id: check-xml
- id: check-toml
- id: check-json
- id: end-of-file-fixer
- repo: https://github.com/psf/black
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
rev: v2.4.0
hooks:
- id: pretty-format-java
args: [ --autofix ]
- repo: https://github.com/eslint/eslint
rev: v8.21.0
hooks:
- id: eslint
additional_dependencies:
- "@typescript-eslint/parser"
- "@typescript-eslint/eslint-plugin"
2 changes: 1 addition & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"assets": ["THIRDPARTY"],
"message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}",
},
],
],
["@semantic-release/github", {}],
]
}
2 changes: 1 addition & 1 deletion .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
}
]
]
}
}
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ License: Apache-2.0

Files: semtag
Copyright: $YEAR $NAME <$CONTACT>
License: Apache-2.0
License: Apache-2.0
2 changes: 1 addition & 1 deletion .semgrepignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ tests/
.github/
.reuse/
.vscode/
deps/
deps/
2 changes: 1 addition & 1 deletion .splunkbase
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SPLUNKBASE_ID=3022
SPLUNKBASE_SPLUNK_VERSION=8.0,8.1
SPLUNKBASE_SPLUNK_CIM_VERSION=4.x
SPLUNKBASE_SPLUNK_CIM_VERSION=4.x
14 changes: 0 additions & 14 deletions .vscode/extensions.json

This file was deleted.

10 changes: 0 additions & 10 deletions .vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile-http_proxy
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ RUN echo "auth_param basic program /usr/lib/squid/basic_ncsa_auth /etc/squid/pas
"http_port 3128\n" > /etc/squid/squid.conf
RUN cat /etc/squid/squid.conf
RUN service squid start
RUN service squid restart
RUN service squid restart
2 changes: 1 addition & 1 deletion Dockerfile-saucelabs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
FROM circleci/python:3.7
RUN curl https://saucelabs.com/downloads/sc-4.6.2-linux.tar.gz -o /home/circleci/saucelabs.tar.gz
RUN tar -xzf /home/circleci/saucelabs.tar.gz --directory /home/circleci/
CMD /home/circleci/sc-4.6.2-linux/bin/sc -u $SAUCE_USERNAME -k $SAUCE_PASSWORD -i $SAUCE_TUNNEL_ID --no-remove-colliding-tunnels -v --se-port 4445
CMD /home/circleci/sc-4.6.2-linux/bin/sc -u $SAUCE_USERNAME -k $SAUCE_PASSWORD -i $SAUCE_TUNNEL_ID --no-remove-colliding-tunnels -v --se-port 4445
2 changes: 1 addition & 1 deletion Dockerfile-splunk
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ COPY deps/build/addonfactory_test_matrix_splunk/packages/all/addon_factory_web /
COPY $SPLUNK_APP_PACKAGE /opt/splunk/etc/apps/$SPLUNK_APP_ID

COPY .pytest.expect /home/circleci/work_backend/.pytest.expect
COPY tests /home/circleci/work_backend/tests
COPY tests /home/circleci/work_backend/tests
2 changes: 1 addition & 1 deletion Dockerfile-splunk-local
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ COPY deps/build/addonfactory_test_matrix_splunk/packages/all/addon_factory_web /
COPY $SPLUNK_APP_PACKAGE /opt/splunk/etc/apps/$SPLUNK_APP_ID

COPY .pytest.expect /home/circleci/work_backend/.pytest.expect
COPY tests /home/circleci/work_backend/tests
COPY tests /home/circleci/work_backend/tests
2 changes: 1 addition & 1 deletion Dockerfile-uf
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ARG SPLUNK_APP_ID=TA_UNKNOWN
ARG SPLUNK_APP_PACKAGE=$SPLUNK_APP_PACKAGE
RUN echo Splunk VERSION=$SPLUNK_VERSION

COPY $SPLUNK_APP_PACKAGE /opt/splunkforwarder/etc/apps/$SPLUNK_APP_ID
COPY $SPLUNK_APP_PACKAGE /opt/splunkforwarder/etc/apps/$SPLUNK_APP_ID
20 changes: 10 additions & 10 deletions LICENSES/Apache-2.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ AND DISTRIBUTION

1. Definitions.



"License" shall mean the terms and conditions for use, reproduction, and distribution
as defined by Sections 1 through 9 of this document.



"Licensor" shall mean the copyright owner or entity authorized by the copyright
owner that is granting the License.



"Legal Entity" shall mean the union of the acting entity and all other entities
that control, are controlled by, or are under common control with that entity.
Expand All @@ -26,31 +26,31 @@ or indirect, to cause the direction or management of such entity, whether
by contract or otherwise, or (ii) ownership of fifty percent (50%) or more
of the outstanding shares, or (iii) beneficial ownership of such entity.



"You" (or "Your") shall mean an individual or Legal Entity exercising permissions
granted by this License.



"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.



"Object" form shall mean any form resulting from mechanical transformation
or translation of a Source form, including but not limited to compiled object
code, generated documentation, and conversions to other media types.



"Work" shall mean the work of authorship, whether in Source or Object form,
made available under the License, as indicated by a copyright notice that
is included in or attached to the work (an example is provided in the Appendix
below).



"Derivative Works" shall mean any work, whether in Source or Object form,
that is based on (or derived from) the Work and for which the editorial revisions,
Expand All @@ -59,7 +59,7 @@ original work of authorship. For the purposes of this License, Derivative
Works shall not include works that remain separable from, or merely link (or
bind by name) to the interfaces of, the Work and Derivative Works thereof.



"Contribution" shall mean any work of authorship, including the original version
of the Work and any modifications or additions to that Work or Derivative
Expand All @@ -74,7 +74,7 @@ for the purpose of discussing and improving the Work, but excluding communicatio
that is conspicuously marked or otherwise designated in writing by the copyright
owner as "Not a Contribution."



"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
of whom a Contribution has been received by Licensor and subsequently incorporated
Expand Down
Loading

0 comments on commit e1a86b0

Please sign in to comment.