Skip to content

Commit

Permalink
Merge pull request #8 from splunk/develop
Browse files Browse the repository at this point in the history
for release
  • Loading branch information
Ryan Faircloth authored Sep 17, 2020
2 parents cfcd425 + 7e58a83 commit 12ee6e4
Show file tree
Hide file tree
Showing 7,633 changed files with 1,537,470 additions and 16,638 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
130 changes: 130 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
version: 2.1
orbs:
go: circleci/[email protected]

jobs:
build:
docker:
- image: circleci/python:3.7-node
steps:
- checkout
- restore_cache:
keys:
- poetry-{{ checksum "poetry.lock" }}
- restore_cache:
keys:
- npm-deps-{{ checksum "splunk_add_on_ucc_framework/UCC-UI-lib/package-lock.json" }}
- run:
name: Install Tools
command: |
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
mkdir ~/.npm-global || true
npm config set prefix '~/.npm-global'
export PATH=~/.npm-global/bin:$PATH
npm install -g bower
- run:
name: Build
command: |
source $HOME/.poetry/env
export PATH=~/.npm-global/bin:$PATH
poetry install
poetry run poetry-dynamic-versioning
poetry run build-ucc
poetry build
- save_cache:
key: poetry-{{ checksum "poetry.lock" }}
paths:
- ~/.poetry
- save_cache:
paths:
- ~/.npm-global # location depends on npm version
key: npm-deps-{{ checksum "splunk_add_on_ucc_framework/UCC-UI-lib/package-lock.json" }}
- store_artifacts:
path: dist
- store_artifacts:
path: output
- persist_to_workspace:
# Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
# taken to be the root directory of the workspace.
root: .
# Must be relative path from root
paths:
- dist
- output

test:
docker:
- image: circleci/python:3.7-node
steps:
- checkout
- attach_workspace:
at: /tmp/workspace
- run:
name: Install Tools
command: |
pip install /tmp/workspace/dist/*
publish:
docker:
- image: circleci/python:3.7-node
steps:
- checkout
- restore_cache:
keys:
- poetry-{{ checksum "poetry.lock" }}
- restore_cache:
keys:
- npm-deps-{{ checksum "splunk_add_on_ucc_framework/UCC-UI-lib/package-lock.json" }}
- run:
name: Install Tools
command: |
curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python
mkdir ~/.npm-global
npm config set prefix '~/.npm-global'
export PATH=~/.npm-global/bin:$PATH
npm install -g bower
- run:
name: Build
command: |
source $HOME/.poetry/env
export PATH=~/.npm-global/bin:$PATH
poetry install
poetry run poetry-dynamic-versioning
poetry run build-ucc
poetry build
poetry publish -u ${TWINE_USERNAME} -p ${TWINE_PASSWORD}
- save_cache:
key: poetry-{{ checksum "poetry.lock" }}
paths:
- ~/.poetry
- save_cache:
paths:
- ~/.npm-global # location depends on npm version
key: npm-deps-{{ checksum "splunk_add_on_ucc_framework/UCC-UI-lib/package-lock.json" }}
- store_artifacts:
path: dist
- store_artifacts:
path: output
- persist_to_workspace:
# Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
# taken to be the root directory of the workspace.
root: .
# Must be relative path from root
paths:
- dist
- output
workflows:
version: 2
build_test:
jobs:
- build
- test:
requires:
- build
build_release:
jobs:
- publish:
filters:
branches:
ignore: /.*/
tags:
only: /^v\d*\.\d*\.\d*/
7 changes: 0 additions & 7 deletions .fortifyrc

This file was deleted.

75 changes: 41 additions & 34 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,45 @@
### Files for Pycharm
package/.idea
.idea/
*.log
splunk_add_on_ucc_framework/UCC-UI-lib/node_modules/*
splunk_add_on_ucc_framework/UCC-UI-lib/bower_components/SplunkWebCore/node_modules/*
splunk_add_on_ucc_framework/UCC-UI-lib/bower_components/lodash/*
splunk_add_on_ucc_framework/UCC-UI-lib/build/*
dist/*

### Files for Add-on local data
package/local/
package/metadata/local.meta

### 3rd libs
package/bin/solnlib/
package/bin/splunklib/
package/bin/sortedcontainers/
package/bin/requests/

### Files for Temporary Output
cached_build_info.properties
bower_components
node_modules
npm-debug.log
pypi_modules
stage
*.spl

### libs and output under UCC-example-addon
UCC-example-addon/output
UCC-example-addon/solnlib
UCC-example-addon/splunklib
UCC-example-addon/splunktaucclib
UCC-example-addon/uccrestbuilder
UCC-example-addon/jinja2
UCC-example-addon/markupsafe

### libs and output under UCC-UI-lib
UCC-UI-lib/build
UCC-UI-lib/solnlib
UCC-UI-lib/splunklib
UCC-UI-lib/splunktaucclib
UCC-UI-lib/uccrestbuilder
*.egg-info
output
splunk_add_on_ucc_framework/UCC-UI-lib/bower_components/SplunkWebCore/npm-shrinkwrap.json
splunk_add_on_ucc_framework/package/appserver/static/css/bootstrap-enterprise.css
splunk_add_on_ucc_framework/package/appserver/static/css/bootstrap-lite.css
splunk_add_on_ucc_framework/package/appserver/static/css/common.css
splunk_add_on_ucc_framework/package/appserver/static/css/configuration.css
splunk_add_on_ucc_framework/package/appserver/static/css/createInput.css
splunk_add_on_ucc_framework/package/appserver/static/css/inputs.css
splunk_add_on_ucc_framework/package/appserver/static/css/switchButton.css
splunk_add_on_ucc_framework/package/appserver/static/js/build/1.1.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/2.2.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/3.3.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/4.4.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/5.5.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/common.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/entry_page.js
splunk_add_on_ucc_framework/package/appserver/static/js/build/redirect_page.js
splunk_add_on_ucc_framework/package/appserver/static/styles/bootstrap.pcss
splunk_add_on_ucc_framework/package/appserver/templates/base.html
splunk_add_on_ucc_framework/package/appserver/templates/redirect.html
splunk_add_on_ucc_framework/package/default/data/ui/nav/default.xml
splunk_add_on_ucc_framework/package/default/data/ui/views/configuration.xml
splunk_add_on_ucc_framework/package/default/data/ui/views/inputs.xml
splunk_add_on_ucc_framework/package/default/data/ui/views/redirect.xml
splunk_add_on_ucc_framework/package/locale/messages.pot
splunk_add_on_ucc_framework/package/locale/zh_CN/LC_MESSAGES/messages.mo
splunk_add_on_ucc_framework/package/locale/zh_CN/LC_MESSAGES/messages.po
splunk_add_on_ucc_framework/UCC-UI-lib/bower_components/SplunkWebCore/npm-shrinkwrap.json
tests/.DS_Store
splunk_add_on_ucc_framework/UCC-UI-lib/bower_components/SplunkWebCore/npm-shrinkwrap.json
pip-wheel-metadata/UNKNOWN.dist-info/top_level.txt
pip-wheel-metadata/UNKNOWN.dist-info/METADATA
.vscode/settings.json
.DS_Store
12 changes: 9 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
[submodule "contrib/common"]
path = contrib/common
url = ssh://[email protected]:7999/soln/common.git
[submodule "deps/build/addonfactory_test_matrix_splunk"]
path = deps/build/addonfactory_test_matrix_splunk
url = [email protected]:splunk/addonfactory_test_matrix_splunk.git
[submodule "deps/apps/Splunk_SA_CIM"]
path = deps/apps/Splunk_SA_CIM
url = [email protected]:splunk/addonfactory-splunk_sa_cim.git
[submodule "deps/apps/splunk_env_indexer"]
path = deps/apps/splunk_env_indexer
url = [email protected]:splunk/addonfactory-splunk_env_indexer.git
2 changes: 2 additions & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
3.7.8
2.7.18
10 changes: 10 additions & 0 deletions Dockerfile-splunk
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ARG SPLUNK_VERSION=latest
FROM splunk/splunk:$SPLUNK_VERSION
ARG SPLUNK_VERSION=latest
ARG SPLUNK_APP_ID=TA_UNKNOWN
ARG SPLUNK_APP_PACKAGE=output
RUN echo Splunk VERSION=$SPLUNK_VERSION

COPY deps/apps /opt/splunk/etc/apps/

COPY output/Splunk_TA_UCCExample /opt/splunk/etc/apps/Splunk_TA_UCCExample
Loading

0 comments on commit 12ee6e4

Please sign in to comment.