From 373998ac8d66628767a9a8a97a50a8baf4370cd6 Mon Sep 17 00:00:00 2001 From: Ryan Faircloth <35384120+rfaircloth-splunk@users.noreply.github.com> Date: Fri, 21 Aug 2020 11:19:25 -0400 Subject: [PATCH] sync for policy (#1) Co-authored-by: Addon Factory template --- .circleci/config.yml | 27 +- .dependabot/config.yml | 16 - .github/dependabot.yml | 33 + .github/workflows/reuse.yml | 16 + pytest.ini | 3 +- requirements_dev.txt | 2 +- tests/data/wordlist.txt | 1633 ----------------------------------- tests/pytest-ci.ini | 4 +- tests/pytest.ini | 2 +- tests/requirements.txt | 2 +- 10 files changed, 65 insertions(+), 1673 deletions(-) delete mode 100644 .dependabot/config.yml create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/reuse.yml delete mode 100644 tests/data/wordlist.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index c72b63f..115eafb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -197,45 +197,34 @@ orbs: pip install git+https://github.com/pixelb/crudini mkdir test-results - run: - name: Splunk up + name: Splunk Testing command: | + # Start Splunk ls -l deps/build/addonfactory_test_matrix_splunk/splunk_matrix.conf export SPLUNK_VERSION=$(crudini --get deps/build/addonfactory_test_matrix_splunk/splunk_matrix.conf "<>" VERSION) export SPLUNK_APP_ID=$(crudini --get package/default/app.conf id name) docker-compose -f docker-compose-ci.yml build docker-compose -f docker-compose-ci.yml up -d splunk until docker-compose -f docker-compose-ci.yml logs splunk | grep "Ansible playbook complete" ; do sleep 1; done - - run: - name: Run diag - when: always - command: | + # Run a Splunk Diag mkdir /tmp/diag diag=$(docker-compose -f docker-compose-ci.yml exec splunk sudo -u splunk /opt/splunk/bin/splunk diag | grep "Splunk diagnosis file created" | sed -n 's/.* \(\/.*\.gz\)/\1/p') docker-compose -f docker-compose-ci.yml exec splunk sudo chmod +r ${diag//[$'\t\r\n']} docker cp project_splunk_1:${diag//[$'\t\r\n']} /tmp/diag - - run: - name: Check btool - when: always - command: | + # Check with btool docker-compose -f docker-compose-ci.yml exec splunk sudo /opt/splunk/bin/splunk cmd btool check docker-compose -f docker-compose-ci.yml up -d splunk sleep 30 - - run: - name: Test - when: always - command: | + # Run the tests docker-compose -f docker-compose-ci.yml up --abort-on-container-exit test - no_output_timeout: 1h - - run: - name: collect results - when: always - command: | + # Collect Results docker volume ls docker container create --name dummy \ -v project_results:/work/test-results \ registry.access.redhat.com/ubi7/ubi docker cp dummy:/work/test-results/test.xml test-results/ - docker cp dummy:/work/test-results/cim-compliance-report.md test-results/ + docker cp dummy:/work/test-results/cim-compliance-report.md test-results/ || true + no_output_timeout: 2h jobs: aio: resource_class: xlarge diff --git a/.dependabot/config.yml b/.dependabot/config.yml deleted file mode 100644 index 4e03031..0000000 --- a/.dependabot/config.yml +++ /dev/null @@ -1,16 +0,0 @@ -## -## SPDX-FileCopyrightText: 2020 Splunk, Inc. -## SPDX-License-Identifier: LicenseRef-Splunk-1-2020 -## -## -version: 1 -update_configs: - # Keep package.json (& lockfiles) up to date as soon as - # new versions are published to the npm registry - - package_manager: "submodules" - directory: "/" - update_schedule: "daily" - # Keep Dockerfile up to date, batching pull requests weekly - - package_manager: "python" - directory: "/" - update_schedule: "live" diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..d0d7473 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,33 @@ +version: 2 +updates: + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + - package-ecosystem: "gitsubmodule" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + - package-ecosystem: "gitsubmodule" + directory: "/deps/build" + target-branch: "develop" + schedule: + interval: "daily" + - package-ecosystem: "gitsubmodule" + directory: "/deps/apps" + target-branch: "develop" + schedule: + interval: "daily" + - package-ecosystem: "pip" + directory: "/" + target-branch: "develop" + schedule: + interval: "daily" + - package-ecosystem: "pip" + directory: "/tests" + target-branch: "develop" + schedule: + interval: "daily" diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml new file mode 100644 index 0000000..ccd8208 --- /dev/null +++ b/.github/workflows/reuse.yml @@ -0,0 +1,16 @@ +## +## SPDX-FileCopyrightText: 2020 Splunk, Inc. +## SPDX-License-Identifier: LicenseRef-Splunk-1-2020 +## +## +name: REUSE Compliance Check + +on: [push, pull_request] + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: REUSE Compliance Check + uses: fsfe/reuse-action@v1.1 diff --git a/pytest.ini b/pytest.ini index e68397a..26441b0 100644 --- a/pytest.ini +++ b/pytest.ini @@ -8,7 +8,8 @@ norecursedirs = .git .venv venv build deps tests/deps node_modules package addopts = -v --tb=long --splunk-data-generator=tests/data --splunk-type=docker - -n 15 + --sc4s-host=sc4s + -n 5 --keepalive filterwarnings = ignore::DeprecationWarning diff --git a/requirements_dev.txt b/requirements_dev.txt index e834bbe..0e54a95 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -3,5 +3,5 @@ ## SPDX-License-Identifier: LicenseRef-Splunk-1-2020 ## -r tests/requirements.txt -pytest-splunk-addon[docker]>=1.1.0 +pytest-splunk-addon[docker]>=1.3.0 reuse diff --git a/tests/data/wordlist.txt b/tests/data/wordlist.txt deleted file mode 100644 index d6a73fe..0000000 --- a/tests/data/wordlist.txt +++ /dev/null @@ -1,1633 +0,0 @@ -acrobat -africa -alaska -albert -albino -album -alcohol -alex -alpha -amadeus -amanda -amazon -america -analog -animal -antenna -antonio -apollo -april -aroma -artist -aspirin -athlete -atlas -banana -bandit -banjo -bikini -bingo -bonus -camera -canada -carbon -casino -catalog -cinema -citizen -cobra -comet -compact -complex -context -credit -critic -crystal -culture -david -delta -dialog -diploma -doctor -domino -dragon -drama -extra -fabric -final -focus -forum -galaxy -gallery -global -harmony -hotel -humor -index -japan -kilo -lemon -liter -lotus -mango -melon -menu -meter -metro -mineral -model -music -object -piano -pirate -plastic -radio -report -signal -sport -studio -subject -super -tango -taxi -tempo -tennis -textile -tokyo -total -tourist -video -visa -academy -alfred -atlanta -atomic -barbara -bazaar -brother -budget -cabaret -cadet -candle -capsule -caviar -channel -chapter -circle -cobalt -comrade -condor -crimson -cyclone -darwin -declare -denver -desert -divide -dolby -domain -double -eagle -echo -eclipse -editor -educate -edward -effect -electra -emerald -emotion -empire -eternal -evening -exhibit -expand -explore -extreme -ferrari -forget -freedom -friday -fuji -galileo -genesis -gravity -habitat -hamlet -harlem -helium -holiday -hunter -ibiza -iceberg -imagine -infant -isotope -jackson -jamaica -jasmine -java -jessica -kitchen -lazarus -letter -license -lithium -loyal -lucky -magenta -manual -marble -maxwell -mayor -monarch -monday -money -morning -mother -mystery -native -nectar -nelson -network -nikita -nobel -nobody -nominal -norway -nothing -number -october -office -oliver -opinion -option -order -outside -package -pandora -panther -papa -pattern -pedro -pencil -people -phantom -philips -pioneer -pluto -podium -portal -potato -process -proxy -pupil -python -quality -quarter -quiet -rabbit -radical -radius -rainbow -ramirez -ravioli -raymond -respect -respond -result -resume -richard -river -roger -roman -rondo -sabrina -salary -salsa -sample -samuel -saturn -savage -scarlet -scorpio -sector -serpent -shampoo -sharon -silence -simple -society -sonar -sonata -soprano -sparta -spider -sponsor -abraham -action -active -actor -adam -address -admiral -adrian -agenda -agent -airline -airport -alabama -aladdin -alarm -algebra -alibi -alice -alien -almond -alpine -amber -amigo -ammonia -analyze -anatomy -angel -annual -answer -apple -archive -arctic -arena -arizona -armada -arnold -arsenal -arthur -asia -aspect -athena -audio -august -austria -avenue -average -axiom -aztec -bagel -baker -balance -ballad -ballet -bambino -bamboo -baron -basic -basket -battery -belgium -benefit -berlin -bermuda -bernard -bicycle -binary -biology -bishop -blitz -block -blonde -bonjour -boris -boston -bottle -boxer -brandy -bravo -brazil -bridge -british -bronze -brown -bruce -bruno -brush -burger -burma -cabinet -cactus -cafe -cairo -calypso -camel -campus -canal -cannon -canoe -cantina -canvas -canyon -capital -caramel -caravan -career -cargo -carlo -carol -carpet -cartel -cartoon -castle -castro -cecilia -cement -center -century -ceramic -chamber -chance -change -chaos -charlie -charm -charter -cheese -chef -chemist -cherry -chess -chicago -chicken -chief -china -cigar -circus -city -clara -classic -claudia -clean -client -climax -clinic -clock -club -cockpit -coconut -cola -collect -colombo -colony -color -combat -comedy -command -company -concert -connect -consul -contact -contour -control -convert -copy -corner -corona -correct -cosmos -couple -courage -cowboy -craft -crash -cricket -crown -cuba -dallas -dance -daniel -decade -decimal -degree -delete -deliver -delphi -deluxe -demand -demo -denmark -derby -design -detect -develop -diagram -diamond -diana -diego -diesel -diet -digital -dilemma -direct -disco -disney -distant -dollar -dolphin -donald -drink -driver -dublin -duet -dynamic -earth -east -ecology -economy -edgar -egypt -elastic -elegant -element -elite -elvis -email -empty -energy -engine -english -episode -equator -escape -escort -ethnic -europe -everest -evident -exact -example -exit -exotic -export -express -factor -falcon -family -fantasy -fashion -fiber -fiction -fidel -fiesta -figure -film -filter -finance -finish -finland -first -flag -flash -florida -flower -fluid -flute -folio -ford -forest -formal -formula -fortune -forward -fragile -france -frank -fresh -friend -frozen -future -gabriel -gamma -garage -garcia -garden -garlic -gemini -general -genetic -genius -germany -gloria -gold -golf -gondola -gong -good -gordon -gorilla -grand -granite -graph -green -group -guide -guitar -guru -hand -happy -harbor -harvard -havana -hawaii -helena -hello -henry -hilton -history -horizon -house -human -icon -idea -igloo -igor -image -impact -import -india -indigo -input -insect -instant -iris -italian -jacket -jacob -jaguar -janet -jargon -jazz -jeep -john -joker -jordan -judo -jumbo -june -jungle -junior -jupiter -karate -karma -kayak -kermit -king -koala -korea -labor -lady -lagoon -laptop -laser -latin -lava -lecture -left -legal -level -lexicon -liberal -libra -lily -limbo -limit -linda -linear -lion -liquid -little -llama -lobby -lobster -local -logic -logo -lola -london -lucas -lunar -machine -macro -madam -madonna -madrid -maestro -magic -magnet -magnum -mailbox -major -mama -mambo -manager -manila -marco -marina -market -mars -martin -marvin -mary -master -matrix -maximum -media -medical -mega -melody -memo -mental -mentor -mercury -message -metal -meteor -method -mexico -miami -micro -milk -million -minimum -minus -minute -miracle -mirage -miranda -mister -mixer -mobile -modem -modern -modular -moment -monaco -monica -monitor -mono -monster -montana -morgan -motel -motif -motor -mozart -multi -museum -mustang -natural -neon -nepal -neptune -nerve -neutral -nevada -news -next -ninja -nirvana -normal -nova -novel -nuclear -numeric -nylon -oasis -observe -ocean -octopus -olivia -olympic -omega -opera -optic -optimal -orange -orbit -organic -orient -origin -orlando -oscar -oxford -oxygen -ozone -pablo -pacific -pagoda -palace -pamela -panama -pancake -panda -panel -panic -paradox -pardon -paris -parker -parking -parody -partner -passage -passive -pasta -pastel -patent -patient -patriot -patrol -pegasus -pelican -penguin -pepper -percent -perfect -perfume -period -permit -person -peru -phone -photo -picasso -picnic -picture -pigment -pilgrim -pilot -pixel -pizza -planet -plasma -plaza -pocket -poem -poetic -poker -polaris -police -politic -polo -polygon -pony -popcorn -popular -postage -precise -prefix -premium -present -price -prince -printer -prism -private -prize -product -profile -program -project -protect -proton -public -pulse -puma -pump -pyramid -queen -radar -ralph -random -rapid -rebel -record -recycle -reflex -reform -regard -regular -relax -reptile -reverse -ricardo -right -ringo -risk -ritual -robert -robot -rocket -rodeo -romeo -royal -russian -safari -salad -salami -salmon -salon -salute -samba -sandra -santana -sardine -school -scoop -scratch -screen -script -scroll -second -secret -section -segment -select -seminar -senator -senior -sensor -serial -service -shadow -sharp -sheriff -shock -short -shrink -sierra -silicon -silk -silver -similar -simon -single -siren -slang -slogan -smart -smoke -snake -social -soda -solar -solid -solo -sonic -source -soviet -special -speed -sphere -spiral -spirit -spring -static -status -stereo -stone -stop -street -strong -student -style -sultan -susan -sushi -suzuki -switch -symbol -system -tactic -tahiti -talent -tarzan -telex -texas -theory -thermos -tiger -titanic -tomato -topic -tornado -toronto -torpedo -totem -tractor -traffic -transit -trapeze -travel -tribal -trick -trident -trilogy -tripod -tropic -trumpet -tulip -tuna -turbo -twist -ultra -uniform -union -uranium -vacuum -valid -vampire -vanilla -vatican -velvet -ventura -venus -vertigo -veteran -victor -vienna -viking -village -vincent -violet -violin -virtual -virus -vision -visitor -visual -vitamin -viva -vocal -vodka -volcano -voltage -volume -voyage -water -weekend -welcome -western -window -winter -wizard -wolf -world -xray -yankee -yoga -yogurt -yoyo -zebra -zero -zigzag -zipper -zodiac -zoom -acid -adios -agatha -alamo -alert -almanac -aloha -andrea -anita -arcade -aurora -avalon -baby -baggage -balloon -bank -basil -begin -biscuit -blue -bombay -botanic -brain -brenda -brigade -cable -calibre -carmen -cello -celtic -chariot -chrome -citrus -civil -cloud -combine -common -cool -copper -coral -crater -cubic -cupid -cycle -depend -door -dream -dynasty -edison -edition -enigma -equal -eric -event -evita -exodus -extend -famous -farmer -food -fossil -frog -fruit -geneva -gentle -george -giant -gilbert -gossip -gram -greek -grille -hammer -harvest -hazard -heaven -herbert -heroic -hexagon -husband -immune -inca -inch -initial -isabel -ivory -jason -jerome -joel -joshua -journal -judge -juliet -jump -justice -kimono -kinetic -leonid -leopard -lima -maze -medusa -member -memphis -michael -miguel -milan -mile -miller -mimic -mimosa -mission -monkey -moral -moses -mouse -nancy -natasha -nebula -nickel -nina -noise -orchid -oregano -origami -orinoco -orion -othello -paper -paprika -prelude -prepare -pretend -promise -prosper -provide -puzzle -remote -repair -reply -rival -riviera -robin -rose -rover -rudolf -saga -sahara -scholar -shelter -ship -shoe -sigma -sister -sleep -smile -spain -spark -split -spray -square -stadium -star -storm -story -strange -stretch -stuart -subway -sugar -sulfur -summer -survive -sweet -swim -table -taboo -target -teacher -telecom -temple -tibet -ticket -tina -today -toga -tommy -tower -trivial -tunnel -turtle -twin -uncle -unicorn -unique -update -valery -vega -version -voodoo -warning -william -wonder -year -yellow -young -absent -absorb -absurd -accent -alfonso -alias -ambient -anagram -andy -anvil -appear -apropos -archer -ariel -armor -arrow -austin -avatar -axis -baboon -bahama -bali -balsa -barcode -bazooka -beach -beast -beatles -beauty -before -benny -betty -between -beyond -billy -bison -blast -bless -bogart -bonanza -book -border -brave -bread -break -broken -bucket -buenos -buffalo -bundle -button -buzzer -byte -caesar -camilla -canary -candid -carrot -cave -chant -child -choice -chris -cipher -clarion -clark -clever -cliff -clone -conan -conduct -congo -costume -cotton -cover -crack -current -danube -data -decide -deposit -desire -detail -dexter -dinner -donor -druid -drum -easy -eddie -enjoy -enrico -epoxy -erosion -except -exile -explain -fame -fast -father -felix -field -fiona -fire -fish -flame -flex -flipper -float -flood -floor -forbid -forever -fractal -frame -freddie -front -fuel -gallop -game -garbo -gate -gelatin -gibson -ginger -giraffe -gizmo -glass -goblin -gopher -grace -gray -gregory -grid -griffin -ground -guest -gustav -gyro -hair -halt -harris -heart -heavy -herman -hippie -hobby -honey -hope -horse -hostel -hydro -imitate -info -ingrid -inside -invent -invest -invite -ivan -james -jester -jimmy -join -joseph -juice -julius -july -kansas -karl -kevin -kiwi -ladder -lake -laura -learn -legacy -legend -lesson -life -light -list -locate -lopez -lorenzo -love -lunch -malta -mammal -margin -margo -marion -mask -match -mayday -meaning -mercy -middle -mike -mirror -modest -morph -morris -mystic -nadia -nato -navy -needle -neuron -never -newton -nice -night -nissan -nitro -nixon -north -oberon -octavia -ohio -olga -open -opus -orca -oval -owner -page -paint -palma -parent -parlor -parole -paul -peace -pearl -perform -phoenix -phrase -pierre -pinball -place -plate -plato -plume -pogo -point -polka -poncho -powder -prague -press -presto -pretty -prime -promo -quest -quick -quiz -quota -race -rachel -raja -ranger -region -remark -rent -reward -rhino -ribbon -rider -road -rodent -round -rubber -ruby -rufus -sabine -saddle -sailor -saint -salt -scale -scuba -season -secure -shake -shallow -shannon -shave -shelf -sherman -shine -shirt -side -sinatra -sincere -size -slalom -slow -small -snow -sofia -song -sound -south -speech -spell -spend -spoon -stage -stamp -stand -state -stella -stick -sting -stock -store -sunday -sunset -support -supreme -sweden -swing -tape -tavern -think -thomas -tictac -time -toast -tobacco -tonight -torch -torso -touch -toyota -trade -tribune -trinity -triton -truck -trust -type -under -unit -urban -urgent -user -value -vendor -venice -verona -vibrate -virgo -visible -vista -vital -voice -vortex -waiter -watch -wave -weather -wedding -wheel -whiskey -wisdom -android -annex -armani -cake -confide -deal -define -dispute -genuine -idiom -impress -include -ironic -null -nurse -obscure -prefer -prodigy -ego -fax -jet -job -rio -ski -yes \ No newline at end of file diff --git a/tests/pytest-ci.ini b/tests/pytest-ci.ini index 273a381..88b2b8f 100644 --- a/tests/pytest-ci.ini +++ b/tests/pytest-ci.ini @@ -9,8 +9,10 @@ addopts = -v --tb=long --splunk-data-generator=tests/data --splunk-type=external --splunk-host=splunk + --sc4s-host=sc4s + --splunk-hec-token=70b6ae71-76b3-4c38-9597-0c5b37ad9630 --junitxml=/work/test-results/test.xml --cim-report=/work/test-results/cim-compliance-report.md - -n 18 + -n 5 filterwarnings = ignore::DeprecationWarning diff --git a/tests/pytest.ini b/tests/pytest.ini index 6f8b54d..13dc4f2 100644 --- a/tests/pytest.ini +++ b/tests/pytest.ini @@ -9,7 +9,7 @@ addopts = -v --tb=long --splunk-data-generator=tests/data --splunk-type=docker --splunk-host=splunk - -n 15 + -n 5 --keepalive filterwarnings = ignore::DeprecationWarning diff --git a/tests/requirements.txt b/tests/requirements.txt index 8e5e54a..864764e 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,3 +1,3 @@ pytest-expect pytest-xdist -pytest-splunk-addon>=1.2.2-alpha.5 \ No newline at end of file +pytest-splunk-addon>=v1.3.0 \ No newline at end of file