Skip to content

Add capability to filter queries #1098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 16, 2022
Merged

Add capability to filter queries #1098

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40b2800
Add capability to filter queries
aeisenberg Jun 14, 2022
06e27d3
Merge branch 'aeisenberg/js-yaml-typings' into aeisenberg/remove-queries
aeisenberg Jun 14, 2022
eec34d5
Add integration tests for query filters
aeisenberg Jun 14, 2022
428caf0
Update changelog
aeisenberg Jun 15, 2022
59ca9b5
Extract query-filters test into a composite action
aeisenberg Jun 15, 2022
777b778
Spelling, capitalization, and better descriptions
aeisenberg Jun 16, 2022
6db77ee
Merge remote-tracking branch 'upstream/main' into aeisenberg/remove-q…
aeisenberg Jun 16, 2022
d7459f0
Merge branch 'aeisenberg/check-sarif-action' into aeisenberg/remove-q…
aeisenberg Jun 16, 2022
7c412c6
Merge branch 'aeisenberg/check-sarif-action' into aeisenberg/remove-q…
aeisenberg Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Spelling, capitalization, and better descriptions
  • Loading branch information
@aeisenberg
aeisenberg committed Jun 16, 2022
commit 777b778409befa0ba120d2fd32f0c1d165ba9849
6 changes: 3 additions & 3 deletions .github/query-filter-test/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Query Filter Test
description: Runs a test of query filters using the check sarif action
description: Runs a test of query filters using the check SARIF action
inputs:
sarif-file:
required: true
description: The sarif file to check
description: The SARIF file to check

queries-run:
required: true
Expand Down Expand Up @@ -41,7 +41,7 @@ runs:
upload: false
env:
TEST_MODE: "true"
- name: Check Sarif
- name: Check SARIF
uses: ./../action/.github/check-sarif
with:
sarif-file: ${{ inputs.sarif-file }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/query-filters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
with:
version: latest

- name: Check Sarif for default queries with Single include, Single exclude
- name: Check SARIF for default queries with Single include, Single exclude
uses: ./../action/.github/query-filter-test
with:
sarif-file: ${{ runner.temp }}/results/javascript.sarif
Expand All @@ -36,7 +36,7 @@ jobs:
config-file: ./.github/codeql/codeql-config-query-filters1.yml
tools: ${{ steps.prepare-test.outputs.tools-url }}

- name: Check Sarif for query packs with Single include, Single exclude
- name: Check SARIF for query packs with Single include, Single exclude
uses: ./../action/.github/query-filter-test
with:
sarif-file: ${{ runner.temp }}/results/javascript.sarif
Expand All @@ -45,7 +45,7 @@ jobs:
config-file: ./.github/codeql/codeql-config-query-filters2.yml
tools: ${{ steps.prepare-test.outputs.tools-url }}

- name: Check Sarif for query packs and local queries with Single include, Single exclude
- name: Check SARIF for query packs and local queries with Single include, Single exclude
uses: ./../action/.github/query-filter-test
with:
sarif-file: ${{ runner.temp }}/results/javascript.sarif
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## [UNRELEASED]

- Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file.[#1098](https://github.com/github/codeql-action/pull/1098)
- Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file. [#1098](https://github.com/github/codeql-action/pull/1098)

## 2.1.12 - 01 Jun 2022

Expand Down
4 changes: 2 additions & 2 deletions tests/multi-language-repo/.github/codeql/codeql-config-query-filters1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: "CodeQL config 1"
name: "Check SARIF for default queries with Single include, Single exclude"

query-filters:
# This should run js/path-injection and js/zipslip
- include:
tags contain: external/cwe/cwe-022

# Removes out js/path-injection
# Removes js/path-injection
- exclude:
id: js/path-injection
4 changes: 2 additions & 2 deletions tests/multi-language-repo/.github/codeql/codeql-config-query-filters2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CodeQL config 2"
name: "Check SARIF for query packs with Single include, Single exclude"

disable-default-queries: true

Expand All @@ -12,7 +12,7 @@ query-filters:
- include:
tags contain: external/cwe/cwe-022

# Removes out js/path-injection
# Removes js/path-injection
- exclude:
id: js/path-injection

Expand Down
4 changes: 2 additions & 2 deletions tests/multi-language-repo/.github/codeql/codeql-config-query-filters3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CodeQL config 3"
name: "Check SARIF for query packs and local queries with Single include, Single exclude"

disable-default-queries: true

Expand All @@ -22,7 +22,7 @@ query-filters:
- include:
tags contain: external/cwe/cwe-022

# Removes out js/path-injection
# Removes js/path-injection
- exclude:
id: js/path-injection

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy