Test merge process

.gitattributes

@@ -1,2 +1 @@
-.github/CODEOWNERS merge=ours
-global_helpers/panther_config_overrides.py merge=ours
+CODEOWNERS merge=ours

.github/CODEOWNERS

@@ -3,4 +3,4 @@
 
 # These owners will be the default owners for everything in the repo.
 
-*       @panther-labs/detections @panther-labs/threat-research
+*       @panther-labs/detections

.github/dependabot.yml

@@ -5,7 +5,3 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 0
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

.github/workflows/lint.yml → .github/workflows/lint-test.yml

@@ -14,17 +14,16 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-on: 
-  pull_request:
+on: pull_request
 
 jobs:
-  lint:
-    name: Lint
+  make_lint:
+    name: lint and test
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout panther-analysis
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Set python version  
         uses: actions/setup-python@v4
@@ -42,3 +41,6 @@ jobs:
 
       - name: make lint
         run: make lint
+
+      - name: make test
+        run: make test

.github/workflows/sync-from-upstream.yml

@@ -2,8 +2,8 @@ name: sync-panther-analysis-from-upstream
 
 on:
   schedule:
-    # 15:00Z, every Wednesday
-    - cron: "00 15 * * 3"
+    # 15:00Z, every Tuesday
+    - cron: "00 15 * * 2"
   workflow_dispatch: # or on button click  
 
 env:
@@ -15,7 +15,7 @@ jobs:
       github.repository != 'panther-labs/panther-analysis'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v6
         id: set_upstream
         name: Check Upstream
         with:
@@ -29,18 +29,17 @@ jobs:
               process.env['GITHUB_OUTPUT'],
               'latest-release=' +  upstreamLatest.data.tag_name + '\n');
       ## CREATE A BRANCH
-      - uses: peterjgrainger/action-create-branch@v3.0.0
+      - uses: peterjgrainger/action-create-branch@v2.3.0
         id: create_a_branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           branch: 'sync_upstream_${{steps.set_upstream.outputs.latest-release}}'
       # Checkout this repo into the branch
       - name: Checkout your local repo in PR branch
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           ref: 'sync_upstream_${{steps.set_upstream.outputs.latest-release}}'
-          token: ${{ secrets.GITHUB_TOKEN }}
       # Sync this branch with upstream
       - name: Sync upstream changes into PR branch
         id: sync
@@ -55,10 +54,9 @@ jobs:
           #  change the usptream_sync_branch to master
           upstream_sync_branch: ${{steps.set_upstream.outputs.latest-release}}
           upstream_sync_repo: panther-labs/panther-analysis
-          #test_mode: true
-          upstream_pull_args: '--allow-unrelated-histories'
+          #test_mode: true  
       # Create a PR from this branch back to this fork's primary branch
-      - uses: actions/github-script@v7
+      - uses: actions/github-script@v6
         id: create_pr
         name: Create a PR to bring upstream changes into the local repo primary branch
         if: steps.sync.outputs.has_new_commits == 'true'
@@ -75,11 +73,11 @@ jobs:
                 base: '${{env.YOUR_REPO_PRIMARY_BRANCH_NAME}}',
               });
             } catch(e) {
-              if (e.response && e.response.data && e.response.data.errors && e.response.data.errors.length > 0 && e.response.data.errors[0].message && e.response.data.errors[0].message.includes('No commits between')) {
+              if (e.response.data.errors[0].message.includes('No commits between')) {
                 fs.appendFileSync(
                   process.env['GITHUB_OUTPUT'],
                   'pr_state=no-updates\n');
-              } else if (e.response && e.response.data && e.response.data.errors && e.response.data.errors.length > 0 && e.response.data.errors[0].message && e.response.data.errors[0].message.includes('A pull request already exists for')) {
+              } else if (e.response.data.errors[0].message.includes('A pull request already exists for')) {
                 fs.appendFileSync(
                   process.env['GITHUB_OUTPUT'],
                   'pr_state=update-pr-already-exists\n');