Skip to content

Commit

Permalink
Merge branch 'main' into auto-update-aws-config-rules
Browse files Browse the repository at this point in the history
  • Loading branch information
bensonce authored Jun 11, 2024
2 parents a753bb7 + c435ab0 commit 2f5dcc6
Show file tree
Hide file tree
Showing 12 changed files with 567 additions and 545 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-extended # security-and-quality
Expand All @@ -40,7 +40,7 @@ jobs:
# Prefix the list here with "+" to use these queries and those in the config file.

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"

46 changes: 46 additions & 0 deletions .github/workflows/codeql-analysis-ruby.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json

name: "CodeQL Ruby"

on:
push:
branches: ["master", "main"]
pull_request:
# The branches below must be a subset of the branches above
branches: ["master", "main"]
schedule:
- cron: "27 4 * * 5"

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: ["ruby"]

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-extended # security-and-quality
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"

32 changes: 0 additions & 32 deletions .github/workflows/update-rule-pack-info.yaml

This file was deleted.

11 changes: 8 additions & 3 deletions .github/workflows/update-rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@ jobs:
run: |
cd scripts
pip install -r requirements.txt
python index.py
python index.py update-config-rules
python index.py update-rule-packs
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44
with:
files: "*.tf"
files: |
"*.tf"
"files/*"
- name: List all changed files
run: echo '${{ steps.changed-files.outputs.all_changed_files }}'
Expand Down Expand Up @@ -64,7 +67,9 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
base: main
branch: auto-update-aws-config-rules
add-paths: managed_rules_*.tf
add-paths: |
managed_rules_*.tf
files/*
commit-message: Automatic updates to AWS managed Config Rules
delete-branch: true
title: '[Auto] Update AWS Config Rules'
Expand Down
2 changes: 1 addition & 1 deletion files/pack-rules-list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ Security-Best-Practices-for-Network-Firewall
Security-Best-Practices-for-RDS
Security-Best-Practices-for-Redshift
Security-Best-Practices-for-SageMaker
Security-Best-Practices-for-Secrets-Manager
Security-Best-Practices-for-Secrets-Manager
Loading

0 comments on commit 2f5dcc6

Please sign in to comment.