Skip to content

Commit

Permalink
Merge pull request #8 from splunk-soar-connectors/next
Browse files Browse the repository at this point in the history
Merging next to main for release 2.2.0
  • Loading branch information
mishalp-crest authored Aug 4, 2022
2 parents 26cd560 + ba00d60 commit 482dd26
Show file tree
Hide file tree
Showing 31 changed files with 766 additions and 97 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Linting
on: [push, pull_request]
jobs:
lint:
lint:
# Run per push for internal contributers. This isn't possible for forked pull requests,
# so we'll need to run on PR events for external contributers.
# String comparison below is case insensitive.
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/review-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Review Release
concurrency:
group: app-release
cancel-in-progress: true
permissions:
contents: read
id-token: write
statuses: write
on:
workflow_dispatch:
inputs:
task_token:
description: 'StepFunction task token'
required: true

jobs:
review:
uses: 'phantomcyber/dev-cicd-tools/.github/workflows/review-release.yml@main'
with:
task_token: ${{ inputs.task_token }}
secrets:
resume_release_role_arn: ${{ secrets.RESUME_RELEASE_ROLE_ARN }}
6 changes: 3 additions & 3 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Semgrep
on:
on:
pull_request_target:
branches:
- next
Expand All @@ -21,8 +21,8 @@ jobs:
echo "REPOSITORY=${{ github.event.pull_request.head.repo.full_name }}" >> $GITHUB_ENV
echo "REF=${{ github.event.pull_request.head.ref }}" >> $GITHUB_ENV
- uses: 'phantomcyber/dev-cicd-tools/github-actions/semgrep@main'
with:
with:
SEMGREP_DEPLOYMENT_ID: ${{ secrets.SEMGREP_DEPLOYMENT_ID }}
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
REPOSITORY: ${{ github.repository }}
REPOSITORY: ${{ github.repository }}
REF: ${{ github.ref }}
8 changes: 6 additions & 2 deletions .github/workflows/start-release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Start Release
on: workflow_dispatch
on:
workflow_dispatch:
push:
tags:
- '*-beta*'
jobs:
start-release:
runs-on: ubuntu-latest
steps:
- uses: 'phantomcyber/dev-cicd-tools/github-actions/start-release@main'
with:
GITHUB_TOKEN: ${{ secrets.SOAR_APPS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.SOAR_APPS_TOKEN }}
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/phantomcyber/dev-cicd-tools
rev: v1.4
rev: v1.13
hooks:
- id: org-hook
- id: package-app-dependencies
- repo: https://github.com/Yelp/detect-secrets
rev: v1.1.0
rev: v1.3.0
hooks:
- id: detect-secrets
args: ['--no-verify', '--exclude-files', '^cybereason.json$']
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2021 Splunk Inc.
Copyright (c) Cybereason, 2018-2021

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
9 changes: 2 additions & 7 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
Splunk SOAR Cybereason
Copyright 2021 Splunk Inc.
Copyright (c) Cybereason, 2018-2021

Third-party Software Attributions:

Library: beautifulsoup4
Version: 4.9.1
License: MIT
Copyright 2004-2019 Leonard Richardson
Copyright 2004-2017 Leonard Richardson
Copyright 2004-2019 Leonard Richardson
Copyright 2018 Isaac Muse

Library: pudb
Version: 2019.2
License: MIT
Copyright 2009 Andreas Kloeckner and contributors

Library: requests
Version: 2.25.0
License: Apache 2.0
Expand Down
Loading

0 comments on commit 482dd26

Please sign in to comment.